Skip to content

Commit

Permalink
tests now passing with new structure
Browse files Browse the repository at this point in the history
  • Loading branch information
lancejpollard committed Aug 3, 2012
1 parent 2db1a54 commit a246972
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 52 deletions.
4 changes: 3 additions & 1 deletion index.js
@@ -1,6 +1,8 @@
var path = require('path'); var path = require('path');
require('coffee-script'); require('coffee-script');
/*
if (path.existsSync('./lib/tower.js')) if (path.existsSync('./lib/tower.js'))
module.exports = require('./lib/tower.js'); module.exports = require('./lib/tower.js');
else else
module.exports = require('./src/tower.coffee'); */
module.exports = require('./packages/tower.coffee');
1 change: 1 addition & 0 deletions packages/tower-application/server.coffee
@@ -1,3 +1,4 @@
require './shared'
require './server/application' require './server/application'
require './server/assets' require './server/assets'
require './server/watcher' require './server/watcher'
30 changes: 30 additions & 0 deletions packages/tower-controller/server.coffee
@@ -0,0 +1,30 @@
require './shared'
require './server/actions'
require './server/caching'
require './server/events'
require './server/net'
require './server/sockets'

Tower.Controller.include Tower.Controller.Actions
Tower.Controller.include Tower.Controller.Caching
Tower.Controller.include Tower.Controller.Events
Tower.Controller.include Tower.Controller.Net
Tower.Controller.include Tower.Controller.Sockets

Tower.Controller.reopenClass extended: ->
object = {}
name = @className()
camelName = _.camelize(name, true)

object[camelName] = Ember.computed(->
Tower.Application.instance()[name].create()
).cacheable()

Tower.Net.Connection.controllers.push(camelName)

Tower.Net.Connection.reopen(object)

@

require './server/renderers'
require './shared/tst'
28 changes: 0 additions & 28 deletions packages/tower-controller/server/controller.coffee

This file was deleted.

8 changes: 4 additions & 4 deletions packages/tower-middleware/server.coffee
@@ -1,9 +1,9 @@
# @module # @module
Tower.Middleware = {} Tower.Middleware = {}


require './middleware/agent' require './server/agent'
require './middleware/cookies' require './server/cookies'
require './middleware/location' require './server/location'
require './middleware/router' require './server/router'


module.exports = Tower.Middleware module.exports = Tower.Middleware
1 change: 1 addition & 0 deletions packages/tower-net/server.coffee
@@ -1,3 +1,4 @@
require './shared'
require './server/connection' require './server/connection'
require './server/connection/socketio' require './server/connection/socketio'
require './server/connection/sockjs' require './server/connection/sockjs'
1 change: 1 addition & 0 deletions packages/tower-support/server.coffee
@@ -0,0 +1 @@
require './shared'
46 changes: 29 additions & 17 deletions packages/tower/server.coffee
Expand Up @@ -32,23 +32,35 @@ Tower.modules =
sockjs: try require 'sockjs' sockjs: try require 'sockjs'
_: _ _: _


require './support' require '../tower-support/server'
require './application' require '../tower-application/server'
require './server/application' require '../tower-store/server'
require './store' require '../tower-model/server'
require './server/store' require '../tower-view/server'
require './model' require '../tower-controller/server'
require './server/model' require '../tower-net/server'
require './view' require '../tower-mailer/server'
require './controller' require '../tower-middleware/server'
require './server/controller' require '../tower-command/server'
require './controller/tst' require '../tower-generator/server'
require './net'
require './server/net' #require './support'
require './server/mailer' #require './application'
require './middleware' #require './server/application'
require './server/command' #require './store'
require './server/generator' #require './server/store'
#require './model'
#require './server/model'
#require './view'
#require './controller'
#require './server/controller'
#require './controller/tst'
#require './net'
#require './server/net'
#require './server/mailer'
#require './middleware'
#require './server/command'
#require './server/generator'


Tower.watch = true Tower.watch = true


Expand Down
2 changes: 1 addition & 1 deletion test/cases/server/generator/actionsTest.coffee
Expand Up @@ -9,7 +9,7 @@ cakefileDestination = null
describe 'Tower.Generator.Actions', -> describe 'Tower.Generator.Actions', ->
beforeEach -> beforeEach ->
try wrench.rmdirSyncRecursive("#{process.cwd()}/test/tmp", true) try wrench.rmdirSyncRecursive("#{process.cwd()}/test/tmp", true)
sourceRoot = process.cwd() + "/src/tower/server/generator/generators/tower/app" sourceRoot = process.cwd() + "/packages/tower-generator/server/generators/tower/app"
destinationRoot = process.cwd() + "/test/tmp" destinationRoot = process.cwd() + "/test/tmp"
cakefileDestination = File.join(destinationRoot, "Cakefile") cakefileDestination = File.join(destinationRoot, "Cakefile")
fs.unlinkSync cakefileDestination if File.exists(cakefileDestination) fs.unlinkSync cakefileDestination if File.exists(cakefileDestination)
Expand Down
2 changes: 1 addition & 1 deletion test/server.coffee
Expand Up @@ -27,7 +27,7 @@ config = require(Tower.root + '/config/databases')
for key, value of config for key, value of config
delete config[key] unless key == store delete config[key] unless key == store


require '../src/tower/server/generator/tst' require '../packages/tower-generator/server/tst'


app = Tower.Application.instance() app = Tower.Application.instance()


Expand Down

0 comments on commit a246972

Please sign in to comment.