deferring 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9640c37fd475fa2857be6686a2f2b726a4f6a6ef
-  data.tar.gz: dfd12c320ff1fdcd8f2331a6b3180c473a894524
+  metadata.gz: c9b6ed1d51be050d082becdaf18fe2d600e12d56
+  data.tar.gz: 1fc0c0a26468c3468d6d776db928c907b38d9451
 SHA512:
-  metadata.gz: b8b85bcb7252d0af7f901ea97db87b1b0556ab3061f43d8dd9fa37b5dcc431cd59878a4dd0300571b241036f072a06d6a17d26db6374c0ce30712b2455952844
-  data.tar.gz: a614b0996a14b2ba60b5faa317e9f1d481685442c333dcb459b87f7240fc8b3e8df2a91c237188615a82fd5dcfca4fe62def66ca7ba05afe1ca57e90135f48bb
+  metadata.gz: 2db20181a7dd8bae3dea6c419280face512e311d6c29cc9016e92699d053c2ae464807b3586531f41ea40e5ed81ad236a6e0dd43f0c7289ddf67b0ebba886c82
+  data.tar.gz: 9d39513277df77e0d71a0728bc44af4737b72010b75617795b5c6ba4b9a1bce674a0ced3dfdae75a92288a38e47032c88b35bf9703c57b74206965f099bab9f4

data/lib/deferring.rb

@@ -86,10 +86,8 @@ module Deferring
 
             # TODO: Implement value_to_boolean code from rails for checking _destroy field.
             if attributes['_destroy'] == '1' && options[:allow_destroy]
-              # remove from existing records and mark for destruction upon
-              # saving
-              send(:"#{association_name}").delete(existing_record)
-              existing_record.mark_for_destruction
+              # remove from existing records
+              send(:"#{association_name}").destroy(existing_record)
             end
           end
 

data/lib/deferring/deferred_association.rb

@@ -86,7 +86,7 @@ module Deferring
     end
 
     def objects=(records)
-      @objects = records.map do |record|
+      @objects = records.compact.map do |record|
         if inverse_name && record.class.reflect_on_association(inverse_name)
           record.send(:"#{inverse_name}=", parent_record)
         end
@@ -109,7 +109,7 @@ module Deferring
     def <<(*records)
       # TODO: Do we want to prevent including the same object twice? Not sure,
       # but it will probably be filtered after saving and retrieving as well.
-      records.flatten.uniq.each do |record|
+      records.flatten.compact.uniq.each do |record|
         run_deferring_callbacks(:link, record) do
           if inverse_name && record.class.reflect_on_association(inverse_name)
             record.send(:"#{inverse_name}=", parent_record)
@@ -125,14 +125,14 @@ module Deferring
     alias_method :append, :<<
 
     def delete(*records)
-      records.flatten.uniq.each do |record|
+      records.flatten.compact.uniq.each do |record|
         run_deferring_callbacks(:unlink, record) { objects.delete(record) }
       end
       self
     end
 
     def destroy(*records)
-      records.flatten.uniq.each do |record|
+      records.flatten.compact.uniq.each do |record|
         record = record.to_i if record.is_a? String
         record = objects.detect { |o| o.id == record } if record.is_a? Fixnum
 

data/lib/deferring/version.rb

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

data/spec/lib/deferring_habtm_spec.rb

@@ -54,6 +54,20 @@ RSpec.describe 'deferred has_and_belongs_to_many associations' do
       expect{ bob.save }.to change{ Person.find(bob.id).teams.size }.from(0).to(2)
     end
 
+    it 'drops nil records' do
+      bob.teams << nil
+      expect(bob.teams).to be_empty
+
+      bob.teams = [nil]
+      expect(bob.teams).to be_empty
+
+      bob.teams.delete(nil)
+      expect(bob.teams).to be_empty
+
+      bob.teams.destroy(nil)
+      expect(bob.teams).to be_empty
+    end
+
     describe '#collection_singular_ids' do
 
       it 'returns ids of saved & unsaved associated records' do

data/spec/lib/deferring_has_many_spec.rb

@@ -49,6 +49,20 @@ RSpec.describe 'deferred has_many associations' do
       expect(bob.issues.first.person).to eq bob
     end
 
+    it 'drops nil records' do
+      bob.issues << nil
+      expect(bob.issues).to be_empty
+
+      bob.issues = [nil]
+      expect(bob.issues).to be_empty
+
+      bob.issues.delete(nil)
+      expect(bob.issues).to be_empty
+
+      bob.issues.destroy(nil)
+      expect(bob.issues).to be_empty
+    end
+
     describe 'validations' do
       xit 'does not create a link when parent is not valid'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord