backbone-associations-rails 0.3.1 → 0.4.0

data/lib/backbone-associations-rails/version.rb

@@ -1,7 +1,7 @@
 module Backbone
   module Associations
     module Rails
-      VERSION = '0.3.1'
+      VERSION = '0.4.0'
     end
   end
 end

data/vendor/assets/javascripts/backbone-associations.js

@@ -1,5 +1,5 @@
 //
-//      Backbone-associations.js 0.3.1
+//      Backbone-associations.js 0.4.0
 //
 //      (c) 2013 Dhruva Ray, Jaynti Kanani
 //      Backbone-associations may be freely distributed under the MIT license;
@@ -12,6 +12,7 @@
 (function () {
     "use strict";
 
+
     // The top-level namespace. All public Backbone classes and modules will be attached to this.
     // Exported for the browser and CommonJS.
     var _, Backbone, BackboneModel, BackboneCollection, ModelProto,
@@ -31,7 +32,7 @@
 
     // Built-in Backbone `events`.
     defaultEvents = ["change", "add", "remove", "reset", "destroy",
-                    "sync", "error", "sort", "request"];
+        "sync", "error", "sort", "request"];
 
     // Backbone.AssociatedModel
     // --------------
@@ -42,22 +43,19 @@
     // Define `AssociatedModel` (Extends Backbone.Model).
     AssociatedModel = Backbone.AssociatedModel = BackboneModel.extend({
         // Define relations with Associated Model.
-        relations: undefined,
+        relations:undefined,
         // Define `Model` property which can keep track of already fired `events`,
         // and prevent redundant event to be triggered in case of circular model graph.
-        _proxyCalls: undefined,
+        _proxyCalls:undefined,
 
         // Get the value of an attribute.
-        get: function(attr){
+        get:function (attr) {
             return this.getAttr.apply(this, arguments);
         },
 
-        // Set a hash of model attributes on the object,
-        // fire Backbone `event` with options.
-        // It maintains relations between models during the set operation.
-        // It also bubbles up child events to the parent.
-        set: function (key, value, options) {
-            var attributes, processedRelations, tbp, attr;
+        // Set a hash of model attributes on the Backbone Model.
+        set:function (key, value, options) {
+            var attributes, attr, modelMap, modelId, obj, result = this;
             // Duplicate backbone's behavior to allow separate key/value parameters,
             // instead of a single 'attributes' object.
             if (_.isObject(key) || key == null) {
@@ -67,9 +65,36 @@
                 attributes = {};
                 attributes[key] = value;
             }
+            if (!attributes) return this;
+            for (attr in attributes) {
+                var pathTokens = getPathArray(attr), initials = _.initial(pathTokens), last = _.last(pathTokens),
+                    root = this, parentModel = this.get(initials);
+
+                modelMap || (modelMap = {});
+                if ((!parentModel && _.size(initials) > 0) || parentModel instanceof BackboneCollection) continue;
+                parentModel instanceof AssociatedModel && (root = parentModel);
+                obj = modelMap[root.cid] || (modelMap[root.cid] = {'model':root, 'data':{}});
+                obj.data[last] = attributes[attr];
+            }
+            if (modelMap) {
+                for (modelId in modelMap) {
+                    obj = modelMap[modelId];
+                    this.setAttr.call(obj.model, obj.data, options) || (result = false);
+                }
+            } else {
+                result = this.setAttr.call(this, attributes, options);
+            }
+            return result;
+        },
+
+        // Set a hash of model attributes on the object,
+        // fire Backbone `event` with options.
+        // It maintains relations between models during the set operation.
+        // It also bubbles up child events to the parent.
+        setAttr:function (attributes, options) {
+            var processedRelations, tbp, attr;
             // Extract attributes and options.
             options || (options = {});
-            if (!attributes) return this;
             if (options.unset) for (attr in attributes) attributes[attr] = void 0;
 
             if (this.relations) {
@@ -151,7 +176,7 @@
             return ModelProto.set.call(this, tbp, options);
         },
         // Bubble-up event to `parent` Model
-        _bubbleEvent: function (relationKey, eventArguments) {
+        _bubbleEvent:function (relationKey, eventArguments) {
             var args = eventArguments,
                 opt = args[0].split(":"),
                 eventType = opt[0],
@@ -168,13 +193,13 @@
                 if (relationValue instanceof BackboneCollection && "change" === eventType && eventObject) {
                     //indexEventObject = _.indexOf(relationValue.models, eventObject);
                     var pathTokens = getPathArray(eventPath),
-                        initialTokens = _.initial(pathTokens),
-                        colModel;
+                        initialTokens = _.initial(pathTokens), colModel;
+
                     colModel = relationValue.find(function (model) {
                         var changedModel = model.get(pathTokens);
-                        return eventObject === !(changedModel instanceof AssociatedModel
-                                || changedModel instanceof BackboneCollection)
-                                    ? model.get(initialTokens) : changedModel;
+                        return eventObject === (changedModel instanceof AssociatedModel
+                            || changedModel instanceof BackboneCollection)
+                            ? changedModel : (model.get(initialTokens) || model);
                     });
                     colModel && (indexEventObject = relationValue.indexOf(colModel));
                 }
@@ -209,7 +234,7 @@
             return this;
         },
         // Returns New `collection` of type `relation.relatedModel`.
-        _createCollection: function (type) {
+        _createCollection:function (type) {
             var collection, relatedModel = type;
             _.isString(relatedModel) && (relatedModel = eval(relatedModel));
             // Creates new `Backbone.Collection` and defines model class.
@@ -222,7 +247,7 @@
             return collection;
         },
         // Has the model changed. Traverse the object hierarchy to compute dirtyness.
-        hasChanged: function (attr) {
+        hasChanged:function (attr) {
             var isDirty, relation, attrValue, i, dirtyObjects;
             // To prevent cycles, check if this node is visited.
             if (!this.visitedHC) {
@@ -253,7 +278,7 @@
             return !!isDirty;
         },
         // Returns a hash of the changed attributes.
-        changedAttributes: function (diff) {
+        changedAttributes:function (diff) {
             var delta, relation, attrValue, changedCollection, i;
             // To prevent cycles, check if this node is visited.
             if (!this.visited) {
@@ -284,7 +309,7 @@
             return !delta ? false : delta;
         },
         // Returns the hash of the previous attributes of the graph.
-        previousAttributes: function () {
+        previousAttributes:function () {
             var pa, attrValue, pattrValue, pattrJSON;
             // To prevent cycles, check if this node is visited.
             if (!this.visited) {
@@ -314,12 +339,12 @@
             return pa;
         },
         // Return the previous value of the passed in attribute.
-        previous: function (attr) {
+        previous:function (attr) {
             return this.previousAttributes()[attr];
         },
 
         // The JSON representation of the model.
-        toJSON: function (options) {
+        toJSON:function (options) {
             var json, aJson;
             if (!this.visited) {
                 this.visited = true;
@@ -342,16 +367,17 @@
         },
 
         // Create a new model with identical attributes to this one.
-        clone: function () {
-           return new this.constructor(this.toJSON());
+        clone:function () {
+            return new this.constructor(this.toJSON());
         },
 
         // Get `reduced` result using passed `path` array or string.
-        getAttr: function (path, iterator) {
+        getAttr:function (path, iterator) {
             var result = this,
                 attrs = getPathArray(path),
                 key,
                 i;
+            if (_.size(attrs) < 1) return;
             iterator || (iterator = function (memo, key) {
                 return memo instanceof BackboneCollection && _.isNumber(key) ? memo.at(key) : memo.attributes[key];
             });
@@ -364,16 +390,17 @@
         }
     });
 
+    var _index = /^\d+$/;
+    var _pathTokenizer = /[^\.\[\]]+/g;
+
     // Get Path `attrs` as Array
-    // Example:
-    //  'employee.works_for.locations[2].name' -> ['employee', 'works_for', 'locations', 2, 'name']
     var getPathArray = function (path, iterator, context) {
         if (_.isString(path)) {
             iterator || (iterator = function (value) {
-                return value.match(/^\d+$/) ? parseInt(value, 10) : value;
+                return value.match(_index) ? parseInt(value, 10) : value;
             });
-            return _.map(path.match(/[^\.\[\]]+/g) || [], iterator, context);
+            return _.map(path.match(_pathTokenizer) || [''], iterator, context);
         }
-        return path || [];
+        return path || [''];
     }
 })();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone-associations-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors: