deferring 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ0ODk2NjQ5MWRkMDI2ZjIzZjEyNzdjNzk1MGIyNmVkOGEwNmNjZQ==
+    ZmJiMDFiYWJiZWI2Y2UzNTU3NDk3ZmNiOWNhNmYwNzBhNmUwZDk1Yg==
   data.tar.gz: !binary |-
-    MmZmOThmYzFkNDkzOTMzZGNhZmFhYmFkZmViOTc5ZmJmMzZmNjFmYw==
+    Y2YwOWRmZjA1NzkwMzZiZGIwYzU0NDdjMWQ4MWFkZGRkODNhMjA1MQ==
 SHA512:
   metadata.gz: !binary |-
-    OWI3OTAxNjNlNGIzNWZhMGEyMGE5NDM4MzQxODcwMGViZDBmNWNmNDdjZmJl
-    ODY0MzVjNTdhNjU4MjU4ZTQwYzBkNzMwNjU3NWQ2YzA4ZDM2OWU2NThlYTMx
-    NTAwODZjNzYyNGMzNTQ3ZTUxMjlhMzk2NDg5OTIxZjVlMWM3MWE=
+    NDg0NTNkMzkwYjc2ZjJhZjgxNzE1NGMyMjE2YTcwMzVjNWE1MDEzYjM2MzVk
+    YTc3MDRjOGM4YjJmNTBhNGQ3YmMwYzQ5Njk1N2QxOWUxMTFhMmEzNWQwOGIw
+    YzNlOGFmNjAwZjg3OWI1NWY0NWZiY2VkNTdmMTM4Mzc2ZmY0NzA=
   data.tar.gz: !binary |-
-    YTEyYzMyNTJiMzBjOTY1ODkwOGE2OWUzZDRkYzNmMGMyYjAyMTE0N2E0Yjg2
-    ZmRjOWNkZjcxZjQxNjQ0Mjc4OGRmMzVjYjYxYjUwYTA5ZmY5OTQzMWQ0Y2Q1
-    NWNjNGU4MDk2ZGQ4MTA5YzQ2ZDM2N2EzNTc0MWZlZDI0Yzg2Mjk=
+    N2RlNzQxOTBhYzk5NGQzN2Q0OWM1NjE4MDI4YmVmNjlkYmNhMTk0OGMwODk1
+    N2UyNzhiZGIzYzllMDVkYjY4MzJlNjViZWVhZGZhZTQxNWQ3ZmI5NDhiMzIx
+    MDBjZGFmYWE5YjZiOTAyMmYzOGM5NWZmMGRmZTZjOWIzNmU0NGM=

data/gemfiles/rails_30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.0.7)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.0.7)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.0.7)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_41.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.0.7)
       activerecord (> 3.0)
 
 GEM

data/lib/deferring.rb

@@ -34,20 +34,43 @@ module Deferring
   def deferred_accepts_nested_attributes_for(*args)
     options = args.extract_options!
     inverse_association_name = options.fetch(:as, self.name.underscore.to_sym)
+    reject_if_proc = options.delete(:reject_if)
     accepts_nested_attributes_for(*args, options)
 
     association_name = args.first.to_s
 
     # teams_attributes=
-    define_method :"#{association_name}_attributes=" do |records|
+    define_method :"#{association_name}_attributes=" do |attributes|
       find_or_create_deferred_association(association_name, [], inverse_association_name)
 
-      # Remove the records that are to be destroyed from the ids that are to be
-      # assigned to the DeferredAssociation instance.
-      records.reject! { |record| record[:_destroy] }
+      # Convert the attributes to an array if a Hash is passed. This is possible
+      # as the keys of the hash are ignored in this case.
+      #
+      # Example:
+      #   {
+      #     first: { name: 'Service Desk' },
+      #     second: { name: 'DBA' }
+      #   }
+      #   becomes
+      #   [
+      #     { name: 'Service Desk' },
+      #     { name: 'DBA'}
+      #   ]
+      attributes = attributes.values if attributes.is_a? Hash
+
+      # Remove the attributes that are to be destroyed from the ids that are to
+      # be assigned to the DeferredAssociation instance.
+      attributes.reject! { |record| record.delete(:_destroy) == '1' }
+
+      # Remove the attributes that fail the pass :reject_if proc.
+      attributes.reject! { |record| reject_if_proc.call(record) } if reject_if_proc
 
       klass = self.class.reflect_on_association(:"#{association_name}").klass
-      objects = klass.find(records.map { |record| record[:id] })
+
+      objects = attributes.map do |record|
+        record[:id] ? klass.find(record[:id]) : klass.new(record)
+      end
+
       send(:"deferred_#{association_name}").objects = objects
     end
 

data/lib/deferring/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Deferring
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/lib/deferring_has_many_spec.rb

@@ -101,24 +101,39 @@ RSpec.describe 'deferred has_many associations' do
   end
 
   describe 'accepts_nested_attributes' do
-    it 'should mass-assign' do
+    it 'sets associated records when posting an array of hashes' do
       p = Person.first
       p.issues << printer_issue << db_issue << sandwich_issue
       p.save
 
-      # Destroy db and sandwich issues. Keep printer issue.
+      # Destroy db and sandwich issues. Keep printer issue and create a new one.
       p = Person.first
       p.attributes = {
         issues_attributes: [
           { id: printer_issue.id },
-          { id: sandwich_issue.id, _destroy: true },
-          { id: db_issue.id, _destroy: true }
+          { subject: 'Kapow!' },
+          { id: sandwich_issue.id, _destroy: '1' },
+          { id: db_issue.id, _destroy: '1' }
         ]
       }
-      expect(p.issues.length).to eq(1)
-      expect(p.issue_ids.sort).to eq([1])
+      expect(p.issues.length).to eq(2)
+      expect(p.issue_ids).to eq([printer_issue.id, nil])
 
-      expect{ p.save! }.to change{ Person.first.issues.size }.from(3).to(1)
+      expect{ p.save! }.to change{ Person.first.issues.size }.from(3).to(2)
+    end
+
+    it 'sets associated records when posting a hash of hashes' do
+      p = Person.first
+      p.attributes = {
+        issues_attributes: {
+          first: { subject: 'Kapow!' },
+          second: { id: printer_issue.id }
+        }
+      }
+      expect(p.issues.length).to eq(2)
+      expect(p.issue_ids).to eq([nil, printer_issue.id])
+
+      expect{ p.save! }.to change{ Person.first.issues.size }.from(0).to(2)
     end
 
     it 'sets the belongs_to association of the associated record' do

data/spec/lib/deferring_nested_attributes_spec.rb

@@ -29,8 +29,8 @@ RSpec.describe 'deferred accepts_nested_attributes' do
     p.attributes = {
       teams_attributes: [
         { id: 1 },
-        { id: 3, _destroy: true },
-        { id: 2, _destroy: true }
+        { id: 3, _destroy: '1' },
+        { id: 2, _destroy: '1' }
       ]
     }
     expect(p.teams.length).to eq(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Robin Roestenburg