spine-rails 0.0.2 → 0.0.3

data/app/assets/javascripts/spine.js

@@ -358,7 +358,7 @@
       _results = [];
       for (key in atts) {
         value = atts[key];
-        _results.push(this[key] = value);
+        _results.push(typeof this[key] === 'function' ? this[key](value) : this[key] = value);
       }
       return _results;
     };
@@ -368,9 +368,17 @@
       _ref = this.constructor.attributes;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         key = _ref[_i];
-        result[key] = this[key];
+        if (key in this) {
+          if (typeof this[key] === 'function') {
+            result[key] = this[key]();
+          } else {
+            result[key] = this[key];
+          }
+        }
+      }
+      if (this.id) {
+        result.id = this.id;
       }
-      result.id = this.id;
       return result;
     };
     Model.prototype.eql = function(rec) {
@@ -665,7 +673,7 @@
   if (typeof module !== "undefined" && module !== null) {
     module.exports = Spine;
   }
-  Spine.version = '0.0.9';
+  Spine.version = '1.0.0';
   Spine.isArray = isArray;
   Spine.isBlank = isBlank;
   Spine.$ = $;
@@ -714,4 +722,5 @@
     return new this(a1, a2, a3, a4, a5);
   };
   Spine.Class = Module;
+  Spine.App = new Controller;
 }).call(this);

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

@@ -1,5 +1,5 @@
 (function() {
-  var $, Ajax, Base, Collection, Include, Model, Singleton;
+  var $, Ajax, Base, Collection, Extend, Include, Model, Singleton;
   var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __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; }
@@ -9,7 +9,7 @@
     return child;
   };
   if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require("spine");
+    Spine = require('spine');
   }
   $ = Spine.$;
   Model = Spine.Model;
@@ -44,18 +44,19 @@
         return;
       }
       if (this.pending) {
-        return this.requests.push(callback);
+        this.requests.push(callback);
       } else {
         this.pending = true;
-        return this.request(callback);
+        this.request(callback);
       }
+      return callback;
     }
   };
   Base = (function() {
     function Base() {}
     Base.prototype.defaults = {
-      contentType: "application/json",
-      dataType: "json",
+      contentType: 'application/json',
+      dataType: 'json',
       processData: false
     };
     Base.prototype.ajax = function(params, defaults) {
@@ -75,20 +76,20 @@
     }
     Collection.prototype.findAll = function(params) {
       return this.ajax(params, {
-        type: "GET",
+        type: 'GET',
         url: Ajax.getURL(this.model)
       }).success(this.recordsResponse).error(this.errorResponse);
     };
-    Collection.prototype.fetch = function() {
-      return this.findAll().success(__bind(function(records) {
+    Collection.prototype.fetch = function(params) {
+      return this.findAll(params).success(__bind(function(records) {
         return this.model.refresh(records);
       }, this));
     };
     Collection.prototype.recordsResponse = function(data, status, xhr) {
-      return this.model.trigger("ajaxSuccess", null, status, xhr);
+      return this.model.trigger('ajaxSuccess', null, status, xhr);
     };
     Collection.prototype.errorResponse = function(xhr, statusText, error) {
-      return this.model.trigger("ajaxError", null, xhr, statusText, error);
+      return this.model.trigger('ajaxError', null, xhr, statusText, error);
     };
     return Collection;
   })();
@@ -103,14 +104,14 @@
     }
     Singleton.prototype.find = function(params) {
       return this.ajax(params, {
-        type: "GET",
+        type: 'GET',
         url: this.url
       });
     };
     Singleton.prototype.create = function(params) {
       return this.queue(__bind(function() {
         return this.ajax(params, {
-          type: "POST",
+          type: 'POST',
           data: JSON.stringify(this.record),
           url: Ajax.getURL(this.model)
         }).success(this.recordResponse).error(this.errorResponse);
@@ -119,7 +120,7 @@
     Singleton.prototype.update = function(params) {
       return this.queue(__bind(function() {
         return this.ajax(params, {
-          type: "PUT",
+          type: 'PUT',
           data: JSON.stringify(this.record),
           url: Ajax.getURL(this.record)
         }).success(this.recordResponse).error(this.errorResponse);
@@ -128,13 +129,13 @@
     Singleton.prototype.destroy = function(params) {
       return this.queue(__bind(function() {
         return this.ajax(params, {
-          type: "DELETE",
+          type: 'DELETE',
           url: Ajax.getURL(this.record)
         }).success(this.recordResponse).error(this.errorResponse);
       }, this));
     };
     Singleton.prototype.recordResponse = function(data, status, xhr) {
-      this.record.trigger("ajaxSuccess", this.record, status, xhr);
+      this.record.trigger('ajaxSuccess', this.record, status, xhr);
       if (Spine.isBlank(data)) {
         return;
       }
@@ -147,14 +148,14 @@
       }, this));
     };
     Singleton.prototype.blankResponse = function(data, status, xhr) {
-      return this.record.trigger("ajaxSuccess", this.record, status, xhr);
+      return this.record.trigger('ajaxSuccess', this.record, status, xhr);
     };
     Singleton.prototype.errorResponse = function(xhr, statusText, error) {
-      return this.record.trigger("ajaxError", this.record, xhr, statusText, error);
+      return this.record.trigger('ajaxError', this.record, xhr, statusText, error);
     };
     return Singleton;
   })();
-  Model.host = "";
+  Model.host = '';
   Include = {
     ajax: function() {
       return new Singleton(this);
@@ -162,17 +163,22 @@
     url: function() {
       var base;
       base = Ajax.getURL(this.constructor);
-      if (base.charAt(base.length - 1) !== "/") {
-        base += "/";
+      if (base.charAt(base.length - 1) !== '/') {
+        base += '/';
       }
       base += encodeURIComponent(this.id);
       return base;
     }
   };
-  Model.Ajax = {
+  Extend = {
     ajax: function() {
       return new Collection(this);
     },
+    url: function() {
+      return "" + Model.host + "/" + (this.className.toLowerCase()) + "s";
+    }
+  };
+  Model.Ajax = {
     extended: function() {
       this.change(function(record, type) {
         return record.ajax()[type]();
@@ -181,10 +187,14 @@
         var _ref;
         return (_ref = this.ajax()).fetch.apply(_ref, arguments);
       });
+      this.extend(Extend);
+      return this.include(Include);
+    }
+  };
+  Model.Ajax.Methods = {
+    extended: function() {
+      this.extend(Extend);
       return this.include(Include);
-    },
-    url: function() {
-      return "" + Model.host + "/" + (this.className.toLowerCase()) + "s";
     }
   };
   Spine.Ajax = Ajax;

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

@@ -9,18 +9,18 @@
     return child;
   };
   if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require("spine");
+    Spine = require('spine');
   }
   $ = Spine.$;
   Spine.List = (function() {
     __extends(List, Spine.Controller);
     List.prototype.events = {
-      "click .item": "click"
+      'click .item': 'click'
     };
     List.prototype.selectFirst = false;
     function List() {
       this.change = __bind(this.change, this);      List.__super__.constructor.apply(this, arguments);
-      this.bind("change", this.change);
+      this.bind('change', this.change);
     }
     List.prototype.template = function() {
       return arguments[0];
@@ -30,8 +30,8 @@
         return;
       }
       this.current = item;
-      this.children().removeClass("active");
-      return this.children().forItem(this.current).addClass("active");
+      this.children().removeClass('active');
+      return this.children().forItem(this.current).addClass('active');
     };
     List.prototype.render = function(items) {
       if (items) {
@@ -40,8 +40,8 @@
       this.html(this.template(this.items));
       this.change(this.current);
       if (this.selectFirst) {
-        if (!this.children(".active").length) {
-          return this.children(":first").click();
+        if (!this.children('.active').length) {
+          return this.children(':first').click();
         }
       }
     };
@@ -51,7 +51,7 @@
     List.prototype.click = function(e) {
       var item;
       item = $(e.target).item();
-      return this.trigger("change", item);
+      return this.trigger('change', item);
     };
     return List;
   })();

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

@@ -1,6 +1,6 @@
 (function() {
   if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require("spine");
+    Spine = require('spine');
   }
   Spine.Model.Local = {
     extended: function() {

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

@@ -1,10 +1,23 @@
 (function() {
-  var Collection, Instance, singularize, underscore;
-  var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+  var Collection, Instance, Singleton, require, 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");
+    Spine = require('spine');
+  }
+  if (typeof require === "undefined" || require === null) {
+    require = (function(value) {
+      return eval(value);
+    });
   }
   Collection = (function() {
+    __extends(Collection, Spine.Module);
     function Collection(options) {
       var key, value;
       if (options == null) {
@@ -34,7 +47,7 @@
         return this.associated(rec) && rec.id === id;
       }, this));
       if (!records[0]) {
-        throw "Unknown record";
+        throw 'Unknown record';
       }
       return records[0];
     };
@@ -57,7 +70,7 @@
         value[this.fkey] = this.record.id;
         this.model.records[value.id] = value;
       }
-      return this.model.trigger("refresh");
+      return this.model.trigger('refresh');
     };
     Collection.prototype.create = function(record) {
       record[this.fkey] = this.record.id;
@@ -69,6 +82,7 @@
     return Collection;
   })();
   Instance = (function() {
+    __extends(Instance, Spine.Module);
     function Instance(options) {
       var key, value;
       if (options == null) {
@@ -79,14 +93,37 @@
         this[key] = value;
       }
     }
-    Instance.prototype.find = function() {
-      return this.record[this.fkey] && this.model.find(this.record[this.fkey]);
+    Instance.prototype.exists = function() {
+      return this.record[this.fkey] && this.model.exists(this.record[this.fkey]);
     };
     Instance.prototype.update = function(value) {
       return this.record[this.fkey] = value && value.id;
     };
     return Instance;
   })();
+  Singleton = (function() {
+    __extends(Singleton, Spine.Module);
+    function Singleton(options) {
+      var key, value;
+      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;
+    };
+    return Singleton;
+  })();
   singularize = function(str) {
     return str.replace(/s$/, '');
   };
@@ -94,13 +131,13 @@
     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({
-    many: function(name, model, fkey) {
+    hasMany: function(name, model, fkey) {
       var association;
       if (fkey == null) {
         fkey = "" + (underscore(this.className)) + "_id";
       }
       association = function(record) {
-        if (typeof model === "string") {
+        if (typeof model === 'string') {
           model = require(model);
         }
         return new Collection({
@@ -110,20 +147,20 @@
           fkey: fkey
         });
       };
-      this.prototype.__defineGetter__(name, function() {
+      return this.prototype[name] = function(value) {
+        if (value != null) {
+          association(this).refresh(value);
+        }
         return association(this);
-      });
-      return this.prototype.__defineSetter__(name, function(value) {
-        return association(this).refresh(value);
-      });
+      };
     },
-    belongs: function(name, model, fkey) {
+    belongsTo: function(name, model, fkey) {
       var association;
       if (fkey == null) {
         fkey = "" + (singularize(name)) + "_id";
       }
       association = function(record) {
-        if (typeof model === "string") {
+        if (typeof model === 'string') {
           model = require(model);
         }
         return new Instance({
@@ -133,13 +170,36 @@
           fkey: fkey
         });
       };
-      this.prototype.__defineGetter__(name, function() {
-        return association(this).find();
-      });
-      this.prototype.__defineSetter__(name, function(value) {
-        return association(this).update(value);
-      });
+      this.prototype[name] = function(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";
+      }
+      association = function(record) {
+        if (typeof model === 'string') {
+          model = require(model);
+        }
+        return new Singleton({
+          name: name,
+          model: model,
+          record: record,
+          fkey: fkey
+        });
+      };
+      return this.prototype[name] = function(value) {
+        if (value != null) {
+          association(this).update(value);
+        }
+        return association(this).find();
+      };
     }
   });
 }).call(this);

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

@@ -9,7 +9,7 @@
     return child;
   }, __slice = Array.prototype.slice;
   if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require("spine");
+    Spine = require('spine');
   }
   $ = Spine.$;
   hashStrip = /^#*/;

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

@@ -9,7 +9,7 @@
     return child;
   };
   if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require("spine");
+    Spine = require('spine');
   }
   $ = Spine.$;
   Spine.Tabs = (function() {

data/lib/spine/rails/version.rb

@@ -1,6 +1,6 @@
 module Spine
   module Rails
-    VERSION = "0.0.2"
-    SPINE_VERSION = "0.0.9"
+    VERSION = "0.0.3"
+    SPINE_VERSION = "1.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spine-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
+date: 2011-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70181005400000 !ruby/object:Gem::Requirement
+  requirement: &70355697280880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70181005400000
+  version_requirements: *70355697280880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70181005399540 !ruby/object:Gem::Requirement
+  requirement: &70355697280420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70181005399540
+  version_requirements: *70355697280420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70181005399080 !ruby/object:Gem::Requirement
+  requirement: &70355697279960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70181005399080
+  version_requirements: *70355697279960
 description: This gem provides Spine for your Rails 3 application.
 email:
 - info@eribium.org