Makes all imports relative.

diff --git a/.gitignore b/.gitignore
index 2488c18..a8854c7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ lib-cov/
 test/*.log
 test/fixtures/*.json
 test/fixtures/logs/*.log
+.cache/
+.tmp/
 
 build
 dist
@@ -32,9 +34,7 @@ var
 log
 tmp
 
-lib/version.js
+version.js
 www/presets/*.json
 
-.cache
-.tmp
 

diff --git a/.npmignore b/.npmignore
index d88161d..6609060 100644 (file)
--- a/.npmignore
+++ b/.npmignore
@@ -17,8 +17,6 @@ pip-log.txt
 docs/_build/*
 .env/
 
-.cache
-.tmp
 npm-debug.log
 node_modules/
 node_modules/*
@@ -27,6 +25,8 @@ lib-cov/
 test/*.log
 test/fixtures/*.json
 test/fixtures/logs/*.log
+.cache/
+.tmp/
 
 build
 dist

diff --git a/Cokefile b/Cokefile
index 876cf99..c19c035 100644 (file)
--- a/Cokefile
+++ b/Cokefile
@@ -30,7 +30,7 @@ task \install 'Install project dependencies.' ->
 
 task \setup 'Ensure project is set up for development.' ->
     invoke \install
-    invoke \link
+    # invoke \link
     err, version <- writeVersionFile 'src/version.js'
 
 
@@ -44,7 +44,7 @@ task \build 'Build coco sources' ->
     invoke \setup
     coco <[ -bjc package.co ]>
     
-    {sources}  = require 'limn/server/view-helpers'
+    {sources}  = require './src/server/view-helpers'
     browserify = require 'browserify'
     Coco       = require 'coco'
     Jade       = require 'jade'
@@ -99,7 +99,7 @@ task \build 'Build coco sources' ->
                 return @ok() 
             return @ok() if _.startsWith(srcfile, 'vendor') and exists outfile
             parts = srcfile.replace fullExt, '' .split '/' .slice 1
-            parts.pop() if 'index' is _.last parts
+            # parts.pop() if 'index' is _.last parts
             ID = parts.join '/' 
             console.log "  Wrapping JS in Module:\t #infile \t-->\t #outfile"
             mkdirp dirname outfile
@@ -140,7 +140,7 @@ task \bundle 'Build application and vendor bundles' ->
     invoke \bundle_combine
 
 task \bundle_app 'Build application bundle' ->
-    {sources} = require 'limn/server/view-helpers'
+    {sources} = require './src/server/view-helpers'
     
     app_sources = sources("www/modules.yaml", 'development')
         .filter -> not _.startsWith it, '/vendor'
@@ -154,7 +154,7 @@ task \bundle_app 'Build application bundle' ->
     say 'ok.\n'
 
 task \bundle_vendor 'Build vendor bundle' ->
-    {sources} = require 'limn/server/view-helpers'
+    {sources} = require './src/server/view-helpers'
     
     VENDOR_BUNDLE_PATH = 'var/vendor/vendor-bundle.js'
     vendor_sources = sources("www/modules.yaml", 'development')
@@ -220,8 +220,7 @@ task \clean 'Clean up environment and artifacts' ->
 
 
 task \source_list 'Print a list of the source file paths.' ->
-    invoke \setup
-    {sources} = require 'limn/server/view-helpers'
+    {sources} = require './src/server/view-helpers'
     say do
         sources("www/modules.yaml", 'development')
             .map -> it.slice 1

diff --git a/lib/app.js b/lib/app.js
index 4b2153d..4b42779 100644 (file)
--- a/lib/app.js
+++ b/lib/app.js
@@ -1,6 +1,6 @@
 var Backbone, op, AppView, _ref, _;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
+_ref = require('./util'), _ = _ref._, op = _ref.op;
 /**
  * @class Application view, automatically attaching to an existing element
  *  found at `appSelector`.

diff --git a/lib/base/asset-manager.js b/lib/base/asset-manager.js
index 777e183..47c80f6 100644 (file)
--- a/lib/base/asset-manager.js
+++ b/lib/base/asset-manager.js
@@ -1,6 +1,6 @@
 var op, ReadyEmitter, AssetManager, _ref, _;
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
-ReadyEmitter = require('limn/util/event').ReadyEmitter;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
+ReadyEmitter = require('../util/event').ReadyEmitter;
 AssetManager = (function(superclass){
   AssetManager.displayName = 'AssetManager';
   var prototype = __extend(AssetManager, superclass).prototype, constructor = AssetManager;

diff --git a/lib/base/base-mixin.js b/lib/base/base-mixin.js
index 95e44a0..4acc079 100644 (file)
--- a/lib/base/base-mixin.js
+++ b/lib/base/base-mixin.js
@@ -1,6 +1,6 @@
 var Backbone, op, BaseBackboneMixin, Mixin, mixinBase, _ref, _, __slice = [].slice;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
 BaseBackboneMixin = exports.BaseBackboneMixin = {
   initialize: function(){
     return this.__apply_bind__();

diff --git a/lib/base/base-mixin.mod.js b/lib/base/base-mixin.mod.js
index c2ad253..03de9b4 100644 (file)
--- a/lib/base/base-mixin.mod.js
+++ b/lib/base/base-mixin.mod.js
@@ -2,7 +2,7 @@ require.define('/node_modules/limn/base/base-mixin.js', function(require, module
 
 var Backbone, op, BaseBackboneMixin, Mixin, mixinBase, _ref, _, __slice = [].slice;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
 BaseBackboneMixin = exports.BaseBackboneMixin = {
   initialize: function(){
     return this.__apply_bind__();

diff --git a/lib/base/base-model.js b/lib/base/base-model.js
index 2d83a61..2e3394c 100644 (file)
--- a/lib/base/base-model.js
+++ b/lib/base/base-model.js
@@ -1,7 +1,7 @@
 var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, BaseList, _ref, _, __slice = [].slice;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
-_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
+_ref = require('./base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase;
 /**
  * @class Base model, extending Backbone.Model, used by scaffold and others.
  * @extends Backbone.Model

diff --git a/lib/base/base-model.mod.js b/lib/base/base-model.mod.js
index 1c2b0c4..9d7f227 100644 (file)
--- a/lib/base/base-model.mod.js
+++ b/lib/base/base-model.mod.js
@@ -2,8 +2,8 @@ require.define('/node_modules/limn/base/base-model.js', function(require, module
 
 var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, BaseList, _ref, _, __slice = [].slice;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
-_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
+_ref = require('./base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase;
 /**
  * @class Base model, extending Backbone.Model, used by scaffold and others.
  * @extends Backbone.Model

diff --git a/lib/base/base-view.js b/lib/base/base-view.js
index aac1098..0fdc165 100644 (file)
--- a/lib/base/base-view.js
+++ b/lib/base/base-view.js
@@ -1,9 +1,9 @@
-var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice;
+var Backbone, op, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
-_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase;
-BaseModel = require('limn/base/base-mixin').BaseModel;
-DataBinding = require('limn/base/data-binding').DataBinding;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
+mixinBase = require('./base-mixin').mixinBase;
+BaseModel = require('./base-model').BaseModel;
+DataBinding = require('./data-binding').DataBinding;
 /**
  * @class Base view, extending Backbone.View, used by scaffold and others.
  * @extends Backbone.View

diff --git a/lib/base/base-view.mod.js b/lib/base/base-view.mod.js
index 7b3e07f..e599e37 100644 (file)
--- a/lib/base/base-view.mod.js
+++ b/lib/base/base-view.mod.js
@@ -1,11 +1,11 @@
 require.define('/node_modules/limn/base/base-view.js', function(require, module, exports, __dirname, __filename, undefined){
 
-var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice;
+var Backbone, op, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
-_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase;
-BaseModel = require('limn/base/base-mixin').BaseModel;
-DataBinding = require('limn/base/data-binding').DataBinding;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
+mixinBase = require('./base-mixin').mixinBase;
+BaseModel = require('./base-model').BaseModel;
+DataBinding = require('./data-binding').DataBinding;
 /**
  * @class Base view, extending Backbone.View, used by scaffold and others.
  * @extends Backbone.View

diff --git a/lib/base/base.js b/lib/base/base.js
index a053582..eac2083 100644 (file)
--- a/lib/base/base.js
+++ b/lib/base/base.js
@@ -2,7 +2,7 @@ var EventEmitter, op, Base, k, _ref, _, _i, _len, __slice = [].slice;
 EventEmitter = require('events').EventEmitter;
 EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
 EventEmitter.prototype.trigger = EventEmitter.prototype.emit;
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
 /**
  * @class Eventful base class.
  * @extends EventEmitter

diff --git a/lib/base/base.mod.js b/lib/base/base.mod.js
index 1be5b75..d8daec5 100644 (file)
--- a/lib/base/base.mod.js
+++ b/lib/base/base.mod.js
@@ -4,7 +4,7 @@ var EventEmitter, op, Base, k, _ref, _, _i, _len, __slice = [].slice;
 EventEmitter = require('events').EventEmitter;
 EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
 EventEmitter.prototype.trigger = EventEmitter.prototype.emit;
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
 /**
  * @class Eventful base class.
  * @extends EventEmitter

diff --git a/lib/base/cascading-model.js b/lib/base/cascading-model.js
index 3fd3f9d..f6c10bd 100644 (file)
--- a/lib/base/cascading-model.js
+++ b/lib/base/cascading-model.js
@@ -1,7 +1,7 @@
 var op, BaseModel, BaseList, Cascade, CascadingModel, _ref, _;
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
-_ref = require('limn/base/base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList;
-Cascade = require('limn/util/cascade');
+_ref = require('../util'), _ = _ref._, op = _ref.op;
+_ref = require('./base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList;
+Cascade = require('../util/cascade');
 /**
  * @class A model that implements cascading lookups for its attributes.
  */

diff --git a/lib/base/cascading-model.mod.js b/lib/base/cascading-model.mod.js
index 5a19a6d..2ddc3c8 100644 (file)
--- a/lib/base/cascading-model.mod.js
+++ b/lib/base/cascading-model.mod.js
@@ -1,9 +1,9 @@
 require.define('/node_modules/limn/base/cascading-model.js', function(require, module, exports, __dirname, __filename, undefined){
 
 var op, BaseModel, BaseList, Cascade, CascadingModel, _ref, _;
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
-_ref = require('limn/base/base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList;
-Cascade = require('limn/util/cascade');
+_ref = require('../util'), _ = _ref._, op = _ref.op;
+_ref = require('./base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList;
+Cascade = require('../util/cascade');
 /**
  * @class A model that implements cascading lookups for its attributes.
  */

diff --git a/lib/base/data-binding.js b/lib/base/data-binding.js
index 8ddc4a3..3964b9d 100644 (file)
--- a/lib/base/data-binding.js
+++ b/lib/base/data-binding.js
@@ -1,6 +1,6 @@
 var Backbone, op, DataBinding, _ref, _;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
 exports.DataBinding = DataBinding = (function(){
   DataBinding.displayName = 'DataBinding';
   var prototype = DataBinding.prototype, constructor = DataBinding;

diff --git a/lib/base/data-binding.mod.js b/lib/base/data-binding.mod.js
index f6c0475..336e9b3 100644 (file)
--- a/lib/base/data-binding.mod.js
+++ b/lib/base/data-binding.mod.js
@@ -2,7 +2,7 @@ require.define('/node_modules/limn/base/data-binding.js', function(require, modu
 
 var Backbone, op, DataBinding, _ref, _;
 Backbone = require('backbone');
-_ref = require('limn/util'), _ = _ref._, op = _ref.op;
+_ref = require('../util'), _ = _ref._, op = _ref.op;
 exports.DataBinding = DataBinding = (function(){
   DataBinding.displayName = 'DataBinding';
   var prototype = DataBinding.prototype, constructor = DataBinding;

diff --git a/lib/base/index.js b/lib/base/index.js
index 62833c4..5caef36 100644 (file)
--- a/lib/base/index.js
+++ b/lib/base/index.js
@@ -1,11 +1,11 @@
 var mixins, models, views, cache, cascading, data_binding;
-exports.Base = require('limn/base/base');
-mixins = require('limn/base/base-mixin');
-models = require('limn/base/base-model');
-views = require('limn/base/base-view');
-cache = require('limn/base/model-cache');
-cascading = require('limn/base/cascading-model');
-data_binding = require('limn/base/data-binding');
+exports.Base = require('./base');
+mixins = require('./base-mixin');
+models = require('./base-model');
+views = require('./base-view');
+cache = require('./model-cache');
+cascading = require('./cascading-model');
+data_binding = require('./data-binding');
 __import(__import(__import(__import(__import(__import(exports, mixins), models), views), cache), cascading), data_binding);
 function __import(obj, src){
   var own = {}.hasOwnProperty;

diff --git a/lib/base/index.mod.js b/lib/base/index.mod.js
index 8e7fb07..d23b254 100644 (file)
--- a/lib/base/index.mod.js
+++ b/lib/base/index.mod.js
@@ -1,13 +1,13 @@
-require.define('/node_modules/limn/base.js', function(require, module, exports, __dirname, __filename, undefined){
+require.define('/node_modules/limn/base/index.js', function(require, module, exports, __dirname, __filename, undefined){
 
 var mixins, models, views, cache, cascading, data_binding;
-exports.Base = require('limn/base/base');
-mixins = require('limn/base/base-mixin');
-models = require('limn/base/base-model');
-views = require('limn/base/base-view');
-cache = require('limn/base/model-cache');
-cascading = require('limn/base/cascading-model');
-data_binding = require('limn/base/data-binding');
+exports.Base = require('./base');
+mixins = require('./base-mixin');
+models = require('./base-model');
+views = require('./base-view');
+cache = require('./model-cache');
+cascading = require('./cascading-model');
+data_binding = require('./data-binding');
 __import(__import(__import(__import(__import(__import(exports, mixins), models), views), cache), cascading), data_binding);
 function __import(obj, src){
   var own = {}.hasOwnProperty;

diff --git a/lib/base/model-cache.js b/lib/base/model-cache.js
index e951ad1..