deferring 0.5.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81a9e2bd6deea9d8b3fc5ea29b2633f9cfafaee5
-  data.tar.gz: 3e4749cb1645b4278631ded639460f30ff099246
+SHA256:
+  metadata.gz: 14441d2a2db2d40728af34eb27b47b4da1c7961a716be04a10019468298f7cfc
+  data.tar.gz: ddef46c10b1d7fd9f6e44a1f2e5507937c85e42af8424bc8f2d5d96e156de96a
 SHA512:
-  metadata.gz: 3d1481294966a71e02d5a2eeba4b63f38a998039d79956760c6c6fb95a7ef4a1f0fd2fc216ad503ad4b1cd5d56f4464028223ab3cd30e25d93e01b43f666d609
-  data.tar.gz: 4dd94104c28016dc7b216b3a486c28e692da0d59f2be56fc5499a2f858aa0a7e76da4457ac8930ed8d664f6dd3ac45ffc7401664978d6b623f30e85305f3cb17
+  metadata.gz: 54eedbbfc6be7e60b517e38a94c1b0b248dd55e52ef90036ea17e4148c92ccf0b37ed153732e28601368704a238ec8dc9178cf7eacf3cacf3af180306bf6a0a4
+  data.tar.gz: 4c2f00b244eb1cab289353e5abcb46cdd48e58e656c83dbc5316af84ad826fb20d0974acd57ff5e90e78656044ce0cb800c9f84e87fc4bd8a36065433b0b01b8

data/.travis.yml

@@ -1,17 +1,26 @@
 language: ruby
 
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - ruby-head
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - 2.7.1
 
 gemfile:
   - gemfiles/rails_42.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_52.gemfile
+  - gemfiles/rails_60.gemfile
 
 sudo: false
 
 script: 'bundle exec rake'
+
+matrix:
+  exclude:
+  - rvm: 2.3.8
+    gemfile: gemfiles/rails_60.gemfile
+  - rvm: 2.4.6
+    gemfile: gemfiles/rails_60.gemfile

data/Appraisals

@@ -1,15 +1,24 @@
 appraise 'rails-42' do
-  gem 'activerecord', '4.2.10'
+  gem 'activerecord', '4.2.11.3'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise 'rails-50' do
-  gem 'activerecord', '5.0.7'
+  gem 'activerecord', '5.0.7.2'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise 'rails-51' do
-  gem 'activerecord', '5.1.6'
+  gem 'activerecord', '5.1.7'
+  gem 'sqlite3'
 end
 
 appraise 'rails-52' do
-  gem 'activerecord', '5.2.0'
+  gem 'activerecord', '5.2.4.3'
+  gem 'sqlite3'
+end
+
+appraise 'rails-60' do
+  gem 'activerecord', '6.0.3.2'
+  gem 'sqlite3'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Robin Roestenburg
+Copyright (c) 2019 Robin Roestenburg
 
 MIT License
 

data/deferring.gemspec

@@ -20,11 +20,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', ['>= 4.2', '< 5.3']
+  spec.add_dependency 'activerecord', ['>= 4.2']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'appraisal'
 end

data/gemfiles/rails_42.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "4.2.10"
+gem "activerecord", "4.2.11.3"
+gem "sqlite3", "~> 1.3.6"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_42.gemfile.lock

@@ -1,66 +1,66 @@
 PATH
   remote: ..
   specs:
-    deferring (0.5.0)
-      activerecord (>= 4.2, < 5.3)
+    deferring (0.7.0)
+      activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
+    activemodel (4.2.11.3)
+      activesupport (= 4.2.11.3)
       builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
+    activerecord (4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       arel (~> 6.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.4)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (12.3.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 4.2.10)
+  activerecord (= 4.2.11.3)
   appraisal
   bundler (~> 1.3)
   deferring!
   rake
   rspec
-  sqlite3
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/gemfiles/rails_50.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.0.7"
+gem "activerecord", "5.0.7.2"
+gem "sqlite3", "~> 1.3.6"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_50.gemfile.lock

@@ -1,64 +1,64 @@
 PATH
   remote: ..
   specs:
-    deferring (0.5.0)
-      activerecord (>= 4.2, < 5.3)
+    deferring (0.7.0)
+      activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.7)
-      activesupport (= 5.0.7)
-    activerecord (5.0.7)
-      activemodel (= 5.0.7)
-      activesupport (= 5.0.7)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activesupport (5.0.7)
+    activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    i18n (1.0.1)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.4)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (12.3.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 5.0.7)
+  activerecord (= 5.0.7.2)
   appraisal
   bundler (~> 1.3)
   deferring!
   rake
   rspec
-  sqlite3
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/gemfiles/rails_51.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.1.6"
+gem "activerecord", "5.1.7"
+gem "sqlite3"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_51.gemfile.lock

@@ -1,58 +1,58 @@
 PATH
   remote: ..
   specs:
-    deferring (0.5.0)
-      activerecord (>= 4.2, < 5.3)
+    deferring (0.7.0)
+      activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activesupport (5.1.6)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    i18n (1.0.1)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.4)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (12.3.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 5.1.6)
+  activerecord (= 5.1.7)
   appraisal
   bundler (~> 1.3)
   deferring!
@@ -61,4 +61,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/gemfiles/rails_52.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.2.0"
+gem "activerecord", "5.2.4.3"
+gem "sqlite3"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_52.gemfile.lock

@@ -1,58 +1,58 @@
 PATH
   remote: ..
   specs:
-    deferring (0.5.0)
-      activerecord (>= 4.2, < 5.3)
+    deferring (0.7.0)
+      activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       arel (>= 9.0)
-    activesupport (5.2.0)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (9.0.0)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    i18n (1.0.1)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.4)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (12.3.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 5.2.0)
+  activerecord (= 5.2.4.3)
   appraisal
   bundler (~> 1.3)
   deferring!
@@ -61,4 +61,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "6.0.3.2"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails_60.gemfile.lock

@@ -0,0 +1,64 @@
+PATH
+  remote: ..
+  specs:
+    deferring (0.7.0)
+      activerecord (>= 4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.4)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 6.0.3.2)
+  appraisal
+  bundler (~> 1.3)
+  deferring!
+  rake
+  rspec
+  sqlite3
+
+BUNDLED WITH
+   1.17.3

data/lib/deferring/deferred_association.rb

@@ -26,14 +26,14 @@ module Deferring
     alias_method :pretty_inspect, :inspect
 
     delegate :to_s, :to_a, :inspect, :==, # methods undefined by SimpleDelegator
-             :is_a?, :as_json, to: :objects
+             :as_json, to: :objects
 
     def each(&block)
       objects.each(&block)
     end
 
     # TODO: Add explanation about :first/:last loaded? problem.
-    [:first, :last].each do |method|
+    [:first, :last, :empty?, :size].each do |method|
       define_method method do
         unless objects_loaded?
           original_association.send(method)
@@ -46,7 +46,8 @@ module Deferring
     # Delegates methods from Ruby's Array module to the object in the deferred
     # association.
     delegate :[]=, :[], :clear, :select!, :reject!, :flatten, :flatten!, :sort!,
-             :keep_if, :delete_if, :sort_by!, :empty?, :size, :length,
+             :keep_if, :delete_if, :sort_by!, :length,
+             :each_index,
              to: :objects
 
     # Delegates Ruby's Enumerable#find method to the original association.
@@ -57,6 +58,18 @@ module Deferring
       original_association.find(*args)
     end
 
+    # Delegates Ruby's Enumerable#count method to the original association.
+    #
+    # The delegation has to be explicit in this case, because the inclusion of
+    # Enumerable also defines the count-method on DeferredAssociation.
+    def count(*args, &block)
+      if block_given?
+        objects.count(*args, &block)
+      else
+        original_association.count(*args)
+      end
+    end
+
     # Delegates Ruby's Enumerable#select method to the original association when
     # no block has been given. Rails' select-method does not accept a block, so
     # we know that in that case the select-method has to be called on our
@@ -64,9 +77,9 @@ module Deferring
     #
     # The delegation has to be explicit in this case, because the inclusion of
     # Enumerable also defines the select-method on DeferredAssociation.
-    def select(value = Proc.new)
+    def select(value = nil, &block)
       if block_given?
-        objects.select { |*block_args| value.call(*block_args) }
+        objects.select { |*block_args| block.call(*block_args) }
       else
         original_association.select(value)
       end
@@ -131,7 +144,7 @@ module Deferring
     def destroy(*records)
       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
+        record = objects.detect { |o| o.id == record } if record.is_a? Integer
 
         run_deferring_callbacks(:unlink, record) {
           objects.delete(record)

data/lib/deferring/version.rb

@@ -1,3 +1,3 @@
 module Deferring
-  VERSION = '0.5.0'
+  VERSION = '0.7.1'
 end

data/spec/lib/deferring_habtm_spec.rb

@@ -377,6 +377,19 @@ RSpec.describe 'deferred has_and_belongs_to_many associations' do
     end
   end
 
+  describe 'supports methods from Ruby Array' do
+    describe '#each_index' do
+      it 'returns the index of each element in the association' do
+        bob.teams << dba << support
+        bob.save!
+
+        result = []
+        bob.teams.each_index { |i| result << i }
+        expect(result).to eq([0, 1])
+      end
+    end
+  end
+
   describe 'enumerable methods that conflict with ActiveRecord' do
     describe '#select' do
       before do

data/spec/lib/deferring_has_many_spec.rb

@@ -359,6 +359,63 @@ RSpec.describe 'deferred has_many associations' do
       people = Person.all
       expect(people[1].issues.loaded?).to be_falsey
     end
+
+    describe 'count' do
+      it 'should not load the association' do
+        person = Person.where(name: 'Bob').first
+        expect(person.issues.count).to eq(2)
+        expect(person.issues.loaded?).to be_falsey
+      end
+
+      it 'should execute a count(*) query, even if the association has already been loaded' do
+        person = Person.where(name: 'Bob').first
+        expect { person.issues.count }.to query(1) { |sql| expect(sql).to include('SELECT COUNT(*) FROM "issues"') }
+        expect { person.issues.to_a }.to query(1)
+        expect(person.issues.loaded?).to be_truthy
+        expect { person.issues.to_a }.to query(0)
+        expect { person.issues.count }.to query(1) { |sql| expect(sql).to include('SELECT COUNT(*) FROM "issues"') }
+      end
+
+      it 'should execute count with a block' do
+        person = Person.where(name: 'Bob').first
+        expect(person.issues.count { |i| i.subject.start_with?('Printer') }).to eq(1)
+      end
+    end
+
+    describe 'size' do
+      it 'should not load the association' do
+        person = Person.where(name: 'Bob').first
+        expect(person.issues.size).to eq(2)
+        expect { person.issues.size }.to query(1) { |sql| expect(sql).to include('SELECT COUNT(*) FROM "issues"') }
+        expect(person.issues.loaded?).to be_falsey
+      end
+
+      it 'should not execute query when the association has already been loaded' do
+        person = Person.where(name: 'Bob').first
+        expect { person.issues.size }.to query(1) { |sql| expect(sql).to include('SELECT COUNT(*) FROM "issues"') }
+        expect { person.issues.to_a }.to query(1)
+        expect(person.issues.loaded?).to be_truthy
+        expect { person.issues.to_a }.to query(0)
+        expect { person.issues.size }.to query(0)
+      end
+    end
+
+    describe 'empty?' do
+      it 'should not load the association' do
+        person = Person.where(name: 'Bob').first
+        expect(person.issues.empty?).to be_falsey
+        expect(person.issues.loaded?).to be_falsey
+      end
+
+      it 'should not execute query when the association has already been loaded' do
+        person = Person.where(name: 'Bob').first
+        expect { person.issues.empty? }.to query(1) { |sql| expect(sql).to include('SELECT 1') }
+        expect { person.issues.to_a }.to query(1)
+        expect(person.issues.loaded?).to be_truthy
+        expect { person.issues.to_a }.to query(0)
+        expect { person.issues.empty? }.to query(0)
+      end
+    end
   end # preloading associations
 
   describe 'active record api' do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'support/models/team'
 require 'support/models/issue'
 require 'support/models/address'
 require 'support/models/non_validated_issue'
+require 'support/matchers/query_matcher'
 
 RSpec.configure do |config|
   config.disable_monkey_patching!
@@ -18,6 +19,8 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
+  config.include(Deferring::Matchers)
+
   # Rollback all the database changes after each spec, poor man's
   # DatabaseCleaner :-)
   config.around do |example|

data/spec/support/matchers/query_matcher.rb

@@ -0,0 +1,127 @@
+module Deferring
+  module Matchers
+
+    class ArQuery  #:nodoc:
+      cattr_accessor :executed
+
+      @@recording_queries = false
+      def self.recording_queries?
+        @@recording_queries
+      end
+
+      def initialize(expected, &block)
+        @expected = expected
+        @block = block
+      end
+
+      def matches?(given_proc)
+        @eval_block = false
+        @eval_error = nil
+        ArQuery.executed = []
+        @@recording_queries = true
+
+        given_proc.call
+
+        if @expected.is_a?(Integer)
+          @actual = ArQuery.executed.length
+          @matched = @actual == @expected
+        else
+          @actual = ArQuery.executed.detect { |sql| @expected === sql }
+          @matched = !@actual.nil?
+        end
+
+        eval_block if @block && @matched && !negative_expectation?
+
+      ensure
+        ArQuery.executed = nil
+        @@recording_queries = false
+        return @matched && @eval_error.nil?
+      end
+
+      def eval_block
+        @eval_block = true
+        begin
+          @block[ArQuery.executed]
+        rescue => err
+          @eval_error = err
+        end
+      end
+
+      def supports_block_expectations?
+        true
+      end
+
+      def failure_message
+        if @eval_error
+          @eval_error.message
+        elsif @expected.is_a?(Integer)
+          "expected #{@expected}, got #{@actual}"
+        else
+          "expected to execute a query with pattern #{@expected.inspect}, but it wasn't"
+        end
+      end
+
+      def failure_message_when_negated
+        if @expected.is_a?(Integer)
+          "did not expect #{@expected}"
+        else
+          "did not expect to execute a query with pattern #{@expected.inspect}, but it was executed"
+        end
+      end
+
+      def description
+        if @expected.is_a?(Integer)
+          @expected == 1 ? 'execute 1 query' : "execute #{@expected} queries"
+        else
+          "execute query with pattern #{@expected.inspect}"
+        end
+      end
+
+      def negative_expectation?
+        @negative_expectation ||= !caller.first(3).find { |s| s =~ /should_not/ }.nil?
+      end
+    end
+
+    def query(expected = 1, &block)
+      ArQuery.new(expected, &block)
+    end
+  end
+end
+
+# For Rails 6.0
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLite3
+      module DatabaseStatements
+        [:exec_query, :exec, :execute].each do |method|
+          if respond_to?(method)
+            define_method("#{method}_with_query_record") do |sql, *args|
+              Deferring::Matchers::ArQuery.executed << sql if Deferring::Matchers::ArQuery.recording_queries?
+              send("#{method}_without_query_record", sql, *args)
+            end
+
+            alias_method :"#{method}_without_query_record", method
+            alias_method method, :"#{method}_with_query_record"
+          end
+        end
+      end
+    end
+  end
+end
+
+# For previous versions of Rails
+module ActiveRecord
+  module ConnectionAdapters
+    class SQLite3Adapter
+      [:exec_query, :exec, :execute].each do |method|
+        define_method("#{method}_with_query_record") do |sql, *args|
+          Deferring::Matchers::ArQuery.executed << sql if Deferring::Matchers::ArQuery.recording_queries?
+          send("#{method}_without_query_record", sql, *args)
+        end
+
+        alias_method :"#{method}_without_query_record", method
+        alias_method method, :"#{method}_with_query_record"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +66,6 @@ dependencies:
     - - ">="
       - !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
@@ -125,6 +105,8 @@ files:
 - gemfiles/rails_51.gemfile.lock
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_52.gemfile.lock
+- gemfiles/rails_60.gemfile
+- gemfiles/rails_60.gemfile.lock
 - lib/deferring.rb
 - lib/deferring/deferred_association.rb
 - lib/deferring/deferred_callback_listener.rb
@@ -134,6 +116,7 @@ files:
 - spec/lib/deferring_nested_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
+- spec/support/matchers/query_matcher.rb
 - spec/support/models/address.rb
 - spec/support/models/issue.rb
 - spec/support/models/non_validated_issue.rb
@@ -158,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Defer saving ActiveRecord associations until parent is saved
@@ -169,9 +151,9 @@ test_files:
 - spec/lib/deferring_nested_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
+- spec/support/matchers/query_matcher.rb
 - spec/support/models/address.rb
 - spec/support/models/issue.rb
 - spec/support/models/non_validated_issue.rb
 - spec/support/models/person.rb
 - spec/support/models/team.rb
-has_rdoc: