js-model-rails 0.0.2 → 0.0.3

data/lib/assets/javascripts/js-model/js-model.js

@@ -1,16 +1,16 @@
-/*  js-model JavaScript library, version 0.10.1
- *  (c) 2010-2011 Ben Pickles
+/*  js-model JavaScript library, version 0.11.0
+ *  (c) 2010-2012 Ben Pickles
  *
  *  Released under MIT license.
  */
 var Model = function(name, func) {
   // The model constructor.
   var model = function(attributes) {
-    this.attributes = jQuery.extend({}, attributes)
+    this.attributes = Model.Utils.extend({}, attributes)
     this.changes = {};
     this.errors = new Model.Errors(this);
     this.uid = [name, Model.UID.generate()].join("-")
-    if (jQuery.isFunction(this.initialize)) this.initialize()
+    if (Model.Utils.isFunction(this.initialize)) this.initialize()
   };
 
   // Use module functionality to extend itself onto the constructor. Meta!
@@ -26,7 +26,7 @@ var Model = function(name, func) {
   model.prototype = new Model.Base
   model.prototype.constructor = model
 
-  if (jQuery.isFunction(func)) func.call(model, model, model.prototype)
+  if (Model.Utils.isFunction(func)) func.call(model, model, model.prototype)
 
   return model;
 };
@@ -76,7 +76,7 @@ Model.ClassMethods = {
   add: function(model) {
     var id = model.id()
 
-    if (jQuery.inArray(model, this.collection) === -1 && !(id && this.find(id))) {
+    if (Model.Utils.inArray(this.collection, model) === -1 && !(id && this.find(id))) {
       this.collection.push(model)
       this.trigger("add", [model])
     }
@@ -90,7 +90,7 @@ Model.ClassMethods = {
 
   // Convenience method to allow a simple method of chaining class methods.
   chain: function(collection) {
-    return jQuery.extend({}, this, { collection: collection })
+    return Model.Utils.extend({}, this, { collection: collection || [] })
   },
 
   count: function() {
@@ -223,7 +223,7 @@ Model.ClassMethods = {
   },
 
   sortBy: function(attribute_or_func) {
-    var is_func = jQuery.isFunction(attribute_or_func)
+    var is_func = Model.Utils.isFunction(attribute_or_func)
     var extract = function(model) {
       return attribute_or_func.call(model)
     }
@@ -242,10 +242,10 @@ Model.ClassMethods = {
     })
   },
 
-  use: function(klass) {
+  use: function(plugin) {
     var args = Array.prototype.slice.call(arguments, 1)
     args.unshift(this)
-    klass.apply(this, args)
+    plugin.apply(this, args)
     return this
   }
 };
@@ -299,7 +299,7 @@ Model.InstanceMethods = {
   attr: function(name, value) {
     if (arguments.length === 0) {
       // Combined attributes/changes object.
-      return jQuery.extend({}, this.attributes, this.changes);
+      return Model.Utils.extend({}, this.attributes, this.changes);
     } else if (arguments.length === 2) {
       // Don't write to attributes yet, store in changes for now.
       if (this.attributes[name] === value) {
@@ -308,12 +308,14 @@ Model.InstanceMethods = {
       } else {
         this.changes[name] = value;
       }
+      this.trigger("change:" + name, [this])
       return this;
     } else if (typeof name === "object") {
       // Mass-assign attributes.
       for (var key in name) {
         this.attr(key, name[key]);
       }
+      this.trigger("change", [this])
       return this;
     } else {
       // Changes take precedent over attributes.
@@ -379,7 +381,7 @@ Model.InstanceMethods = {
   },
 
   merge: function(attributes) {
-    jQuery.extend(this.attributes, attributes);
+    Model.Utils.extend(this.attributes, attributes);
     return this;
   },
 
@@ -447,14 +449,14 @@ Model.localStorage = function(klass) {
   var addToIndex = function(uid) {
     var uids = readIndex()
 
-    if (jQuery.inArray(uid, uids) === -1) {
+    if (Model.Utils.inArray(uids, uid) === -1) {
       uids.push(uid)
       writeIndex(uids)
     }
   }
   var removeFromIndex = function(uid) {
     var uids = readIndex()
-    var index = jQuery.inArray(uid, uids)
+    var index = Model.Utils.inArray(uids, uid)
 
     if (index > -1) {
       uids.splice(index, 1)
@@ -489,7 +491,7 @@ Model.localStorage = function(klass) {
       for (var i = 0, length = uids.length; i < length; i++) {
         uid = uids[i]
 
-        if (jQuery.inArray(uid, existing_uids) == -1) {
+        if (Model.Utils.inArray(existing_uids, uid) == -1) {
           attributes = JSON.parse(localStorage[uid])
           model = new klass(attributes)
           model.uid = uid
@@ -513,12 +515,12 @@ Model.Log = function() {
 
 Model.Module = {
   extend: function(obj) {
-    jQuery.extend(this, obj)
+    Model.Utils.extend(this, obj)
     return this
   },
 
   include: function(obj) {
-    jQuery.extend(this.prototype, obj)
+    Model.Utils.extend(this.prototype, obj)
     return this
   }
 };
@@ -536,7 +538,7 @@ Model.REST = function(klass, resource, methods) {
     return resource_param_names
   })()
 
-  return jQuery.extend({
+  return Model.Utils.extend({
 		path: function(model) {
       var path = resource;
       jQuery.each(resource_param_names, function(i, param) {
@@ -572,7 +574,7 @@ Model.REST = function(klass, resource, methods) {
         params = null;
       }
       if(jQuery.ajaxSettings.data){
-        params = jQuery.extend({}, jQuery.ajaxSettings.data, params)
+        params = Model.Utils.extend({}, jQuery.ajaxSettings.data, params)
       }
       return JSON.stringify(params)
     },
@@ -679,10 +681,38 @@ Model.UID = {
   }
 };
 
-Model.VERSION = "0.10.1";
+Model.Utils = {
+  extend: function(receiver) {
+    var objs = Array.prototype.slice.call(arguments, 1)
+
+    for (var i = 0, length = objs.length; i < length; i++) {
+      for (var property in objs[i]) {
+        receiver[property] = objs[i][property]
+      }
+    }
+
+    return receiver
+  },
+
+  inArray: function(array, obj) {
+    if (array.indexOf) return array.indexOf(obj)
+
+    for (var i = 0, length = array.length; i < length; i++) {
+      if (array[i] === obj) return i
+    }
+
+    return -1
+  },
+
+  isFunction: function(obj) {
+    return Object.prototype.toString.call(obj) === "[object Function]"
+  }
+}
+
+Model.VERSION = "0.11.0";
 
 Model.Base = (function() {
   function Base() {}
-  Base.prototype = jQuery.extend({}, Model.Callbacks, Model.InstanceMethods)
+  Base.prototype = Model.Utils.extend({}, Model.Callbacks, Model.InstanceMethods)
   return Base
 })();

data/lib/js-model/version.rb

@@ -1,3 +1,3 @@
 module JsModel
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-model-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-08-16 00:00:00.000000000Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70317223697480 !ruby/object:Gem::Requirement
+  requirement: &70245243659460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317223697480
+  version_requirements: *70245243659460
 description: Work with models in your JavaScript in your Rails
 email:
 - spideryoung@gmail.com
@@ -59,8 +59,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: js-model-rails
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Work with models in your JavaScript in your Rails
 test_files: []
+has_rdoc: