spine-rails 0.0.9 → 0.1.0

data/app/assets/javascripts/spine/local.js

@@ -1,7 +1,7 @@
 (function() {
-  if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require('spine');
-  }
+
+  if (typeof Spine === "undefined" || Spine === null) Spine = require('spine');
+
   Spine.Model.Local = {
     extended: function() {
       this.change(this.saveLocal);
@@ -20,7 +20,9 @@
       });
     }
   };
+
   if (typeof module !== "undefined" && module !== null) {
     module.exports = Spine.Model.Local;
   }
+
 }).call(this);

data/app/assets/javascripts/spine/manager.js

@@ -1,25 +1,25 @@
 (function() {
-  var $;
-  var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
-    for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
-    function ctor() { this.constructor = child; }
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor;
-    child.__super__ = parent.prototype;
-    return child;
-  }, __slice = Array.prototype.slice, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
-  if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require('spine');
-  }
+  var $,
+    __hasProp = Object.prototype.hasOwnProperty,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; },
+    __slice = Array.prototype.slice;
+
+  if (typeof Spine === "undefined" || Spine === null) Spine = require('spine');
+
   $ = Spine.$;
-  Spine.Manager = (function() {
-    __extends(Manager, Spine.Module);
+
+  Spine.Manager = (function(_super) {
+
+    __extends(Manager, _super);
+
     Manager.include(Spine.Events);
+
     function Manager() {
       this.controllers = [];
       this.bind('change', this.change);
       this.add.apply(this, arguments);
     }
+
     Manager.prototype.add = function() {
       var cont, controllers, _i, _len, _results;
       controllers = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
@@ -30,20 +30,24 @@
       }
       return _results;
     };
+
     Manager.prototype.addOne = function(controller) {
-      controller.bind('active', __bind(function() {
+      var _this = this;
+      controller.bind('active', function() {
         var args;
         args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-        return this.trigger.apply(this, ['change', controller].concat(__slice.call(args)));
-      }, this));
-      controller.bind('release', __bind(function() {
-        return this.controllers.splice(this.controllers.indexOf(controller), 1);
-      }, this));
+        return _this.trigger.apply(_this, ['change', controller].concat(__slice.call(args)));
+      });
+      controller.bind('release', function() {
+        return _this.controllers.splice(_this.controllers.indexOf(controller), 1);
+      });
       return this.controllers.push(controller);
     };
+
     Manager.prototype.deactivate = function() {
       return this.trigger.apply(this, ['change', false].concat(__slice.call(arguments)));
     };
+
     Manager.prototype.change = function() {
       var args, cont, current, _i, _len, _ref, _results;
       current = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
@@ -51,12 +55,19 @@
       _results = [];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         cont = _ref[_i];
-        _results.push(cont === current ? cont.activate.apply(cont, args) : cont.deactivate.apply(cont, args));
+        if (cont === current) {
+          _results.push(cont.activate.apply(cont, args));
+        } else {
+          _results.push(cont.deactivate.apply(cont, args));
+        }
       }
       return _results;
     };
+
     return Manager;
-  })();
+
+  })(Spine.Module);
+
   Spine.Controller.include({
     active: function() {
       var args;
@@ -81,15 +92,27 @@
       return this;
     }
   });
-  Spine.Stack = (function() {
-    __extends(Stack, Spine.Controller);
+
+  Spine.Stack = (function(_super) {
+
+    __extends(Stack, _super);
+
     Stack.prototype.controllers = {};
+
     Stack.prototype.routes = {};
+
     Stack.prototype.className = 'spine stack';
+
     function Stack() {
-      var key, value, _fn, _ref, _ref2;
+      var key, value, _fn, _ref, _ref2,
+        _this = this;
       Stack.__super__.constructor.apply(this, arguments);
       this.manager = new Spine.Manager;
+      this.manager.bind('change', function() {
+        var args, controller;
+        controller = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+        if (controller) return _this.active.apply(_this, args);
+      });
       _ref = this.controllers;
       for (key in _ref) {
         value = _ref[key];
@@ -99,32 +122,33 @@
         this.add(this[key]);
       }
       _ref2 = this.routes;
-      _fn = __bind(function(key, value) {
+      _fn = function(key, value) {
         var callback;
-        if (typeof value === 'function') {
-          callback = value;
-        }
-        callback || (callback = __bind(function() {
+        if (typeof value === 'function') callback = value;
+        callback || (callback = function() {
           var _ref3;
-          return (_ref3 = this[value]).active.apply(_ref3, arguments);
-        }, this));
-        return this.route(key, callback);
-      }, this);
+          return (_ref3 = _this[value]).active.apply(_ref3, arguments);
+        });
+        return _this.route(key, callback);
+      };
       for (key in _ref2) {
         value = _ref2[key];
         _fn(key, value);
       }
-      if (this["default"]) {
-        this[this["default"]].active();
-      }
+      if (this["default"]) this[this["default"]].active();
     }
+
     Stack.prototype.add = function(controller) {
       this.manager.add(controller);
       return this.append(controller);
     };
+
     return Stack;
-  })();
+
+  })(Spine.Controller);
+
   if (typeof module !== "undefined" && module !== null) {
     module.exports = Spine.Manager;
   }
+
 }).call(this);

data/app/assets/javascripts/spine/relation.js

@@ -1,145 +1,175 @@
 (function() {
-  var Collection, Instance, Singleton, singularize, underscore;
-  var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
-    for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
-    function ctor() { this.constructor = child; }
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor;
-    child.__super__ = parent.prototype;
-    return child;
-  }, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
-  if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require('spine');
-  }
+  var Collection, Instance, Singleton, isArray, singularize, underscore,
+    __hasProp = Object.prototype.hasOwnProperty,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
+
+  if (typeof Spine === "undefined" || Spine === null) Spine = require('spine');
+
+  isArray = Spine.isArray;
+
   if (typeof require === "undefined" || require === null) {
     require = (function(value) {
       return eval(value);
     });
   }
-  Collection = (function() {
-    __extends(Collection, Spine.Module);
+
+  Collection = (function(_super) {
+
+    __extends(Collection, _super);
+
     function Collection(options) {
       var key, value;
-      if (options == null) {
-        options = {};
-      }
+      if (options == null) options = {};
       for (key in options) {
         value = options[key];
         this[key] = value;
       }
     }
+
     Collection.prototype.all = function() {
-      return this.model.select(__bind(function(rec) {
-        return this.associated(rec);
-      }, this));
+      var _this = this;
+      return this.model.select(function(rec) {
+        return _this.associated(rec);
+      });
     };
+
     Collection.prototype.first = function() {
       return this.all()[0];
     };
+
     Collection.prototype.last = function() {
       var values;
       values = this.all();
       return values[values.length - 1];
     };
+
     Collection.prototype.find = function(id) {
-      var records;
-      records = this.model.select(__bind(function(rec) {
-        return this.associated(rec) && rec.id === id;
-      }, this));
-      if (!records[0]) {
-        throw 'Unknown record';
-      }
+      var records,
+        _this = this;
+      records = this.select(function(rec) {
+        return rec.id + '' === id + '';
+      });
+      if (!records[0]) throw 'Unknown record';
       return records[0];
     };
+
+    Collection.prototype.findAllByAttribute = function(name, value) {
+      var _this = this;
+      return this.model.select(function(rec) {
+        return rec[name] === value;
+      });
+    };
+
+    Collection.prototype.findByAttribute = function(name, value) {
+      return this.findAllByAttribute(name, value)[0];
+    };
+
     Collection.prototype.select = function(cb) {
-      return this.model.select(__bind(function(rec) {
-        return this.associated(rec) && cb(rec);
-      }, this));
+      var _this = this;
+      return this.model.select(function(rec) {
+        return _this.associated(rec) && cb(rec);
+      });
     };
+
     Collection.prototype.refresh = function(values) {
-      var record, records, value, _i, _j, _len, _len2;
-      records = this.all();
-      for (_i = 0, _len = records.length; _i < _len; _i++) {
-        record = records[_i];
+      var record, records, _i, _j, _len, _len2, _ref;
+      _ref = this.all();
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        record = _ref[_i];
         delete this.model.records[record.id];
       }
-      values = this.model.fromJSON(values);
-      for (_j = 0, _len2 = values.length; _j < _len2; _j++) {
-        value = values[_j];
-        value.newRecord = false;
-        value[this.fkey] = this.record.id;
-        this.model.records[value.id] = value;
+      records = this.model.fromJSON(values);
+      if (!isArray(records)) records = [records];
+      for (_j = 0, _len2 = records.length; _j < _len2; _j++) {
+        record = records[_j];
+        record.newRecord = false;
+        record[this.fkey] = this.record.id;
+        this.model.records[record.id] = record;
       }
-      return this.model.trigger('refresh');
+      return this.model.trigger('refresh', records);
     };
+
     Collection.prototype.create = function(record) {
       record[this.fkey] = this.record.id;
       return this.model.create(record);
     };
+
     Collection.prototype.associated = function(record) {
       return record[this.fkey] === this.record.id;
     };
+
     return Collection;
-  })();
-  Instance = (function() {
-    __extends(Instance, Spine.Module);
+
+  })(Spine.Module);
+
+  Instance = (function(_super) {
+
+    __extends(Instance, _super);
+
     function Instance(options) {
       var key, value;
-      if (options == null) {
-        options = {};
-      }
+      if (options == null) options = {};
       for (key in options) {
         value = options[key];
         this[key] = value;
       }
     }
+
     Instance.prototype.exists = function() {
       return this.record[this.fkey] && this.model.exists(this.record[this.fkey]);
     };
+
     Instance.prototype.update = function(value) {
+      if (!(value instanceof this.model)) value = new this.model(value);
+      if (value.isNew()) value.save();
       return this.record[this.fkey] = value && value.id;
     };
+
     return Instance;
-  })();
-  Singleton = (function() {
-    __extends(Singleton, Spine.Module);
+
+  })(Spine.Module);
+
+  Singleton = (function(_super) {
+
+    __extends(Singleton, _super);
+
     function Singleton(options) {
       var key, value;
-      if (options == null) {
-        options = {};
-      }
+      if (options == null) options = {};
       for (key in options) {
         value = options[key];
         this[key] = value;
       }
     }
+
     Singleton.prototype.find = function() {
       return this.record.id && this.model.findByAttribute(this.fkey, this.record.id);
     };
+
     Singleton.prototype.update = function(value) {
-      if (value != null) {
-        value[this.fkey] = this.id;
-      }
-      return value;
+      if (!(value instanceof this.model)) value = this.model.fromJSON(value);
+      value[this.fkey] = this.record.id;
+      return value.save();
     };
+
     return Singleton;
-  })();
+
+  })(Spine.Module);
+
   singularize = function(str) {
     return str.replace(/s$/, '');
   };
+
   underscore = function(str) {
     return str.replace(/::/g, '/').replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2').replace(/([a-z\d])([A-Z])/g, '$1_$2').replace(/-/g, '_').toLowerCase();
   };
+
   Spine.Model.extend({
     hasMany: function(name, model, fkey) {
       var association;
-      if (fkey == null) {
-        fkey = "" + (underscore(this.className)) + "_id";
-      }
+      if (fkey == null) fkey = "" + (underscore(this.className)) + "_id";
       association = function(record) {
-        if (typeof model === 'string') {
-          model = require(model);
-        }
+        if (typeof model === 'string') model = require(model);
         return new Collection({
           name: name,
           model: model,
@@ -148,21 +178,15 @@
         });
       };
       return this.prototype[name] = function(value) {
-        if (value != null) {
-          association(this).refresh(value);
-        }
+        if (value != null) association(this).refresh(value);
         return association(this);
       };
     },
     belongsTo: function(name, model, fkey) {
       var association;
-      if (fkey == null) {
-        fkey = "" + (singularize(name)) + "_id";
-      }
+      if (fkey == null) fkey = "" + (singularize(name)) + "_id";
       association = function(record) {
-        if (typeof model === 'string') {
-          model = require(model);
-        }
+        if (typeof model === 'string') model = require(model);
         return new Instance({
           name: name,
           model: model,
@@ -171,22 +195,16 @@
         });
       };
       this.prototype[name] = function(value) {
-        if (value != null) {
-          association(this).update(value);
-        }
+        if (value != null) association(this).update(value);
         return association(this).exists();
       };
       return this.attributes.push(fkey);
     },
     hasOne: function(name, model, fkey) {
       var association;
-      if (fkey == null) {
-        fkey = "" + (underscore(this.className)) + "_id";
-      }
+      if (fkey == null) fkey = "" + (underscore(this.className)) + "_id";
       association = function(record) {
-        if (typeof model === 'string') {
-          model = require(model);
-        }
+        if (typeof model === 'string') model = require(model);
         return new Singleton({
           name: name,
           model: model,
@@ -195,11 +213,10 @@
         });
       };
       return this.prototype[name] = function(value) {
-        if (value != null) {
-          association(this).update(value);
-        }
+        if (value != null) association(this).update(value);
         return association(this).find();
       };
     }
   });
+
 }).call(this);