Merge pull request #173 from alexindigo/master

Made paths more consistent between client and server and friendly to RequireJS.
rendrjs · Nov 7, 2013 · 69e408f · 69e408f
2 parents db67b73 + 3eb672d
commit 69e408f
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 14 deletions.
diff --git a/index.js b/index.js
@@ -9,5 +9,5 @@ if (!this.window) {
     return exports.server = new Server(options);
   };
 
-  exports.entryPath = process.cwd();
+  exports.entryPath = process.cwd() + '/';
 }
diff --git a/server/middleware/initApp.js b/server/middleware/initApp.js
@@ -13,7 +13,7 @@ var _ = require('underscore');
 module.exports = function(appAttributes, options) {
   options = options || {};
   return function(req, res, next) {
-    var App = require(rendr.entryPath + '/app/app');
+    var App = require(rendr.entryPath + 'app/app');
 
     /**
      * Pass any data that needs to be accessible by the client

diff --git a/server/server.js b/server/server.js
@@ -42,7 +42,7 @@ function Server(options) {
    * Tell Express to use our ViewEngine to handle .js, .coffee files.
    * This can always be overridden in your app.
    */
-  this.expressApp.set('views', this.options.viewsPath || (rendr.entryPath + '/app/views'));
+  this.expressApp.set('views', this.options.viewsPath || (rendr.entryPath + 'app/views'));
   this.expressApp.set('view engine', this.options.defaultEngine);
   this.expressApp.engine(this.options.defaultEngine, this.viewEngine.render);
 

diff --git a/shared/app.js b/shared/app.js
@@ -12,7 +12,8 @@ Backbone = require('backbone');
 Fetcher = require('./fetcher');
 
 if (!global.isServer) {
-  ClientRouter = require(rendr.entryPath + "/app/router");
+  // client side only, entryPath is always empty
+  ClientRouter = require('app/router');
 }
 
 function noop() {}

diff --git a/shared/base/router.js b/shared/base/router.js
@@ -44,8 +44,8 @@ BaseRouter.prototype._initOptions = function(options) {
   this.options = options || {};
   paths = this.options.paths = this.options.paths || {};
   paths.entryPath = paths.entryPath || rendr.entryPath;
-  paths.routes = paths.routes || paths.entryPath + '/app/routes';
-  paths.controllerDir = paths.controllerDir || paths.entryPath + '/app/controllers';
+  paths.routes = paths.routes || paths.entryPath + 'app/routes';
+  paths.controllerDir = paths.controllerDir || paths.entryPath + 'app/controllers';
 };
 
 BaseRouter.prototype.getController = function(controllerName) {

diff --git a/shared/base/view.js b/shared/base/view.js
@@ -433,7 +433,7 @@ module.exports = BaseView = Backbone.View.extend({
  */
 
 BaseView.getView = function(viewName) {
-  return require(rendr.entryPath + "/app/views/" + viewName);
+  return require(rendr.entryPath + "app/views/" + viewName);
 };
 
 BaseView.attach = function(app, parentView) {

diff --git a/shared/globals.js b/shared/globals.js
@@ -6,5 +6,7 @@ if (typeof window !== "undefined" && window !== null) {
   };
 } else {
   global.isServer = true;
-  global.rendr = require('../index');
+  // hide it from requirejs since it's server only
+  var serverOnly_rendrIndex = '../index';
+  global.rendr = require(serverOnly_rendrIndex);
 }
diff --git a/shared/modelUtils.js b/shared/modelUtils.js
@@ -25,12 +25,12 @@ utils.getCollection = function(path, models, options) {
 
 utils.getModelConstructor = function(path) {
   path = utils.underscorize(path);
-  return classMap[path] || require(rendr.entryPath + "/app/models/" + path);
+  return classMap[path] || require(rendr.entryPath + "app/models/" + path);
 };
 
 utils.getCollectionConstructor = function(path) {
   path = utils.underscorize(path);
-  return classMap[path] || require(rendr.entryPath + "/app/collections/" + path);
+  return classMap[path] || require(rendr.entryPath + "app/collections/" + path);
 };
 
 utils.getConstructor = function(type, path) {

diff --git a/shared/syncer.js b/shared/syncer.js
@@ -22,7 +22,9 @@ var _ = require('underscore')
   };
 
 if (global.isServer) {
-  var qs = require('qs');
+  // hide it from requirejs since it's server only
+  var serverOnly_qs = 'qs';
+  var qs = require(serverOnly_qs);
 }
 
 var syncer = module.exports;
@@ -164,7 +166,10 @@ syncer.checkFresh = function checkFresh() {
   this.app.trigger('checkFresh:start');
 
   // Lame: have to lazy-require to prevent circular dependency.
-  modelUtils = modelUtils || require('./modelUtils');
+  // It is circular dep
+  // hide it from requirejs since it's optional/lazy-loaded
+  var lazyRequire_modelUtils = './modelUtils';
+  modelUtils = modelUtils || require(lazyRequire_modelUtils);
   url = this.getUrl(null, true);
 
   $.getJSON(url, this.params, function(resp) {

diff --git a/test/client/router.test.js b/test/client/router.test.js
@@ -11,7 +11,7 @@ clientTestHelper = require('../helpers/client_test');
 routerConfig = {
   app: new App,
   paths: {
-    entryPath: __dirname + "/../fixtures"
+    entryPath: __dirname + "/../fixtures/"
   }
 };
 

diff --git a/test/server/router.test.js b/test/server/router.test.js
@@ -12,7 +12,7 @@ sinon = require('sinon');
 
 config = {
   paths: {
-    entryPath: __dirname + "/../fixtures"
+    entryPath: __dirname + "/../fixtures/"
   }
 };