backbone-nested-attributes 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc0NWRjODcwNGY4Y2I5NDZiMzhiY2IzZmFkN2RkZjk2Yjg3MGQyYw==
+    MmUwMTJjNzYyMmEzMjk1MmJhN2QyYjE2ZmI5ODIzNTllNjg5MmU5NQ==
   data.tar.gz: !binary |-
-    MWNiZjc0NTdhMWY4NDQ0MzdjZjY0ZWVkYWM2YmVkNmZjZTFiZjRmZQ==
+    ZDc3OGE2YzI1MzI5Zjg2ZGEzM2U0MTBhNWM3ZDdkYTQyNmJiYzRjYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTkxMGM5ODQzMjgxMjc2NjBmNDIzYzhhY2JhM2JjZDI3NTdhNWI2M2EzNGY2
-    Nzg3ODQ5ZDM5MTRmYTdiYzA4NDZmOTFmNDgwNzkyNzM3NzYzOTI2MzIxNjk1
-    M2Y5YTdhZDJhMzQzZDJhMzA2MDEyMjQ2MjhkMjc4Y2JhNGMwYzM=
+    NzAwZGU5YThmOWUzMDc1MDRjZTAxODg0NDdmMWVhY2Y4YTdmNjIwYWU2NjRh
+    MDJmYjk3YWQzMzBiMmFmMTdhNmVkMTUyM2IxZWE2YzNhYjAyOGU5NTg0Nzgx
+    YmZkNWM0NGQ4NWQyYTNkZjI5YjhiNzgzYmY2YjIzMjZmYjAxZTE=
   data.tar.gz: !binary |-
-    NTZkZjc0OTU0OWE3ZjQ2MDM1ZTkwYzVmMTYyYTcyZjdiMjc4MGQwYjMzODE0
-    MzQ0OTE5YWNhMmZiZGM5NTViZDU4NGY3Y2JkYTcyZTU3MDM0YzU2Mzk1ZDJh
-    ZGI5OTMwMmFhZDEyNDFmZGMxODVmZmIyNmI1Mjc3MDRhZGQ5MDQ=
+    YjA4NWY0ZjQ2OGI1MGQ2YjY0OGI3NjNkNTliZGE5N2U3N2ZmMTJhNTRkYTBi
+    NDcyZWUzOWRlZTAzZDE1NGIyMjEwYzVjMWJlOWYyM2QyODYyMzgwMjVhZjJh
+    ZDQwZWE0NjU3NDBlOGVjMjI2NWViYjBlODMzY2U4OTI1YTRmYWU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    backbone-nested-attributes (0.4.2)
+    backbone-nested-attributes (0.4.3)
       rails (>= 3.2.8)
 
 GEM

data/app/assets/javascripts/backbone-nested-attributes/model.js

@@ -1,9 +1,7 @@
 (function(Backbone, _) {
   var BackboneModelPrototype = Backbone.Model.prototype
 
-  function setNestedAttributes(model, key, value, options) {
-    var attributes = attributesFor(key, value, options)
-
+  function setNestedAttributes(model, attributes) {
     if (attributes) {
       _(model.relations).each(function (relation) {
         if (relation.type == 'one') {
@@ -185,8 +183,19 @@
 
   Backbone.NestedAttributesModel = Backbone.Model.extend({
     set: function (key, value, options) {
-      var attributes = setNestedAttributes(this, key, value, options)
-      return BackboneModelPrototype.set.call(this, attributes, options)
+      var attributes
+
+      // Duplicate backbone's behavior to allow separate key/value parameters,
+      // instead of a single 'attributes' object.
+      if (_.isObject(key) || key == null) {
+        attributes = key
+        options = value
+      } else {
+        attributes = {}
+        attributes[key] = value
+      }
+
+      return BackboneModelPrototype.set.call(this, setNestedAttributes(this, attributes), options)
     },
 
     toJSON: function (options) {

data/backbone-nested-attributes.js

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-2014 Vicente Mundim
  *
- * Version: 0.4.2
+ * Version: 0.4.3
  *
  * MIT License
  *
@@ -34,9 +34,7 @@
 (function(Backbone, _) {
   var BackboneModelPrototype = Backbone.Model.prototype
 
-  function setNestedAttributes(model, key, value, options) {
-    var attributes = attributesFor(key, value, options)
-
+  function setNestedAttributes(model, attributes) {
     if (attributes) {
       _(model.relations).each(function (relation) {
         if (relation.type == 'one') {
@@ -218,8 +216,19 @@
 
   Backbone.NestedAttributesModel = Backbone.Model.extend({
     set: function (key, value, options) {
-      var attributes = setNestedAttributes(this, key, value, options)
-      return BackboneModelPrototype.set.call(this, attributes, options)
+      var attributes
+
+      // Duplicate backbone's behavior to allow separate key/value parameters,
+      // instead of a single 'attributes' object.
+      if (_.isObject(key) || key == null) {
+        attributes = key
+        options = value
+      } else {
+        attributes = {}
+        attributes[key] = value
+      }
+
+      return BackboneModelPrototype.set.call(this, setNestedAttributes(this, attributes), options)
     },
 
     toJSON: function (options) {

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "backbone-nested-attributes",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "main": "backbone-nested-attributes.js",
   "description": "Add Rails-like nested attributes support for Backbone.Model.",
   "license": "MIT",

data/lib/backbone-nested-attributes/version.rb

@@ -1,5 +1,5 @@
 module Backbone
   module NestedAttributes
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

data/spec/javascripts/backbone-nested-attributes/ModelSpec.js

@@ -88,6 +88,16 @@ describe("Backbone.NestedAttributesModel", function() {
         expect(author.get('name')).toEqual('Jon Snow')
       })
 
+      it('pass options to original set', function (done) {
+        var called = false
+        model.on('change:title', function () { called = true })
+        model.set('title', 'My Title', { silent: true })
+        expect(called).toBeFalsy()
+
+        model.set({title: 'My New Title'}, { silent: true })
+        expect(called).toBeFalsy()
+      });
+
       describe("passing a model to the relation attribute", function() {
         beforeEach(function() {
           author = new Person({ name: 'Jon Snow' })
@@ -671,10 +681,7 @@ describe("Backbone.NestedAttributesModel", function() {
                 model.get('comments').remove(comment)
                 model.clear()
 
-                expect(model.toJSON({ nested: true })).toEqual({
-                  title: undefined,
-                  comments_attributes: []
-                })
+                expect(model.toJSON({ nested: true })).toEqual({})
               })
             })
           })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backbone-nested-attributes
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Vicente Mundim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails