deferring 0.2.1 → 0.3.0

data/spec/lib/deferring_has_many_spec.rb

@@ -63,6 +63,33 @@ RSpec.describe 'deferred has_many associations' do
       expect(bob.issues).to be_empty
     end
 
+    describe '#changed_for_autosave?' do
+      it 'returns true if there is a pending create' do
+        bob.issues = [printer_issue]
+        changed, queries = catch_queries { bob.changed_for_autosave? }
+        expect(queries).to be_empty
+        expect(changed).to eq(true)
+      end
+
+      it 'returns true if there is a pending delete' do
+        bob.issues = [printer_issue]
+        bob.save!
+
+        bob = Person.where(name: 'Bob').first
+        bob.issues.delete(printer_issue)
+        changed, queries = catch_queries { bob.changed_for_autosave? }
+        expect(queries).to be_empty
+        expect(changed).to eq(true)
+      end
+
+      it 'does not perform any queries if the original association has not been loaded' do
+        bob.issues = [printer_issue]
+        changed, queries = catch_queries { bob.changed_for_autosave? }
+        expect(queries).to be_empty
+        expect(changed).to eq(true)
+      end
+    end
+
     describe 'validations' do
       xit 'does not create a link when parent is not valid'
 
@@ -120,26 +147,24 @@ RSpec.describe 'deferred has_many associations' do
           expect(bob.non_validated_issues.first.validation_log).to eq([])
         end
 
-        unless rails30 # rails 3.0 does not return a error
-          it 'fails when trying to save the parent' do
-            bob.non_validated_issues = [NonValidatedIssue.new]
-
-            # Rails will raise the following error:
-            # - ActiveRecord::RecordNotSaved:
-            #     Failed to replace non_validated_issues because one or more of the new records could not be saved.
-            #
-            # This behaviour is different from the default Rails behaviour.
-            # Rails will normally just save the parent and not save the
-            # association.
-            #
-            # Two ways to avoid this error (using the Deferring gem):
-            # - always use validate: true when user input is involved (e.g.
-            #   using nested attributes to update the association),
-            # - add validations to the parent to check validness of the
-            #   children when a child record can be valid on itself but invalid
-            #   when added to the parent
-            expect{ bob.save }.to raise_error
-          end
+        it 'fails when trying to save the parent' do
+          bob.non_validated_issues = [NonValidatedIssue.new]
+
+          # Rails will raise the following error:
+          # - ActiveRecord::RecordNotSaved:
+          #     Failed to replace non_validated_issues because one or more of the new records could not be saved.
+          #
+          # This behaviour is different from the default Rails behaviour.
+          # Rails will normally just save the parent and not save the
+          # association.
+          #
+          # Two ways to avoid this error (using the Deferring gem):
+          # - always use validate: true when user input is involved (e.g.
+          #   using nested attributes to update the association),
+          # - add validations to the parent to check validness of the
+          #   children when a child record can be valid on itself but invalid
+          #   when added to the parent
+          expect{ bob.save }.to raise_error(ActiveRecord::RecordNotSaved)
         end
       end
 
@@ -312,33 +337,22 @@ RSpec.describe 'deferred has_many associations' do
       bob.save!
     end
 
-    if rails30 # old-style preload
-      it 'should have loaded the association' do
-        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
+    it 'should have loaded the association when pre-loading' do
+      people = Person.preload(:issues)
+      expect(people[1].issues.loaded?).to be_truthy
+      expect(people[1].issue_ids).to eq [printer_issue.id, db_issue.id]
     end
 
-    if rails32 || rails4
-      it 'should have loaded the association when pre-loading' do
-        people = Person.preload(:issues)
-        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[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 eager loading' do
+      people = Person.eager_load(:issues)
+      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).to_a
-        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 joining' do
+      people = Person.includes(:issues).to_a
+      expect(people[1].issues.loaded?).to be_truthy
+      expect(people[1].issue_ids).to eq [printer_issue.id, db_issue.id]
     end
 
     it 'should not have loaded the association when using a regular query' do

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'support/models/team'
 require 'support/models/issue'
 require 'support/models/address'
 require 'support/models/non_validated_issue'
-require 'support/rails_versions'
 
 RSpec.configure do |config|
   config.disable_monkey_patching!
@@ -27,5 +26,17 @@ RSpec.configure do |config|
       raise ActiveRecord::Rollback
     end
   end
+end
+
+# Catch queries executed within the &block
+def catch_queries(&block)
+  queries  = []
+  callback = lambda { |name, start, finish, id, payload|
+    queries << payload[:sql] if payload[:sql] =~ /^SELECT|UPDATE|INSERT/
+  }
 
+  result = ActiveSupport::Notifications.subscribed(callback, 'sql.active_record') do
+    yield
+  end
+  [result, queries]
 end

data/spec/support/active_record.rb

@@ -6,7 +6,7 @@ ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 ActiveRecord::Schema.define version: 0 do
   create_table :people do |t|
     t.string :name
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :people_teams, id: false do |t|
@@ -16,26 +16,26 @@ ActiveRecord::Schema.define version: 0 do
 
   create_table :teams do |t|
     t.string :name
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :issues do |t|
     t.string :subject
     t.integer :person_id
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :addresses do |t|
     t.integer :addressable_id
     t.string :addressable_type
     t.string :street
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :non_validated_issues do |t|
     t.string :subject
     t.integer :person_id
-    t.timestamps
+    t.timestamps null: false
   end
 end
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,14 +111,14 @@ files:
 - README.md
 - Rakefile
 - deferring.gemspec
-- gemfiles/rails_30.gemfile
-- gemfiles/rails_30.gemfile.lock
-- gemfiles/rails_32.gemfile
-- gemfiles/rails_32.gemfile.lock
 - gemfiles/rails_40.gemfile
 - gemfiles/rails_40.gemfile.lock
 - gemfiles/rails_41.gemfile
 - gemfiles/rails_41.gemfile.lock
+- gemfiles/rails_42.gemfile
+- gemfiles/rails_42.gemfile.lock
+- gemfiles/rails_50.gemfile
+- gemfiles/rails_50.gemfile.lock
 - lib/deferring.rb
 - lib/deferring/deferred_association.rb
 - lib/deferring/deferred_callback_listener.rb
@@ -133,7 +133,6 @@ files:
 - spec/support/models/non_validated_issue.rb
 - spec/support/models/person.rb
 - spec/support/models/team.rb
-- spec/support/rails_versions.rb
 homepage: http://github.com/robinroestenburg/deferring
 licenses:
 - MIT
@@ -154,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Defer saving ActiveRecord associations until parent is saved
@@ -169,4 +168,4 @@ test_files:
 - spec/support/models/non_validated_issue.rb
 - spec/support/models/person.rb
 - spec/support/models/team.rb
-- spec/support/rails_versions.rb
+has_rdoc: 

data/gemfiles/rails_30.gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    deferring (0.2.0)
-      activerecord (> 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.0.19)
-      activesupport (= 3.0.19)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.19)
-      activemodel (= 3.0.19)
-      activesupport (= 3.0.19)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.19)
-    appraisal (1.0.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.2.5)
-    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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.0.19)
-  appraisal
-  bundler (~> 1.3)
-  deferring!
-  rake
-  rspec
-  sqlite3

data/gemfiles/rails_32.gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    deferring (0.2.0)
-      activerecord (> 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
-      builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.17)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    appraisal (1.0.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    diff-lcs (1.2.5)
-    i18n (0.6.9)
-    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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.2.17)
-  appraisal
-  bundler (~> 1.3)
-  deferring!
-  rake
-  rspec
-  sqlite3

data/spec/support/rails_versions.rb

@@ -1,13 +0,0 @@
-def rails30
-  ActiveRecord::VERSION::MAJOR == 3 &&
-    ActiveRecord::VERSION::MINOR == 0
-end
-
-def rails32
-  ActiveRecord::VERSION::MAJOR == 3 &&
-    ActiveRecord::VERSION::MINOR == 2
-end
-
-def rails4
-  ActiveRecord::VERSION::MAJOR == 4
-end