deferring 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,23 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - rbx-2
+  - jruby-19mode
+  - ruby-head
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: ruby-head
+    - rvm: jruby-head
+
+gemfile:
+  - gemfiles/rails_30.gemfile
+  - gemfiles/rails_32.gemfile
+  - gemfiles/rails_40.gemfile
+  - gemfiles/rails_41.gemfile
+
+script: 'bundle exec rake'

data/README.md

@@ -1,9 +1,12 @@
 # Deferring
 
+[![Build Status](http://img.shields.io/travis/robinroestenburg/deferring.svg?style=flat)](https://travis-ci.org/robinroestenburg/deferring)
+[![Gem Version](http://img.shields.io/gem/v/deferring.svg?style=flat)](https://rubygems.org/gems/deferring)
+
 Deferring makes it possible to delay saving ActiveRecord associations until the
 parent object has been saved.
 
-Currently supporting Rails 3.0, 3.2, 4.0 and 4.1 on Ruby 1.9.3.
+Currently supporting Rails 3.0, 3.2, 4.0 & 4.1 on Ruby 1.9.3, 2.0.0 & 2.1.0.
 
 It is important to note that Deferring does not touch the original `has_many`
 and `has_and_belongs_to_many` associations. You can use them, without worrying

data/gemfiles/rails_30.gemfile.lock

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
     deferring (0.0.1)
       activerecord (> 3.0)
@@ -24,16 +24,20 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.2.5)
-    i18n (0.5.2)
-    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)
+    i18n (0.5.4)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
     tzinfo (0.3.39)

data/gemfiles/rails_32.gemfile.lock

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
     deferring (0.0.1)
       activerecord (> 3.0)
@@ -26,16 +26,20 @@ GEM
     builder (3.0.4)
     diff-lcs (1.2.5)
     i18n (0.6.9)
-    multi_json (1.9.2)
-    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)
+    multi_json (1.10.1)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
     tzinfo (0.3.39)

data/gemfiles/rails_40.gemfile.lock

@@ -31,19 +31,23 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.6.9)
     minitest (4.7.5)
-    multi_json (1.9.2)
-    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)
+    multi_json (1.10.1)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tzinfo (0.3.39)
 
 PLATFORMS

data/gemfiles/rails_41.gemfile.lock

@@ -29,20 +29,24 @@ GEM
     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)
+    minitest (5.3.4)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
-    thread_safe (0.3.3)
-    tzinfo (1.1.0)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/lib/deferring.rb

@@ -111,9 +111,6 @@ module Deferring
         # Send the objects of our delegated association to the original
         # association and store the result.
         send(:"original_#{association_name}=", send(:"deferred_#{association_name}").objects)
-        send(:"deferred_#{association_name}").objects.each do |record|
-          record.run_callbacks :commit
-        end
 
         # Store the new value of the association into our delegated association.
         send(

data/lib/deferring/version.rb

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

data/spec/lib/deferring_has_many_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+RSpec.describe 'deferred has-many association' do
+
+  before(:each) do
+    Person.create!(name: 'Alice')
+    Person.create!(name: 'Bob')
+
+    Issue.create!(subject: 'Printer PRT-001 jammed')
+    Issue.create!(subject: 'Database server DB-1337 down')
+    Issue.create!(subject: 'Make me a sandwich!')
+  end
+
+  let(:printer_issue) { Issue.where(subject: 'Printer PRT-001 jammed').first }
+  let(:db_issue) { Issue.where(subject: 'Database server DB-1337 down').first }
+  let(:sandwich_issue) { Issue.where(subject: 'Make me a sandwich!').first }
+
+  describe 'preloading associations' do
+    before do
+      p = Person.find(1)
+      p.issues << printer_issue << db_issue
+      p.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]
+      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]
+      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]
+      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]
+      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
+    end
+  end
+
+end

data/spec/lib/deferring_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-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')
@@ -122,8 +122,8 @@ describe 'deferred has-and-belongs-to-many associations' do
         dba = Team.first
         dba.people = [Person.first, Person.find(2), Person.last]
 
-        dba.people.size.should eq 2
-        dba.person_ids.should eq [1,2]
+        expect(dba.people.size).to eq 2
+        expect(dba.person_ids).to eq [1,2]
       end
     end
 
@@ -140,7 +140,7 @@ describe 'deferred has-and-belongs-to-many associations' do
       it 'loads the association' do
         person = Person.where(name: 'Bob').first
         Person.send(:preload_associations, person, [:teams])
-        expect(person.teams.loaded?).to be_true
+        expect(person.teams.loaded?).to be_truthy
         expect(person.team_ids).to eq [dba.id, support.id]
       end
     end
@@ -148,26 +148,26 @@ describe 'deferred has-and-belongs-to-many associations' do
     if rails32 || rails4
       it 'loads the association when pre-loading' do
         person = Person.preload(:teams).where(name: 'Bob').first
-        expect(person.teams.loaded?).to be_true
+        expect(person.teams.loaded?).to be_truthy
         expect(person.team_ids).to eq [dba.id, support.id]
       end
 
       it 'loads the association when eager loading' do
         person = Person.eager_load(:teams).where(name: 'Bob').first
-        expect(person.teams.loaded?).to be_true
+        expect(person.teams.loaded?).to be_truthy
         expect(person.team_ids).to eq [dba.id, support.id]
       end
 
       it 'loads the association when joining' do
         person = Person.includes(:teams).where(name: 'Bob').first
-        expect(person.teams.loaded?).to be_true
+        expect(person.teams.loaded?).to be_truthy
         expect(person.team_ids).to eq [dba.id, support.id]
       end
     end
 
     it 'does not load the association when using a regular query' do
       person = Person.where(name: 'Bob').first
-      expect(person.teams.loaded?).to be_false
+      expect(person.teams.loaded?).to be_falsey
     end
 
   end
@@ -408,11 +408,11 @@ describe 'deferred has-and-belongs-to-many associations' do
       p.teams = [Team.first, Team.find(3)]
       p.save
       teams = Person.first.teams
-      teams.loaded?.should == false
-      teams.find(3).should ==  Team.find(3)
-      teams.first.should == Team.first
-      teams.last.should == Team.find(3)
-      teams.loaded?.should == false
+      expect(teams.loaded?).to eq(false)
+      expect(teams.find(3)).to eq(Team.find(3))
+      expect(teams.first).to eq(Team.first)
+      expect(teams.last).to eq(Team.find(3))
+      expect(teams.loaded?).to eq(false)
     end
 
   end
@@ -427,13 +427,13 @@ describe 'deferred has-and-belongs-to-many associations' do
     bob.teams << Team.find(2)
     bob.save!
 
-    bob.audit_log.length.should == 4
-    bob.audit_log.should == [
+    expect(bob.audit_log.length).to eq(4)
+    expect(bob.audit_log).to eq([
       'Before removing team 1',
       'After removing team 1',
       'Before adding team 2',
       'After adding team 2'
-    ]
+    ])
   end
 
   describe 'accepts_nested_attributes' do
@@ -452,18 +452,18 @@ describe 'deferred has-and-belongs-to-many associations' do
           { id: 2, _destroy: true }
         ]
       }
-      p.teams.length.should == 1
-      p.team_ids.sort.should == [1]
+      expect(p.teams.length).to eq(1)
+      expect(p.team_ids.sort).to eq([1])
 
       Person.first
-      Person.first.teams.length.should == 3
-      Person.first.team_ids.sort.should == [1,2,3]
+      expect(Person.first.teams.length).to eq(3)
+      expect(Person.first.team_ids.sort).to eq([1,2,3])
 
       p.save!
 
       p = Person.first
-      p.teams.length.should == 1
-      p.team_ids.sort.should == [1]
+      expect(p.teams.length).to eq(1)
+      expect(p.team_ids.sort).to eq([1])
     end
 
     it 'should mass assign' do
@@ -478,18 +478,18 @@ describe 'deferred has-and-belongs-to-many associations' do
         { id: 3, _destroy: true },
         { id: 2, _destroy: true }
       ]
-      p.teams.length.should == 1
-      p.team_ids.sort.should == [1]
+      expect(p.teams.length).to eq(1)
+      expect(p.team_ids.sort).to eq([1])
 
       Person.first
-      Person.first.teams.length.should == 3
-      Person.first.team_ids.sort.should == [1,2,3]
+      expect(Person.first.teams.length).to eq(3)
+      expect(Person.first.team_ids.sort).to eq([1,2,3])
 
       p.save!
 
       p = Person.first
-      p.teams.length.should == 1
-      p.team_ids.sort.should == [1]
+      expect(p.teams.length).to eq(1)
+      expect(p.team_ids.sort).to eq([1])
     end
   end
 
@@ -518,8 +518,8 @@ describe 'deferred has-and-belongs-to-many associations' do
       expect(bob).to_not be_valid
       expect(alice).to_not be_valid
 
-      expect(bob.save).to be_false
-      expect(alice.save).to be_false
+      expect(bob.save).to be_falsey
+      expect(alice.save).to be_falsey
     end
 
     xit 'does not validate records when validate: false' do

data/spec/spec_helper.rb

@@ -4,7 +4,8 @@ require 'support/models'
 require 'support/rails_versions'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.disable_monkey_patching!
+
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -136,6 +137,7 @@ files:
 - lib/deferring.rb
 - lib/deferring/deferred_association.rb
 - lib/deferring/version.rb
+- spec/lib/deferring_has_many_spec.rb
 - spec/lib/deferring_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
@@ -167,6 +169,7 @@ signing_key:
 specification_version: 3
 summary: Defer saving ActiveRecord associations until parent is saved
 test_files:
+- spec/lib/deferring_has_many_spec.rb
 - spec/lib/deferring_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb