embedded_associations 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 931459993427be60c6717d86ee0e387148f34b66
-  data.tar.gz: e73417bff91288ec6b76e3fafa61a92ea74e10ec
+  metadata.gz: 76c8b0e4ae9164c343480eb95de82cd07a83c8fe
+  data.tar.gz: 04934eb299a9eb501f8f77a8c803bc7715d4925c
 SHA512:
-  metadata.gz: 77b9526fdaff3aed1d35ab8a4d7d0e6ea6c2229ec4698c0a41c6fd79bb46d87a400d2c66a1898e177a8705ab94a1e94d79f17449e385b0a38da98f08118daf35
-  data.tar.gz: 38372d705068862c455f2142a459f093719360af9b8771ccf3597bd1e47e34132dd7af80c53e9ad338efee4df55f4031f9418eebc57041db40e6798d0547c567
+  metadata.gz: 8fad90037a4e1e2528772398f851f55230a4f8559eb02d621566ac092c6c9a87509581e71d40756deef82dbc3183146c77095208622d7a75f26e49e630653eeb
+  data.tar.gz: 074f845b30f457745ae7976bf8fccadea23e231d0006e8d325daa19418fece68ecdaa033e10e07f4ab875d2ee32438eff88e22849c700c08e6cae12a07f52413

data/lib/embedded_associations/version.rb

@@ -1,3 +1,3 @@
 module EmbeddedAssociations
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/lib/embedded_associations.rb

@@ -87,8 +87,13 @@ module EmbeddedAssociations
       end
 
       definition.each do |name, child_definition|
+        if !parent_params || !parent_params.has_key?(name.to_s)
+          next
+        end
+        
         reflection = parent.class.reflect_on_association(name)
-        attrs = parent_params && parent_params.delete(name.to_s)
+        
+        attrs = parent_params.delete(name.to_s)
 
         if reflection.collection?
           attrs ||= []
@@ -131,7 +136,7 @@ module EmbeddedAssociations
       current_assoc = parent.send(name)
 
       if r = current_assoc
-        if attrs
+        if attrs && attrs != ''
           attrs = controller.send(:filter_attributes, r.class.name, attrs, :update)
           handle_resource(child_definition, r, attrs) if child_definition
           r.assign_attributes(attrs)
@@ -141,7 +146,7 @@ module EmbeddedAssociations
           run_before_destroy_callbacks(r)
           r.mark_for_destruction
         end
-      elsif attrs
+      elsif attrs && attrs != ''
         r = parent.send("build_#{name}")
         attrs = controller.send(:filter_attributes, r.class.name, attrs, :create)
         handle_resource(child_definition, r, attrs) if child_definition

data/spec/embedded_associations_spec.rb

@@ -46,6 +46,16 @@ describe PostsController, type: :controller do
 
         Tag.all.each{ |t| expect(t.post).to_not be_nil }
       end
+      
+      it "should not destory if entire field missing" do
+        hash.delete(:tags)
+        json = post :update, :id => resource.id, post: hash
+
+        expect(Post.count).to eq(1)
+        expect(Tag.count).to eq(2)
+
+        Tag.all.each{ |t| expect(t.post).to_not be_nil }
+      end
 
       it "should update modified child records" do
         hash[:tags].first[:name] = 'modified'
@@ -104,8 +114,8 @@ describe PostsController, type: :controller do
 
         let(:resource) { Post.create(category: Category.create(name: 'ember')) }
 
-        it "should destroy nil child record" do
-          hash[:category] = nil
+        it "should destroy blank child record" do
+          hash[:category] = ''
           json = post :update, :id => resource.id, post: hash
 
           expect(Post.count).to eq(1)
@@ -115,6 +125,14 @@ describe PostsController, type: :controller do
 
           expect(resource.category).to be_nil
         end
+        
+        it "should not destroy missing child field" do
+          hash.delete(:category)
+          json = post :update, :id => resource.id, post: hash
+
+          expect(Post.count).to eq(1)
+          expect(Category.count).to eq(1)
+        end
 
         it "should update modified child records" do
           hash[:category][:name] = 'ember-data'
@@ -174,8 +192,8 @@ describe PostsController, type: :controller do
 
         let(:resource) { Post.create({user: User.create({name: 'G$', account: Account.create})}) }
 
-        it "should destroy nil child hierarchy" do
-          hash[:user] = nil
+        it "should destroy blank child hierarchy" do
+          hash[:user] = ''
           json = post :update, :id => resource.id, post: hash
 
           expect(Post.count).to eq(1)
@@ -187,8 +205,8 @@ describe PostsController, type: :controller do
           expect(resource.user).to be_nil
         end
 
-        it "should destroy nil grand-child" do
-          hash[:user] = {name: 'G$'}
+        it "should destroy blank grand-child" do
+          hash[:user] = {name: 'G$', account: ''}
           json = post :update, :id => resource.id, post: hash
 
           expect(Post.count).to eq(1)
@@ -199,6 +217,16 @@ describe PostsController, type: :controller do
 
           expect(resource.user.account).to be_nil
         end
+        
+        it "should not destroy missing grand-child" do
+          hash[:user] = {name: 'G$'}
+          json = post :update, :id => resource.id, post: hash
+
+          expect(Post.count).to eq(1)
+          expect(User.count).to eq(1)
+          expect(Account.count).to eq(1)
+        end
+
 
         it "should update modified child records" do
           hash[:user][:name] = 'wes'
@@ -230,7 +258,7 @@ describe PostsController, type: :controller do
 
     context "creating" do
 
-      it "should create hierarchy", focus: true do
+      it "should create hierarchy" do
         json = post :create, post: {
           title: 'ma post',
           comments: [{user: {name: 'G$', account: {}}}]
@@ -280,8 +308,9 @@ describe PostsController, type: :controller do
           p
         }
 
-        it "should destroy nil child hierarchy" do
-          hash[:comments] = nil
+        it "should destroy blank child hierarchy" do
+          hash[:comments] = []
+          hash[:user] = ''
           json = post :update, :id => resource.id, post: hash
 
           expect(Post.count).to eq(1)
@@ -294,8 +323,8 @@ describe PostsController, type: :controller do
           expect(resource.comments).to be_empty
         end
 
-        it "should destroy nil grand-child hierarchy" do
-          hash[:comments].first[:user] = nil
+        it "should destroy blank grand-child hierarchy" do
+          hash[:comments].first[:user] = ''
           json = post :update, :id => resource.id, post: hash
 
           expect(Post.count).to eq(1)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: embedded_associations
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Gordon L. Hempton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: ActiveRecord controller-level support for embedded associations
@@ -31,8 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord controller-level support for embedded associations