deferring 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d3b21ec82ca5a7c3f62259abc852c195553ebed1
-  data.tar.gz: b2a2819985c21278781a1ef8fd1d6b97fef61945
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mzk2OTEyOGRmMjBkNTIzNzk4MGQ4MmM4ZWE1MmE1MmY4NzliYjEwZQ==
+  data.tar.gz: !binary |-
+    ZDkyYjNmYWU0OGUxZDFkODkyODhiM2E0MDY3MDgyMDFkYTJiYjlkMw==
 SHA512:
-  metadata.gz: 8181bd48cfbef4cc775fcb9a58a24ae60ead0555377fe87551e0629078453d4d55b03e8e7f04cafe3820c4839bfd22cca24dc6cee6921c1e121d5598971aaf81
-  data.tar.gz: 0b2c33f182e9ce5e2d1b66ecf42cb16abc2f4b92f1bcc5afbbb173f2b8dd919c71876cc66305d3f3d280340351e18993af686c6f5b846f5d3128ac1a1a0d9432
+  metadata.gz: !binary |-
+    ZjA2OThhM2I1ZTY3MzM5NDA4ZmJlMTQ1YzhmZTQzNmFlZGMzODJmZjc5MjE1
+    NzljMzE0YzE0NmE0MzMzNjJjYjM4MTU1MzU0ZTFmNzM1MDZmNWU5MTBiZTEz
+    MjExYTlmZWVkZDJlM2I3NTIwNTVkNDNjYWE4YWE4MWY4NjAwZmI=
+  data.tar.gz: !binary |-
+    YmEwMDNlN2E5ZmVhMGUzODc0YzJmMTAxNWI4MDE5NTNhNDBlNGEyYjFiMzZj
+    YzhjM2U4MGFlZjQzYjFkMWJmNDEwMzEzZmJkMTVmZjMzMjhkZmQ0Mzk2OGIz
+    OWRhMzk2OTExZjczMjk2NDZmNjQ2ZmZmZGZkMGZiOTM4YTMxNGM=

data/README.md

@@ -353,7 +353,7 @@ Person.first.teams
 
 ##### Original association
 
-The original association is renamed to "original_association_name". So, the
+The original association is renamed to `original_association_name`. So, the
 original association of the deferred association named `teams` can be accessed
 by using `original_teams`.
 

data/lib/deferring.rb

@@ -25,9 +25,10 @@ module Deferring
   def deferred_has_many(*args)
     options = args.extract_options!
     listeners = create_callback_listeners!(options)
+    inverse_association_name = options.fetch(:as, self.name.underscore.to_sym)
 
     has_many(*args, options)
-    generate_deferred_association_methods(args.first.to_s, listeners)
+    generate_deferred_association_methods(args.first.to_s, listeners, inverse_association_name)
   end
 
   def deferred_accepts_nested_attributes_for(*args)
@@ -36,7 +37,7 @@ module Deferring
 
     # teams_attributes=
     define_method :"#{association_name}_attributes=" do |records|
-      find_or_create_deferred_association(association_name, [])
+      find_or_create_deferred_association(association_name, [], nil)
 
       # Remove the records that are to be destroyed from the ids that are to be
       # assigned to the DeferredAssociation instance.
@@ -52,7 +53,7 @@ module Deferring
 
   private
 
-  def generate_deferred_association_methods(association_name, listeners)
+  def generate_deferred_association_methods(association_name, listeners, inverse_association_name = nil)
     # Store the original accessor methods of the association.
     alias_method :"original_#{association_name}", :"#{association_name}"
     alias_method :"original_#{association_name}=", :"#{association_name}="
@@ -66,7 +67,7 @@ module Deferring
     # if none are found.
     # TODO: add force_reload argument?
     define_method :"#{association_name}" do
-      find_or_create_deferred_association(association_name, listeners)
+      find_or_create_deferred_association(association_name, listeners, inverse_association_name)
       send(:"deferred_#{association_name}")
     end
 
@@ -75,7 +76,7 @@ module Deferring
     # Replaces the collection's content by deleting and adding objects as
     # appropriate.
     define_method :"#{association_name}=" do |objects|
-      find_or_create_deferred_association(association_name, listeners)
+      find_or_create_deferred_association(association_name, listeners, inverse_association_name)
       send(:"deferred_#{association_name}").objects = objects
     end
 
@@ -84,7 +85,7 @@ module Deferring
     # Replace the collection by the objects identified by the primary keys in
     # ids.
     define_method :"#{association_name.singularize}_ids=" do |ids|
-      find_or_create_deferred_association(association_name, listeners)
+      find_or_create_deferred_association(association_name, listeners, inverse_association_name)
 
       klass = self.class.reflect_on_association(:"#{association_name}").klass
       objects = klass.find(ids.reject(&:blank?))
@@ -95,13 +96,13 @@ module Deferring
     #
     # Returns an array of the associated objects' ids.
     define_method :"#{association_name.singularize}_ids" do
-      find_or_create_deferred_association(association_name, listeners)
+      find_or_create_deferred_association(association_name, listeners, inverse_association_name)
       send(:"deferred_#{association_name}").ids
     end
 
-    # collection_singalur_checked
+    # collection_singular_checked
     attr_accessor :"#{association_name}_checked"
-    # collection_singalur_checked=
+    # collection_singular_checked=
     define_method(:"#{association_name}_checked=") do |ids|
       send(:"#{association_name.singularize}_ids=", ids.split(','))
     end
@@ -109,50 +110,47 @@ module Deferring
     #  the save after the parent object has been saved
     after_save :"perform_deferred_#{association_name}_save!"
     define_method :"perform_deferred_#{association_name}_save!" do
-      find_or_create_deferred_association(association_name, listeners)
+
+      find_or_create_deferred_association(association_name, listeners, inverse_association_name)
 
       # Send the objects of our delegated association to the original
       # association and store the result.
       send(:"original_#{association_name}=", send(:"deferred_#{association_name}").objects)
 
       # Store the new value of the association into our delegated association.
-      send(
-        :"deferred_#{association_name}=",
-        DeferredAssociation.new(send(:"original_#{association_name}"), association_name))
-      listeners.each do |event_name, callback_method|
-        l = DeferredCallbackListener.new(event_name, self, callback_method)
-        send(:"deferred_#{association_name}").add_callback_listener(l)
-      end
+      save_deferred_association(association_name, listeners, inverse_association_name)
     end
 
     define_method :"reload_with_deferred_#{association_name}" do |*args|
-      find_or_create_deferred_association(association_name, listeners)
+      find_or_create_deferred_association(association_name, listeners, inverse_association_name)
 
       send(:"reload_without_deferred_#{association_name}", *args).tap do
-        send(
-          :"deferred_#{association_name}=",
-          DeferredAssociation.new(send(:"original_#{association_name}"), association_name))
-        listeners.each do |event_name, callback_method|
-          l = DeferredCallbackListener.new(event_name, self, callback_method)
-          send(:"deferred_#{association_name}").add_callback_listener(l)
-        end
+        save_deferred_association(association_name, listeners, inverse_association_name)
       end
     end
     alias_method_chain :reload, :"deferred_#{association_name}"
 
+    generate_save_deferred_assocation_method
     generate_find_or_create_deferred_association_method
   end
 
+  def generate_save_deferred_assocation_method
+    define_method :save_deferred_association do |name, listeners, inverse_association_name|
+      klass = self.class.reflect_on_association(:"#{name}").klass
+      send(
+        :"deferred_#{name}=",
+        DeferredAssociation.new(send(:"original_#{name}"), klass, self, inverse_association_name))
+      listeners.each do |event_name, callback_method|
+        l = DeferredCallbackListener.new(event_name, self, callback_method)
+        send(:"deferred_#{name}").add_callback_listener(l)
+      end
+    end
+  end
+
   def generate_find_or_create_deferred_association_method
-    define_method :find_or_create_deferred_association do |name, listeners|
+    define_method :find_or_create_deferred_association do |name, listeners, inverse_association_name|
       if send(:"deferred_#{name}").nil?
-        send(
-          :"deferred_#{name}=",
-          DeferredAssociation.new(send(:"original_#{name}"), name))
-        listeners.each do |event_name, callback_method|
-          l = DeferredCallbackListener.new(event_name, self, callback_method)
-          send(:"deferred_#{name}").add_callback_listener(l)
-        end
+        save_deferred_association(name, listeners, inverse_association_name)
       end
     end
   end

data/lib/deferring/deferred_association.rb

@@ -7,12 +7,14 @@ module Deferring
     # TODO: Write tests for enumerable.
     include Enumerable
 
-    attr_reader :load_state
+    attr_reader :load_state, :klass, :parent_record, :inverse_name
 
-    def initialize(original_association, name)
+    def initialize(original_association, klass, parent_record, inverse_name)
       super(original_association)
-      @name = name
-      @load_state = :ghost
+      @load_state    = :ghost
+      @klass         = klass
+      @parent_record = parent_record
+      @inverse_name  = inverse_name
     end
     alias_method :original_association, :__getobj__
 
@@ -111,14 +113,13 @@ module Deferring
     end
 
     def build(*args, &block)
-      association.build(*args, &block).tap do |record|
+      klass.new(*args, &block).tap do |record|
         run_deferring_callbacks(:link, record) do
-          objects.push(record)
+          if inverse_name && record.class.reflect_on_association(inverse_name)
+            record.send(:"#{inverse_name}=", parent_record)
+          end
 
-          # Remove the newly build record from the original association. If we
-          # didn't do this, the new record would be saved to the database when
-          # saving the parent object (and not after, as we want).
-          association.reload
+          objects.push(record)
         end
       end
     end

data/lib/deferring/version.rb

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

data/spec/lib/{deferring_spec.rb → deferring_habtm_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe 'deferred has-and-belongs-to-many associations' do
+RSpec.describe 'deferred has_and_belongs_to_many associations' do
 
   before :each do
     Person.create!(name: 'Alice')
@@ -127,6 +127,43 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
       end
     end
 
+    xit 'deferred habtm <=> regular habtm' do
+      alice = Person.where(name: 'Alice').first
+      bob = Person.where(name: 'Bob').first
+
+      team = Team.first
+      team.people << alice << bob
+      team.save!
+
+      bob.reload
+      expect(bob.teams.size).to eq(1)
+
+      alice.reload
+      expect(alice.teams.size).to eq(1)
+
+      team.people.create!(name: 'Chuck')
+      expect(team).to_not be_valid
+
+      bob.reload
+      alice.reload
+
+      expect(bob).to_not be_valid
+      expect(alice).to_not be_valid
+
+      expect(bob.save).to be_falsey
+      expect(alice.save).to be_falsey
+    end
+
+    xit 'does not validate records when validate: false' do
+      pending 'validate: false does not work' do
+        alice = Person.where(name: 'Alice').first
+        alice.teams.build(name: nil)
+        alice.save!
+
+        expect(alice.teams.size).to eq 1
+      end
+    end
+
   end
 
   describe 'preloading' do
@@ -277,13 +314,13 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
   describe 'callbacks' do
 
     before(:example) do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams = [Team.find(3)]
       bob.save!
     end
 
     it 'calls the link callbacks when adding a record using <<' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams << Team.find(1)
 
       expect(bob.audit_log.length).to eq(2)
@@ -294,7 +331,7 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
     end
 
     it 'calls the link callbacks when adding a record using push' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams.push(Team.find(1))
 
       expect(bob.audit_log.length).to eq(2)
@@ -305,7 +342,7 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
     end
 
     it 'calls the link callbacks when adding a record using append' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams.append(Team.find(1))
 
       expect(bob.audit_log.length).to eq(2)
@@ -315,8 +352,19 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
       ])
     end
 
+    it 'calls the link callbacks when adding a record using build' do
+      bob = Person.where(name: 'Bob').first
+      bob.teams.build(name: 'Foooo')
+
+      expect(bob.audit_log.length).to eq(2)
+      expect(bob.audit_log).to eq([
+        'Before linking new team',
+        'After linking new team'
+      ])
+    end
+
     it 'only calls the Rails callbacks when creating a record on the association using create' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams.create(name: 'HR')
 
       expect(bob.audit_log.length).to eq(2)
@@ -327,7 +375,7 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
     end
 
     it 'only calls the Rails callbacks when creating a record on the association using create!' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams.create!(name: 'HR')
 
       expect(bob.audit_log.length).to eq(2)
@@ -338,7 +386,7 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
     end
 
     it 'calls the unlink callbacks when removing a record using delete' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams.delete(Team.find(3))
 
       expect(bob.audit_log.length).to eq(2)
@@ -349,7 +397,7 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
     end
 
     it 'only calls the rails callbacks when removing a record using destroy' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams.destroy(3)
 
       expect(bob.audit_log.length).to eq(2)
@@ -360,23 +408,24 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
     end
 
     it 'calls the regular Rails callbacks after saving' do
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams = [Team.find(1), Team.find(3)]
       bob.save!
 
-      bob = Person.first
+      bob = Person.where(name: 'Bob').first
       bob.teams.delete(Team.find(1))
       bob.teams << Team.find(2)
+      bob.teams.build(name: 'Service Desk')
       bob.save!
 
-      expect(bob.audit_log.length).to eq(8)
+      expect(bob.audit_log.length).to eq(12)
       expect(bob.audit_log).to eq([
         'Before unlinking team 1', 'After unlinking team 1',
-        'Before linking team 2', 'After linking team 2',
-        'Before removing team 1',
-        'After removing team 1',
-        'Before adding team 2',
-        'After adding team 2'
+        'Before linking team 2',   'After linking team 2',
+        'Before linking new team', 'After linking new team',
+        'Before removing team 1',  'After removing team 1',
+        'Before adding team 2',    'After adding team 2',
+        'Before adding new team',  'After adding team 4'
       ])
     end
 
@@ -460,8 +509,6 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
 
   end
 
-  # TODO: Clean up tests.
-
   describe 'active record api' do
 
     # it 'should execute first on deferred association' do
@@ -480,28 +527,33 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
     #   expect(Person.first.teams.last).to eq(operations)
     # end
 
-    it 'should build a new record' do
-      p = Person.first
-      p.teams.build(name: 'Service Desk')
-      expect(p.teams[0]).to be_new_record
-    end
+    describe '#build' do
+
+      it 'builds a new record' do
+        p = Person.first
+        p.teams.build(name: 'Service Desk')
+
+        expect(p.teams[0]).to be_new_record
+        expect{ p.save }.to change{ Person.first.teams.count }.from(0).to(1)
+      end
 
-    it 'should build and save a new record' do
-      p = Person.first
-      p.teams.build(name: 'Service Desk')
-      expect(p.teams[0]).to be_new_record
-      expect(Person.first.teams.size).to eq(0)
-      p.save
-      expect(Person.first.teams.size).to eq(1)
     end
 
-    it 'should add a new record' do
-      p = Person.first
-      p.teams.create!(:name => 'Service Desk')
-      expect(p.teams[0]).to_not be_new_record
-      expect(Person.first.teams.size).to eq(1)
-      p.save
-      expect(Person.first.teams.size).to eq(1)
+    describe '#create!' do
+
+      it 'should create a persisted record' do
+        p = Person.first
+        p.teams.create!(:name => 'Service Desk')
+        expect(p.teams[0]).to_not be_new_record
+      end
+
+      it 'should automatically save the created record' do
+        p = Person.first
+        p.teams.create!(:name => 'Service Desk')
+        expect(Person.first.teams.size).to eq(1)
+        expect{ p.save }.to_not change{ Person.first.teams.count }
+      end
+
     end
 
     it 'should allow ActiveRecord::QueryMethods' do
@@ -525,101 +577,4 @@ RSpec.describe 'deferred has-and-belongs-to-many associations' do
 
   end
 
-  describe 'accepts_nested_attributes' do
-    # TODO: Write more tests.
-    it 'should mass assign' do
-      p = Person.first
-      p.teams << Team.first << Team.last << Team.find(2)
-      p.save
-
-      # Destroy team 2 and 3. Keep team 1.
-      p = Person.first
-      p.attributes = {
-        teams_attributes: [
-          { id: 1 },
-          { id: 3, _destroy: true },
-          { id: 2, _destroy: true }
-        ]
-      }
-      expect(p.teams.length).to eq(1)
-      expect(p.team_ids.sort).to eq([1])
-
-      Person.first
-      expect(Person.first.teams.length).to eq(3)
-      expect(Person.first.team_ids.sort).to eq([1,2,3])
-
-      p.save!
-
-      p = Person.first
-      expect(p.teams.length).to eq(1)
-      expect(p.team_ids.sort).to eq([1])
-    end
-
-    it 'should mass assign' do
-      p = Person.first
-      p.teams << Team.first << Team.last << Team.find(2)
-      p.save
-
-      # Destroy team 2 and 3. Keep team 1.
-      p = Person.first
-      p.teams_attributes = [
-        { id: 1 },
-        { id: 3, _destroy: true },
-        { id: 2, _destroy: true }
-      ]
-      expect(p.teams.length).to eq(1)
-      expect(p.team_ids.sort).to eq([1])
-
-      Person.first
-      expect(Person.first.teams.length).to eq(3)
-      expect(Person.first.team_ids.sort).to eq([1,2,3])
-
-      p.save!
-
-      p = Person.first
-      expect(p.teams.length).to eq(1)
-      expect(p.team_ids.sort).to eq([1])
-    end
-  end
-
-  describe 'validations' do
-
-    xit 'deferred habtm <=> regular habtm' do
-      alice = Person.where(name: 'Alice').first
-      bob = Person.where(name: 'Bob').first
-
-      team = Team.first
-      team.people << alice << bob
-      team.save!
-
-      bob.reload
-      expect(bob.teams.size).to eq(1)
-
-      alice.reload
-      expect(alice.teams.size).to eq(1)
-
-      team.people.create!(name: 'Chuck')
-      expect(team).to_not be_valid
-
-      bob.reload
-      alice.reload
-
-      expect(bob).to_not be_valid
-      expect(alice).to_not be_valid
-
-      expect(bob.save).to be_falsey
-      expect(alice.save).to be_falsey
-    end
-
-    xit 'does not validate records when validate: false' do
-      pending 'validate: false does not work' do
-        alice = Person.where(name: 'Alice').first
-        alice.teams.build(name: nil)
-        alice.save!
-
-        expect(alice.teams.size).to eq 1
-      end
-    end
-  end
-
 end

data/spec/lib/deferring_has_many_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe 'deferred has-many association' do
+RSpec.describe 'deferred has_many associations' do
 
   before(:each) do
     Person.create!(name: 'Alice')
@@ -17,43 +17,62 @@ RSpec.describe 'deferred has-many association' do
 
   describe 'preloading associations' do
     before do
-      p = Person.find(1)
-      p.issues << printer_issue << db_issue
-      p.save!
+      bob = Person.where(name: 'Bob').first
+      bob.issues << printer_issue << db_issue
+      bob.save!
     end
 
     if rails30 # old-style preload
       it 'should have loaded the association' do
-        p = Person.find(1)
-        Person.send(:preload_associations, p, [:issues])
-        expect(p.issues.loaded?).to be_truthy
-        expect(p.issue_ids).to eq [printer_issue.id, db_issue.id]
+        bob = Person.where(name: 'Bob').first
+        Person.send(:preload_associations, bob, [:issues])
+        expect(bob.issues.loaded?).to be_truthy
+        expect(bob.issue_ids).to eq [printer_issue.id, db_issue.id]
       end
     end
 
     if rails32 || rails4
       it 'should have loaded the association when pre-loading' do
         people = Person.preload(:issues)
-        expect(people[0].issues.loaded?).to be_truthy
-        expect(people[0].issue_ids).to eq [printer_issue.id, db_issue.id]
+        expect(people[1].issues.loaded?).to be_truthy
+        expect(people[1].issue_ids).to eq [printer_issue.id, db_issue.id]
       end
 
       it 'should have loaded the association when eager loading' do
         people = Person.eager_load(:issues)
-        expect(people[0].issues.loaded?).to be_truthy
-        expect(people[0].issue_ids).to eq [db_issue.id, printer_issue.id]
+        expect(people[1].issues.loaded?).to be_truthy
+        expect(people[1].issue_ids).to eq [db_issue.id, printer_issue.id]
       end
 
       it 'should have loaded the association when joining' do
         people = Person.includes(:issues).all
-        expect(people[0].issues.loaded?).to be_truthy
-        expect(people[0].issue_ids).to eq [printer_issue.id, db_issue.id]
+        expect(people[1].issues.loaded?).to be_truthy
+        expect(people[1].issue_ids).to eq [printer_issue.id, db_issue.id]
       end
     end
 
     it 'should not have loaded the association when using a regular query' do
       people = Person.all
-      expect(people[0].issues.loaded?).to be_falsey
+      expect(people[1].issues.loaded?).to be_falsey
+    end
+  end
+
+  describe 'active record api' do
+
+    describe '#build' do
+      it 'builds a new record' do
+        bob = Person.where(name: 'Bob').first
+        bob.issues.build(subject: 'I need coffee!')
+
+        expect(bob.issues.last).to be_new_record
+      end
+
+      it 'sets the belongs_to association of the built record' do
+        bob = Person.where(name: 'Bob').first
+        bob.issues.build(subject: 'I need coffee!')
+
+        expect(bob.issues.last.person).to eq bob
+      end
     end
   end
 

data/spec/lib/deferring_nested_attributes_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+RSpec.describe 'deferred accepts_nested_attributes' do
+
+  before :each do
+    Person.create!(name: 'Alice')
+    Person.create!(name: 'Bob')
+
+    Team.create!(name: 'Database Administration')
+    Team.create!(name: 'End-User Support')
+    Team.create!(name: 'Operations')
+  end
+
+  let(:bob) { Person.where(name: 'Bob').first }
+
+  let(:dba) { Team.where(name: 'Database Administration').first }
+  let(:support) { Team.where(name: 'End-User Support').first }
+  let(:operations) { Team.where(name: 'Operations').first }
+
+  # TODO: Write more tests.
+
+  it 'should mass assign' do
+    p = Person.first
+    p.teams << Team.first << Team.last << Team.find(2)
+    p.save
+
+    # Destroy team 2 and 3. Keep team 1.
+    p = Person.first
+    p.attributes = {
+      teams_attributes: [
+        { id: 1 },
+        { id: 3, _destroy: true },
+        { id: 2, _destroy: true }
+      ]
+    }
+    expect(p.teams.length).to eq(1)
+    expect(p.team_ids.sort).to eq([1])
+
+    Person.first
+    expect(Person.first.teams.length).to eq(3)
+    expect(Person.first.team_ids.sort).to eq([1,2,3])
+
+    p.save!
+
+    p = Person.first
+    expect(p.teams.length).to eq(1)
+    expect(p.team_ids.sort).to eq([1])
+  end
+
+end

data/spec/support/models.rb

@@ -28,11 +28,19 @@ class Person < ActiveRecord::Base
   end
 
   def link_team(team)
-    log("Before linking team #{team.id}")
+    if team.new_record?
+      log("Before linking new team")
+    else
+      log("Before linking team #{team.id}")
+    end
   end
 
   def linked_team(team)
-    log("After linking team #{team.id}")
+    if team.new_record?
+      log("After linking new team")
+    else
+      log("After linking team #{team.id}")
+    end
   end
 
   def unlink_team(team)
@@ -63,11 +71,11 @@ class Person < ActiveRecord::Base
     log("After removing team #{team.id}")
   end
 
-  def add_issue(issue)
+  def remove_issue(issue)
     log("Before removing issue #{issue.id}")
   end
 
-  def added_issue(issue)
+  def removed_issue(issue)
     log("After removing issue #{issue.id}")
   end
 end

metadata

@@ -1,100 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "\n    The Deferring gem makes it possible to defer saving ActiveRecord\n
+description: ! "\n    The Deferring gem makes it possible to defer saving ActiveRecord\n
   \   associations until the parent object is saved.\n  "
 email:
 - robin@roestenburg.io
@@ -102,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -115,8 +115,6 @@ files:
 - gemfiles/rails_30.gemfile.lock
 - gemfiles/rails_32.gemfile
 - gemfiles/rails_32.gemfile.lock
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_4.gemfile.lock
 - gemfiles/rails_40.gemfile
 - gemfiles/rails_40.gemfile.lock
 - gemfiles/rails_41.gemfile
@@ -125,8 +123,9 @@ files:
 - lib/deferring/deferred_association.rb
 - lib/deferring/deferred_callback_listener.rb
 - lib/deferring/version.rb
+- spec/lib/deferring_habtm_spec.rb
 - spec/lib/deferring_has_many_spec.rb
-- spec/lib/deferring_spec.rb
+- spec/lib/deferring_nested_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/models.rb
@@ -141,23 +140,24 @@ 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.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Defer saving ActiveRecord associations until parent is saved
 test_files:
+- spec/lib/deferring_habtm_spec.rb
 - spec/lib/deferring_has_many_spec.rb
-- spec/lib/deferring_spec.rb
+- spec/lib/deferring_nested_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/models.rb

data/gemfiles/rails_4.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "4.1.0"
-
-gemspec :path => "../"

data/gemfiles/rails_4.gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    raincheck (0.0.1)
-      activerecord (> 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
-      builder (~> 3.1)
-    activerecord (4.1.0)
-      activemodel (= 4.1.0)
-      activesupport (= 4.1.0)
-      arel (~> 5.0.0)
-    activesupport (4.1.0)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    appraisal (1.0.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    i18n (0.6.9)
-    json (1.8.1)
-    minitest (5.3.3)
-    rake (10.3.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.3)
-    tzinfo (1.1.0)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 4.1.0)
-  appraisal
-  bundler (~> 1.3)
-  raincheck!
-  rake
-  rspec
-  sqlite3