backbone-nested-attributes 0.2.3 → 0.3.0

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

@@ -35,10 +35,11 @@
   function setNestedAttributeFor(model, relation, attributes) {
     var key           = relation.key,
         value         = attributes[key],
+        deletedValue  = attributes['deleted_' + key],
         currentValue  = model.get(key),
         nested        = currentValue || createNestedAttributeCollection(relation)
 
-    value = value instanceof Backbone.Collection ? value.slice() : value
+    value = valueOrSliceCollection(value)
 
     configureEventBubbling(model, nested, relation)
 
@@ -46,11 +47,22 @@
       nested.set(value)
     }
 
+    if (deletedValue) {
+      delete attributes['deleted_' + key]
+
+      deletedValue = valueOrSliceCollection(deletedValue)
+      nested.deletedModels.set(deletedValue)
+    }
+
     attributes[key] = nested
 
     return attributes
   }
 
+  function valueOrSliceCollection(value) {
+    return value instanceof Backbone.Collection ? value.slice() : value
+  }
+
   function clearDeletedModelsFor(model) {
     _(model.relations).each(function (relation) {
       var collection = model.get(relation.key)
@@ -101,12 +113,20 @@
           jsonValue
 
       if (value) {
-        if (options && options.nested) {
-          delete json[key]
-          key = key + '_attributes'
+        if (options) {
+          if (options.withDeleted) {
+            if (value.deletedModels) {
+              json['deleted_' + key] = value.deletedModels.toJSON(options)
+            }
+          }
+
+          if (options.nested) {
+            if (value.deletedModels) {
+              deleted = value.deletedModels.toJSON(options)
+            }
 
-          if (value.deletedModels) {
-            deleted = value.deletedModels.toJSON(options)
+            delete json[key]
+            key = key + '_attributes'
           }
         }
 
@@ -130,15 +150,16 @@
     collection.model = _(relation).result('relatedModel') || collection.model
 
     collection.deletedModels = new Backbone.Collection
-    collection.on('remove', nestedModelRemoved, collection)
+    collection.deletedModels.model = collection.model
+    collection.on('remove', nestedModelRemoved)
 
     return collection
   }
 
-  function nestedModelRemoved(model) {
+  function nestedModelRemoved(model, collection) {
     if (!model.isNew()) {
       model.set({ _destroy: true })
-      this.deletedModels.add(model) // this refers to the collection
+      collection.deletedModels.add(model)
     }
   }
 

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

@@ -16,17 +16,34 @@
     },
 
     save: function () {
-      this.attributes = this.model.toJSON()
-      this.changed = false
+      this.updateAttributes()
 
       this.model.trigger('state:store')
     },
 
     undo: function () {
+      this.attributesToUnset().each(function (attribute) {
+        this.model.unset(attribute)
+      }, this)
+
       this.model.set(this.attributes)
-      this.changed = false
+
+      this.updateAttributes()
 
       this.model.trigger('state:restore')
+    },
+
+    attributesToUnset: function () {
+      var previousAttributes = _(this.attributes || {}).keys()
+
+      return _(this.model.attributes).chain().keys().select(function (attribute) {
+        return !_(previousAttributes).include(attribute)
+      })
+    },
+
+    updateAttributes: function () {
+      this.attributes = this.model.toJSON({ withDeleted: true })
+      this.changed = false
     }
   })
 

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

@@ -1,5 +1,5 @@
 module Backbone
   module NestedAttributes
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

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

@@ -285,6 +285,26 @@ describe("Backbone.NestedAttributesModel", function() {
             expect(model.get('comments').at(1)).toBe(comments.at(1))
           })
         })
+
+        describe("passing a deleted_<collection> attribute", function() {
+          var comments
+
+          beforeEach(function() {
+            model = new Post({ title: 'Some Title', deleted_comments: [{ id: 123, body: "some deleted comment", _destroy: true }] })
+          })
+
+          it("does not save this key as an attribute", function() {
+            expect(model.get('deleted_comments')).toBeUndefined()
+          })
+
+          it("adds the models in the deleted_comments attribute to the deletedModels collection inside the relation collection", function() {
+            comments = model.get('comments')
+            expect(comments.deletedModels.at(0)).toBeAnInstanceOf(Comment)
+            expect(comments.deletedModels.at(0).get('id')).toEqual(123)
+            expect(comments.deletedModels.at(0).get('body')).toEqual('some deleted comment')
+            expect(comments.deletedModels.at(0).get('_destroy')).toBeTruthy()
+          })
+        })
       })
     })
 
@@ -355,6 +375,29 @@ describe("Backbone.NestedAttributesModel", function() {
           expect(model.get('comments').at(1)).toBe(comments.at(1))
         })
       })
+
+      describe("passing a deleted_<collection> attribute", function() {
+        var comments
+
+        beforeEach(function() {
+          model = new Post({ title: 'Some Title' })
+        })
+
+        it("does not save this key as an attribute", function() {
+          model.set({ deleted_comments: [{ id: 123, body: "some deleted comment", _destroy: true }] })
+          expect(model.get('deleted_comments')).toBeUndefined()
+        })
+
+        it("adds the models in the deleted_comments attribute to the deletedModels collection inside the relation collection", function() {
+          model.set({ deleted_comments: [{ id: 123, body: "some deleted comment", _destroy: true }] })
+          comments = model.get('comments')
+
+          expect(comments.deletedModels.at(0)).toBeAnInstanceOf(Comment)
+          expect(comments.deletedModels.at(0).get('id')).toEqual(123)
+          expect(comments.deletedModels.at(0).get('body')).toEqual('some deleted comment')
+          expect(comments.deletedModels.at(0).get('_destroy')).toBeTruthy()
+        })
+      })
     })
 
     describe("cloning", function() {
@@ -621,6 +664,37 @@ describe("Backbone.NestedAttributesModel", function() {
           })
         })
       })
+
+      describe("with deleted models", function() {
+        beforeEach(function() {
+          model = new Post({ id: 321, title: 'Some Title', comments: [{ id: 123, body: 'some comment' }] })
+          comment = model.get('comments').at(0)
+        })
+
+        it("serializes the deleted models in a relation in a delete_<relation> key", function() {
+          model.get('comments').remove(comment)
+
+          expect(model.toJSON({ withDeleted: true })).toEqual({
+            id: 321,
+            title: 'Some Title',
+            comments: [],
+            deleted_comments: [ {id: 123, body: 'some comment', _destroy: true} ]
+          })
+        })
+
+        describe("and nested attributes support", function() {
+          it("serializes the deleted models in a relation in a delete_<relation> key", function() {
+            model.get('comments').remove(comment)
+
+            expect(model.toJSON({ withDeleted: true, nested: true })).toEqual({
+              id: 321,
+              title: 'Some Title',
+              comments_attributes: [{ id: 123, body: 'some comment', _destroy: true }],
+              deleted_comments: [ { id: 123, body: 'some comment', _destroy: true } ]
+            })
+          })
+        })
+      })
     })
   })
 })

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

@@ -293,6 +293,14 @@ describe("Backbone.UndoableModel", function() {
     })
   })
 
+  describe("when an attribute is added", function() {
+    it("unsets this attribute on undo", function() {
+      model.set({ newAttr: 'foo' })
+      model.undo()
+      expect(model.has('newAttr')).toBeFalsy()
+    })
+  })
+
   describe("when it has a has one relationship", function() {
     beforeEach(function() {
       Post = Backbone.UndoableModel.extend({
@@ -485,5 +493,72 @@ describe("Backbone.UndoableModel", function() {
         expect(called).toBeTruthy()
       })
     })
+
+
+    describe("when undoing changes after a nested model had been removed", function() {
+      beforeEach(function() {
+        originalAttributes = { id: 321, title: 'some title', comments: [ { id: 123, body: 'some body' } ] }
+        post = new Post(_(originalAttributes).clone())
+        comments = post.get('comments')
+        comment = comments.at(0)
+
+        comments.remove(comment)
+      })
+
+      it("undoes the deletedModels in the relation collection as well", function() {
+        post.undo()
+        expect(comments.deletedModels.length).toEqual(0)
+      })
+
+      describe("and the state saved", function() {
+        beforeEach(function() {
+          post.saveState()
+        })
+
+        it("keeps the deletedModels in the relation collection", function() {
+          post.undo()
+          expect(comments.deletedModels.at(0)).toBe(comment)
+        })
+      })
+    })
+
+    describe("when undoing changes after a undo", function() {
+      it("reverts the changes properly", function() {
+        post.set({ comments: [{ id: 123, body: 'first body' }] })
+        post.undo()
+        post.set({ comments: [{ id: 123, body: 'last body' }] })
+        post.undo()
+        expect(post.get('comments').at(0).get('body')).toEqual('some body')
+      })
+
+      describe("on a deep nested model", function() {
+        var Tag, tag
+
+        beforeEach(function() {
+          Comment = Backbone.UndoableModel.extend({
+            relations: [
+              {
+                key: 'tags',
+                relatedModel: function () { return Tag }
+              }
+            ]
+          })
+
+          Tag = Backbone.UndoableModel.extend({})
+
+          originalAttributes = { id: 321, title: 'some title', comments: [ { id: 123, body: 'some body', tags: [ { id: 456, name: 'javascript' } ] } ] }
+          post = new Post(originalAttributes)
+        })
+
+        it("reverts the changes properly", function() {
+          post.set({ comments: [ { id: 123, body: 'some body', tags: [ { id: 456, name: 'ruby' } ] } ] })
+          post.undo()
+          post.set({ comments: [ { id: 123, body: 'some body', tags: [ { id: 456, name: 'python' } ] } ] })
+          post.undo()
+
+          expect(post.get('comments').at(0).get('tags').at(0).get('name')).toEqual('javascript')
+        })
+      })
+    })
   })
 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone-nested-attributes
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2817376123414823357
+      hash: -1599110684641567877
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2817376123414823357
+      hash: -1599110684641567877
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24