activerecord-precount 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b808e109c4ff4e66a60696bef99eb38a78f2c729
-  data.tar.gz: abed0c7c35ef630938eec845e4439a7e62f54e90
+  metadata.gz: b966bc8459e4470af32e26fa47a9b1c23c0ca2f5
+  data.tar.gz: 8a036719d57f1a1e4978c6655473e3c6b8112219
 SHA512:
-  metadata.gz: 36e5f8ad70b97aa1d58990791ec8a7de3e075783700d25e8ffc93be693c2d9f39b29da237b46d5159e750654ea3b50b80c99bf32c31118618025e63957aac590
-  data.tar.gz: c08a6d413c210e044e609e36c1e297803476ff52e6b54c6bd8be48b89c4aeafc3b2d759da86314b84858d18fdf29ecb0c9fda2b1f8403bbdce44dfa829bd5aa0
+  metadata.gz: eb7d18f68c02a4c30b33ac1b64ef44f26e430b03ca46a6fe58342220dd3c4f88b1185eab3e1c69dc34169dcbd4f6cc98979a2a7386e118369502706bade6d3dd
+  data.tar.gz: ee694266b59423dd92a44600c9588adb26416950211c5e7ccaf8ecc00bda0253f080b73df124c37744cf0d54d08fc576f5e518863ecd6fbdf672252e4e293533

data/.travis.yml

@@ -1,6 +1,7 @@
 script: ci/travis.rb
 language: ruby
 sudo: false
+cache: bundler
 matrix:
   include:
     - rvm: 2.0

data/activerecord-precount.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "mysql2", ">= 0.3", "< 0.4"
   spec.add_development_dependency "postgres"
   spec.add_development_dependency "rbench"
   spec.add_development_dependency "dalli"

data/lib/active_record/precount/has_many_extension.rb

@@ -16,7 +16,7 @@ module ActiveRecord
           name_with_count = options[:count_loader] if options[:count_loader].is_a?(Symbol)
 
           valid_options = options.slice(*Associations::Builder::CountLoader.valid_options)
-          reflection = Associations::Builder::CountLoader.build(model, name_with_count, nil, valid_options)
+          reflection = Associations::Builder::CountLoader.build(model, name_with_count, scope, valid_options)
           Reflection.add_reflection(model, name_with_count, reflection)
         end
       end

data/lib/active_record/precount/relation_extension.rb

@@ -32,8 +32,10 @@ module ActiveRecord
           raise ArgumentError, "Association named '#{arg}' was not found on #{klass.name}." unless has_reflection?(arg)
           next if has_reflection?(counter_name = :"#{arg}_count")
 
-          options = reflection_for(arg).options.slice(*Associations::Builder::CountLoader.valid_options)
-          reflection = Associations::Builder::CountLoader.build(klass, counter_name, nil, options)
+          original_reflection = reflection_for(arg)
+          scope = original_reflection.scope
+          options = original_reflection.options.slice(*Associations::Builder::CountLoader.valid_options)
+          reflection = Associations::Builder::CountLoader.build(klass, counter_name, scope, options)
           Reflection.add_reflection(model, counter_name, reflection)
         end
       end

data/lib/active_record/precount/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Precount
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/test/cases/associations/eager_count_test.rb

@@ -2,9 +2,11 @@ require 'cases/helper'
 
 class EagerCountTest < ActiveRecord::CountLoader::TestCase
   def setup
-    tweets_count.times.map do |index|
+    tweets_count.times do |i|
       tweet = Tweet.create
-      index.times { Favorite.create(tweet: tweet) }
+      i.times do |j|
+        Favorite.create(tweet: tweet, user_id: j + 1)
+      end
     end
 
     if Tweet.has_reflection?(:favs_count)
@@ -25,9 +27,9 @@ class EagerCountTest < ActiveRecord::CountLoader::TestCase
   end
 
   def test_eager_count_defines_count_loader
-    assert_equal(Tweet.has_reflection?(:favs_count), false)
+    assert_equal(false, Tweet.has_reflection?(:favs_count))
     Tweet.eager_count(:favs).map(&:favs_count)
-    assert_equal(Tweet.has_reflection?(:favs_count), true)
+    assert_equal(true, Tweet.has_reflection?(:favs_count))
   end
 
   def test_eager_count_has_many_with_count_loader_does_not_execute_n_1_queries
@@ -39,8 +41,14 @@ class EagerCountTest < ActiveRecord::CountLoader::TestCase
 
   def test_eager_count_has_many_counts_properly
     expected = Tweet.order(id: :asc).map { |t| t.favorites.count }
-    assert_equal(Tweet.order(id: :asc).map(&:favorites_count), expected)
-    assert_equal(Tweet.order(id: :asc).eager_count(:favorites).map { |t| t.favorites.count }, expected)
-    assert_equal(Tweet.order(id: :asc).eager_count(:favorites).map(&:favorites_count), expected)
+    assert_equal(expected, Tweet.order(id: :asc).map(&:favorites_count))
+    assert_equal(expected, Tweet.order(id: :asc).eager_count(:favorites).map { |t| t.favorites.count })
+    assert_equal(expected, Tweet.order(id: :asc).eager_count(:favorites).map(&:favorites_count))
+  end
+
+  def test_eager_count_has_many_with_scope_counts_properly
+    expected = Tweet.order(id: :asc).map { |t| t.my_favs.count }
+    assert_equal(expected, Tweet.order(id: :asc).eager_count(:my_favs).map { |t| t.my_favs.count })
+    assert_equal(expected, Tweet.order(id: :asc).eager_count(:my_favs).map(&:my_favs_count))
   end
 end

data/test/cases/associations/eager_load_test.rb

@@ -4,9 +4,11 @@ require 'models/tweet'
 
 class EagerLoadTest < ActiveRecord::CountLoader::TestCase
   def setup
-    tweets_count.times.map do |index|
+    tweets_count.times do |i|
       tweet = Tweet.create
-      index.times { Favorite.create(tweet: tweet) }
+      i.times do |j|
+        Favorite.create(tweet: tweet, user_id: j + 1)
+      end
     end
   end
 
@@ -26,8 +28,14 @@ class EagerLoadTest < ActiveRecord::CountLoader::TestCase
 
   def test_eager_loaded_count_loader_counts_properly
     expected = Tweet.order(id: :asc).map { |t| t.favorites.count }
-    assert_equal(Tweet.order(id: :asc).map(&:favorites_count), expected)
-    assert_equal(Tweet.order(id: :asc).eager_load(:favorites_count).map { |t| t.favorites.count }, expected)
-    assert_equal(Tweet.order(id: :asc).eager_load(:favorites_count).map(&:favorites_count), expected)
+    assert_equal(expected, Tweet.order(id: :asc).map(&:favorites_count))
+    assert_equal(expected, Tweet.order(id: :asc).eager_load(:favorites_count).map { |t| t.favorites.count })
+    assert_equal(expected, Tweet.order(id: :asc).eager_load(:favorites_count).map(&:favorites_count))
+  end
+
+  def test_eager_loaded_count_loader_with_scope_counts_properly
+    expected = Tweet.order(id: :asc).map { |t| t.my_favorites.count }
+    assert_equal(expected, Tweet.order(id: :asc).eager_load(:my_favorites_count).map { |t| t.my_favorites.count })
+    assert_equal(expected, Tweet.order(id: :asc).eager_load(:my_favorites_count).map(&:my_favorites_count))
   end
 end

data/test/cases/associations/includes_test.rb

@@ -2,9 +2,11 @@ require 'cases/helper'
 
 class IncludesTest < ActiveRecord::CountLoader::TestCase
   def setup
-    tweets_count.times.map do |index|
+    tweets_count.times do |i|
       tweet = Tweet.create
-      index.times { Favorite.create(tweet: tweet) }
+      i.times do |j|
+        Favorite.create(tweet: tweet, user_id: j + 1)
+      end
     end
   end
 
@@ -24,7 +26,13 @@ class IncludesTest < ActiveRecord::CountLoader::TestCase
 
   def test_included_count_loader_counts_properly
     expected = Tweet.all.map { |t| t.favorites.count }
-    assert_equal(Tweet.all.map(&:favorites_count), expected)
-    assert_equal(Tweet.includes(:favorites_count).map(&:favorites_count), expected)
+    assert_equal(expected, Tweet.all.map(&:favorites_count))
+    assert_equal(expected, Tweet.includes(:favorites_count).map(&:favorites_count))
+  end
+
+  def test_included_count_loader_with_scope_counts_properly
+    expected = Tweet.all.map { |t| t.my_favorites.count }
+    assert_equal(expected, Tweet.all.map(&:my_favorites_count))
+    assert_equal(expected, Tweet.includes(:my_favorites_count).map(&:my_favorites_count))
   end
 end

data/test/cases/associations/precount_test.rb

@@ -2,9 +2,11 @@ require 'cases/helper'
 
 class PrecountTest < ActiveRecord::CountLoader::TestCase
   def setup
-    tweets_count.times.map do |index|
+    tweets_count.times do |i|
       tweet = Tweet.create
-      index.times { Favorite.create(tweet: tweet) }
+      i.times do |j|
+        Favorite.create(tweet: tweet, user_id: j + 1)
+      end
     end
 
     if Tweet.has_reflection?(:favs_count)
@@ -25,9 +27,9 @@ class PrecountTest < ActiveRecord::CountLoader::TestCase
   end
 
   def test_precount_defines_count_loader
-    assert_equal(Tweet.has_reflection?(:favs_count), false)
+    assert_equal(false, Tweet.has_reflection?(:favs_count))
     Tweet.precount(:favs).map(&:favs_count)
-    assert_equal(Tweet.has_reflection?(:favs_count), true)
+    assert_equal(true, Tweet.has_reflection?(:favs_count))
   end
 
   def test_precount_has_many_with_count_loader_does_not_execute_n_1_queries
@@ -39,8 +41,14 @@ class PrecountTest < ActiveRecord::CountLoader::TestCase
 
   def test_precount_has_many_counts_properly
     expected = Tweet.all.map { |t| t.favorites.count }
-    assert_equal(Tweet.all.map(&:favorites_count), expected)
-    assert_equal(Tweet.precount(:favorites).map { |t| t.favorites.count }, expected)
-    assert_equal(Tweet.precount(:favorites).map(&:favorites_count), expected)
+    assert_equal(expected, Tweet.all.map(&:favorites_count))
+    assert_equal(expected, Tweet.precount(:favorites).map { |t| t.favorites.count })
+    assert_equal(expected, Tweet.precount(:favorites).map(&:favorites_count))
+  end
+
+  def test_precount_has_many_with_scope_counts_properly
+    expected = Tweet.all.map { |t| t.my_favs.count }
+    assert_equal(expected, Tweet.precount(:my_favs).map { |t| t.my_favs.count })
+    assert_equal(expected, Tweet.precount(:my_favs).map(&:my_favs_count))
   end
 end

data/test/cases/associations/preload_test.rb

@@ -2,9 +2,11 @@ require 'cases/helper'
 
 class PreloadTest < ActiveRecord::CountLoader::TestCase
   def setup
-    tweets_count.times.map do |index|
+    tweets_count.times do |i|
       tweet = Tweet.create
-      index.times { Favorite.create(tweet: tweet) }
+      i.times do |j|
+        Favorite.create(tweet: tweet, user_id: j + 1)
+      end
     end
   end
 
@@ -24,7 +26,13 @@ class PreloadTest < ActiveRecord::CountLoader::TestCase
 
   def test_preloaded_count_loader_counts_properly
     expected = Tweet.all.map { |t| t.favorites.count }
-    assert_equal(Tweet.all.map(&:favorites_count), expected)
-    assert_equal(Tweet.preload(:favorites_count).map(&:favorites_count), expected)
+    assert_equal(expected, Tweet.all.map(&:favorites_count))
+    assert_equal(expected, Tweet.preload(:favorites_count).map(&:favorites_count))
+  end
+
+  def test_preloaded_count_loader_with_scope_counts_properly
+    expected = Tweet.all.map { |t| t.my_favorites.count }
+    assert_equal(expected, Tweet.all.map(&:my_favorites_count))
+    assert_equal(expected, Tweet.preload(:my_favorites_count).map(&:my_favorites_count))
   end
 end

data/test/models/tweet.rb

@@ -1,4 +1,6 @@
 class Tweet < ActiveRecord::Base
   has_many :favorites, count_loader: true
   has_many :favs, class_name: 'Favorite'
+  has_many :my_favorites, -> { where(user_id: 1) }, class_name: 'Favorite', count_loader: true
+  has_many :my_favs, -> { where(user_id: 1) }, class_name: 'Favorite'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-precount
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,14 +114,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: postgres
   requirement: !ruby/object:Gem::Requirement
@@ -292,4 +298,3 @@ signing_key:
 specification_version: 4
 summary: N+1 count query killer for ActiveRecord
 test_files: []
-has_rdoc: