deferring 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI2ZGZlZTRiMjIzMmE3NGUxYjE5N2Y1NThiNDA2ZWJmYzc4NGRhMQ==
+    M2Q5NGQyOGY3MTViMzE1ODA4ODgwNzdjZTRmNDhjMjMyYWI4MDc3OA==
   data.tar.gz: !binary |-
-    MWE1NDE1MTI2YTY0OGI5YzQyMTk3NDg1NjczNGNhMDE5YThhMWE2ZQ==
+    MDQ5ZTg4NTUyYmM3ZjgyNDM0NzI5ZTdhY2ZiMzMwMzkxM2M4NmM0Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZjYzZmRmNGY2YmNmMDM3YjZmM2ViZDliYWZhN2IyOThiNDIxYjE0ZDhkZmI2
-    ZGY5ZWJiYjhiMjMxZDM4ZjlhNmM3N2Y0NWI2NWQ2Zjc1ZmEwMjA2M2E1YmI5
-    MWUwMmNkMmI4YzQxNGNhNTJmNzk3MDNlOTlkYzAwYTM2M2QxOGU=
+    ZmI0YTk4ZDIwOGZhNjFlMWViOTc3NGRmODhmYmE0YmI0NzgxZWM3ODI1ZGZl
+    YmEwODQ3YjRlN2JlYzJmODY2MTI3Y2FhZjM5MTlkMjBjNWI4YjYwNDkxZTBh
+    MTdhM2QxYzdhMjk1MGViM2JkOTQ0N2ZjZWRmYTlkYjAxNjVhOTU=
   data.tar.gz: !binary |-
-    MGVjYzM2MjA3NDFkYjU2NjA0ZDU0Yzk2ZWYzMmVjYzdhNTA0MTYwZTcwZWNj
-    YTY5MmJiNmQ1M2U2MGI4MDk1M2I4YTU3ZmE1NGU0MGI2NWZlMWU4MGFiMzI3
-    Yzc3MWFlZDVmZjIzODVkZDU3YTY5MWM4NjNlNGMyMTc1NGYyNzQ=
+    ZGE0NGE5ODhiYmQwMzMzMjg0ZmZmOTc0YTVlMjJmMjQxZGZkMjExYTJlNGI2
+    ZmEzZmZhMmM0MGFmNjk4OTk2NmVkNzM0ZmUwMmUwMTEyZjc4ODhhZTM3MzRk
+    MjU4NDdhNTE1OTIzYTVmMjE2NmNjYWFkOTIzOTNjMDQ4YWIyMTk=

data/lib/deferring.rb

@@ -62,24 +62,26 @@ module Deferring
         attributes = attributes.with_indifferent_access
 
         if attributes['id'].blank?
-          if !reject_new_record?(attributes)
-            send(:"#{association_name}").build(attributes.except(*unassignable_keys))
+          if !deferred_reject_new_record?(attributes)
+            send(:"#{association_name}").build(attributes.except(*deferred_unassignable_keys))
           end
 
         elsif existing_record = send(:"#{association_name}").detect { |record| record.id.to_s == attributes['id'].to_s }
-          if !call_reject_if(attributes)
+          if !deferred_call_reject_if(attributes)
 
-            existing_record.attributes = attributes.except(*unassignable_keys)
+            existing_record.attributes = attributes.except(*deferred_unassignable_keys)
 
             # TODO: Implement value_to_boolean code from rails for checking _destroy field.
             if attributes['_destroy'] == '1' && options[:allow_destroy]
-              # remove from existing records
+              # remove from existing records and mark for destruction upon
+              # saving
               send(:"#{association_name}").delete(existing_record)
+              existing_record.mark_for_destruction
             end
           end
 
         else # new record referenced by id
-          if !call_reject_if(attributes)
+          if !deferred_call_reject_if(attributes)
             klass = self.class.reflect_on_association(:"#{association_name}").klass
 
             attribute_ids = attributes_collection.map { |a| a['id'] || a[:id] }.compact
@@ -96,12 +98,12 @@ module Deferring
     # Determines if a new record should be build by checking for
     # has_destroy_flag? or if a <tt>:reject_if</tt> proc exists for this
     # association and evaluates to +true+.
-    define_method :reject_new_record? do |attributes|
+    define_method :deferred_reject_new_record? do |attributes|
       # TODO: Implement value_to_boolean code from rails for checking _destroy field.
-      attributes['_destroy'] == '1' || call_reject_if(attributes)
+      attributes['_destroy'] == '1' || deferred_call_reject_if(attributes)
     end
 
-    define_method :call_reject_if do |attributes|
+    define_method :deferred_call_reject_if do |attributes|
       return false if attributes['_destroy'] == '1'
       case callback = reject_if
       when Symbol
@@ -111,8 +113,8 @@ module Deferring
       end
     end
 
-    define_method :unassignable_keys do
-      %w(_destroy)
+    define_method :deferred_unassignable_keys do
+      %w(_destroy id)
     end
 
     generate_find_or_create_deferred_association_method

data/lib/deferring/deferred_association.rb

@@ -43,7 +43,7 @@ module Deferring
 
     # Delegates methods from Ruby's Array module to the object in the deferred
     # association.
-    delegate :[]=, :[], :clear, :reject, :reject!, :flatten, :flatten!, :sort!,
+    delegate :[]=, :[], :clear, :select!, :reject!, :flatten, :flatten!, :sort!,
              :sort_by!, :empty?, :size, :length, to: :objects
 
     # Delegates Ruby's Enumerable#find method to the original association.
@@ -90,13 +90,7 @@ module Deferring
       @original_objects = original_association.to_a.clone
       objects_loaded!
 
-      pending_deletes.each do |record|
-        run_deferring_callbacks(:unlink, record) do
-          if inverse_name && record.class.reflect_on_association(inverse_name)
-            record.send(:"#{inverse_name}=", nil)
-          end
-        end
-      end
+      pending_deletes.each { |record| run_deferring_callbacks(:unlink, record) }
       pending_creates.each { |record| run_deferring_callbacks(:link, record) }
 
       @objects
@@ -126,13 +120,7 @@ module Deferring
 
     def delete(records)
       Array(records).flatten.uniq.each do |record|
-        run_deferring_callbacks(:unlink, record) do
-          if inverse_name && record.class.reflect_on_association(inverse_name)
-            record.send(:"#{inverse_name}=", nil)
-          end
-
-          objects.delete(record)
-        end
+        run_deferring_callbacks(:unlink, record) { objects.delete(record) }
       end
       self
     end

data/lib/deferring/version.rb

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

data/spec/lib/deferring_has_many_spec.rb

@@ -102,24 +102,31 @@ RSpec.describe 'deferred has_many associations' do
 
   describe 'accepts_nested_attributes' 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 and create a new one.
       p = Person.first
       p.attributes = {
         issues_attributes: [
           { id: printer_issue.id },
           { subject: 'Kapow!' },
-          { id: sandwich_issue.id, _destroy: '1' },
-          { id: db_issue.id, _destroy: '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(2)
+      expect{ p.save! }.to change{ Person.first.issues.size }.from(0).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 'updates associated records' do
@@ -137,26 +144,54 @@ RSpec.describe 'deferred has_many associations' do
       expect(Issue.find(printer_issue.id).subject).to eq 'Toner low!'
     end
 
-    it 'sets associated records when posting a hash of hashes' do
+    it 'sets the belongs_to association of the associated record' do
+      expect(printer_issue.person).to be_nil
+      bob.attributes = {
+        issues_attributes: [{ id: printer_issue.id }]
+      }
+      expect(bob.issues.first.person).to eq bob
+    end
+
+    it 'destroys an associated record when :allow_destroy is true' do
+      p = Person.first
+      p.issues << printer_issue << db_issue << sandwich_issue
+      p.save
+
+      # Destroy db and sandwich issues. Keep printer issue and create a new one.
       p = Person.first
       p.attributes = {
-        issues_attributes: {
-          first: { subject: 'Kapow!' },
-          second: { id: printer_issue.id }
-        }
+        issues_attributes: [{ id: sandwich_issue.id, _destroy: '1' }]
       }
+
       expect(p.issues.length).to eq(2)
-      expect(p.issue_ids).to eq([nil, printer_issue.id])
+      expect(p.issue_ids).to eq([printer_issue.id, db_issue.id])
 
-      expect{ p.save! }.to change{ Person.first.issues.size }.from(0).to(2)
+      expect(p.issues.unlinks.first).to eq(sandwich_issue)
+
+      expect{ p.save! }.to change{ Issue.count }.from(3).to(2)
     end
 
-    it 'sets the belongs_to association of the associated record' do
-      expect(printer_issue.person).to be_nil
-      bob.attributes = {
-        issues_attributes: [{ id: printer_issue.id }]
+    it 'does not destroy an associated record when :allow_destroy is false' do
+      Person.deferred_accepts_nested_attributes_for :issues, allow_destroy: false
+
+      p = Person.first
+      p.issues << printer_issue << db_issue << sandwich_issue
+      p.save
+
+      # Destroy db and sandwich issues. Keep printer issue and create a new one.
+      p = Person.first
+      p.attributes = {
+        issues_attributes: [{ id: sandwich_issue.id, _destroy: '1' }]
       }
-      expect(bob.issues.first.person).to eq bob
+
+      expect(p.issues.length).to eq(3)
+      expect(p.issue_ids).to eq([printer_issue.id, db_issue.id, sandwich_issue.id])
+
+      expect(p.issues.unlinks.size).to eq(0)
+
+      expect{ p.save! }.to_not change{ Issue.count }
+
+      Person.deferred_accepts_nested_attributes_for :issues, allow_destroy: true
     end
   end # accepts_nested_attributes
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord