activerecord-precounter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c85fec9116becd14760b8726df821d422085a4c
-  data.tar.gz: 5c216798df88c22adfe212b5695e4667600ded38
+  metadata.gz: bf992b2001ae6c7bf6ada58116ae081228ab07c6
+  data.tar.gz: 0762cdbd9a2ed0924a19cdd9835773250cf5bcba
 SHA512:
-  metadata.gz: a472ba502fb21376132e0c8742a50d83c2ac4dc09b39115b592071d26fd2ef5ab20fe94cd2f76db66039e00ebea05504bb36e376d7222e49a1bc335d394cc95f
-  data.tar.gz: 5c6f1140da169bb55a909fb35b1cee56e5371a772b7c729324c353a992f646bd85730e1c225b3a613701bdd4aa51dc1d0ac1f0a38d7b2bbf52596f7e9bc03495
+  metadata.gz: 365ef8fe72218325265a8a3b563c325de40f81d3c65097798a59fdaa4e504cd10bc74d4888480f8202da17d9c3e9ccc4cce03a5ff288e283469cc5e1e9b57846
+  data.tar.gz: a56f1bf870d6c334816806bd6712db25f1f6080c5705fbb5104724b8802e192c6580f244436a0ef7012d1a54fdad82b958a21fdc71497a40416c9264dd37a69f

data/.travis.yml

@@ -7,27 +7,9 @@ branches:
     - master
 matrix:
   include:
-    - rvm: 2.1.10
-      env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.2.7
-      env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-5.1.x
-    - rvm: 2.3.4
-      env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-5.1.x
-    - rvm: 2.4.1
-      env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.4.1
-      env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-5.0.x
-    - rvm: 2.4.1
-      env: TASK=test ARCONN=sqlite3
-      gemfile: ci/Gemfile.activerecord-5.1.x
     - rvm: 2.4.1
-      env: TASK=test ARCONN=mysql2
+      env: TASK=spec ARCONN=sqlite3
       gemfile: ci/Gemfile.activerecord-5.1.x
     - rvm: 2.4.1
-      env: TASK=test ARCONN=postgresql
+      env: TASK=spec ARCONN=postgresql
       gemfile: ci/Gemfile.activerecord-5.1.x

data/lib/active_record/precounter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   class Precounter
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/active_record/precounter.rb

@@ -13,7 +13,7 @@ module ActiveRecord
     # @return [Array<ActiveRecord::Base>]
     def precount(*association_names)
       records = @relation.to_a
-      return if records.empty?
+      return [] if records.empty?
 
       association_names.each do |association_name|
         association_name = association_name.to_s
@@ -26,9 +26,15 @@ module ActiveRecord
           )
         end
 
-        count_by_id = reflection.klass.where(reflection.inverse_of.name => @relation).group(
-          reflection.inverse_of.foreign_key
-        ).count
+        count_by_id = if reflection.has_scope?
+                        reflection.scope_for(reflection.klass.where(reflection.inverse_of.name => @relation)).group(
+                          reflection.inverse_of.foreign_key
+                        ).count
+                      else
+                        reflection.klass.where(reflection.inverse_of.name => @relation).group(
+                          reflection.inverse_of.foreign_key
+                        ).count
+                      end
 
         writer = define_count_accessor(records.first, association_name)
         records.each do |record|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-precounter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Yet Another N+1 COUNT Query Killer for ActiveRecord