backbone-associations-rails 0.4.1 → 0.4.2

data/README.md

@@ -16,11 +16,11 @@ Add this line to your application's Gemfile:
 
 Then require it in your javascript manifest file (```application.js``` by default)
 
-    //= reuqire backbone-associations
+    //= require backbone-associations
 
 ## Versioning
 
 ```backbone-associations-rails``` will track the version of ```backbone-associations```.
 
 ## Issues
-For issues with ```backbone-associations```, please file an issue over at their [issue tracker](https://github.com/dhruvaray/backbone-associations/issues).
+For issues with ```backbone-associations```, please file an issue over at their [issue tracker](https://github.com/dhruvaray/backbone-associations/issues). Otherwise, please file an issue here.

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

@@ -1,7 +1,7 @@
 module Backbone
   module Associations
     module Rails
-      VERSION = '0.4.1'
+      VERSION = '0.4.2'
     end
   end
 end

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

@@ -1,5 +1,5 @@
 //
-//  Backbone-associations.js 0.4.1
+//  Backbone-associations.js 0.4.2
 //
 //  (c) 2013 Dhruva Ray, Jaynti Kanani, Persistent Systems Ltd.
 //  Backbone-associations may be freely distributed under the MIT license.
@@ -135,14 +135,9 @@
                                 data = val;
                                 attributes[relationKey] = data;
                             } else {
-                                if (!this.attributes[relationKey]) {
-                                    data = collectionType ? new collectionType() : this._createCollection(relatedModel);
-                                    data.add(val, relationOptions);
-                                    attributes[relationKey] = data;
-                                } else {
-                                    this.attributes[relationKey].reset(val, relationOptions);
-                                    delete attributes[relationKey];
-                                }
+                                data = collectionType ? new collectionType() : this._createCollection(relatedModel);
+                                data.add(val, relationOptions);
+                                attributes[relationKey] = data;
                             }
 
                         } else if (relation.type === Backbone.One && relatedModel) {
@@ -185,10 +180,14 @@
                     initialTokens = _.initial(pathTokens), colModel;
 
                 colModel = relationValue.find(function (model) {
-                    var changedModel = model.get(pathTokens);
-                    return eventObject === (changedModel instanceof AssociatedModel
-                        || changedModel instanceof BackboneCollection)
-                        ? changedModel : (model.get(initialTokens) || model);
+                    if (eventObject === model) return true;
+                    if (model) {
+                        var changedModel = model.get(initialTokens);
+                        if ((changedModel instanceof AssociatedModel || changedModel instanceof BackboneCollection) && eventObject === changedModel) return true;
+                        changedModel = model.get(pathTokens);
+                        return ((changedModel instanceof AssociatedModel || changedModel instanceof BackboneCollection) && eventObject === changedModel);
+                    }
+                    return false;
                 });
                 colModel && (indexEventObject = relationValue.indexOf(colModel));
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone-associations-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies: []
 description: Backbone-associations provides a way of specifying 1:1 and 1:N relationships
   between Backbone models. Additionally, parent model instances (and objects extended