activerecord-precounter 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7ed8a641545585e1fcf838262efb66633387a173d65614d9ed7fe4100f2018
-  data.tar.gz: 2362e9a30228774378634e21f89c26f3cd21dd3051c9e56ba1bc2412e51e06fd
+  metadata.gz: a5bf25aa0550622438acc6518baeb060cc7a8b3efb256d398aae6e10575654f8
+  data.tar.gz: 51959a62fc7b3bee6bed30512711d7606b0ed3ac756b50fc51ad91ca42ef08ef
 SHA512:
-  metadata.gz: 3f7709814cfba9081356cb625c2350ad175384a7d688b439442c565193d315849480ad33b90e04672fa3fa9ebe0ff1a2af194b2c3d5d8853b050096a282cc0d4
-  data.tar.gz: 21366e80cab47df357670be5febdbbb1bb62bcea232bce497c5295c7adeed52929a59d41ede31d8919b477e2849b073f1a6168a118d18439f3af6d75141bc090
+  metadata.gz: 8591c0865cbf9714089fa3ef8230a6cbe09248e49cff8bdbc6dba1dc74c89a9cb2d1cd3f3e5c13dc33e15c9c4b8079f626e790e86ca211ab33b163b0942ffc90
+  data.tar.gz: b0286be1b1273b5f53390c022dad711cde8aeb41fdd546619da928fbfc18885a2a3feb7e6c2d54a5fe65321141729dc203c8388156241c6bec7ae7e2cb81e257

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+## v0.3.2
+
+* Support primary\_key option of belongs\_to association [#7](https://github.com/k0kubun/activerecord-precounter/pull/7)
+
+## v0.3.1
+
+* Fix [#5](https://github.com/k0kubun/activerecord-precounter/pull/5) for ActiveRecord 5.0 (take 3)
+
+## v0.3.0
+
+* Fix [#5](https://github.com/k0kubun/activerecord-precounter/pull/5) for ActiveRecord 5.0 (take 2)
+* [breaking] Drop ActiveRecord 4.2 support
+
+## v0.2.3
+
+* Fix count of scoped association [#5](https://github.com/k0kubun/activerecord-precounter/pull/5)
+
+## v0.2.2
+
+* Fix unexpected subquery [#4](https://github.com/k0kubun/activerecord-precounter/pull/5)
+
+## v0.2.1
+
+* Add support for counting scoped association
+* Return empty array when target records don't exist
+
+## v0.2.0
+
+* [breaking] Completely change interface
+
+## v0.1.0
+
+* Initial release

data/activerecord-precounter.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', '>= 5'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'postgres'
+  spec.add_development_dependency 'pg'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sqlite3'

data/lib/active_record/precounter.rb

@@ -26,21 +26,23 @@ module ActiveRecord
           )
         end
 
+        primary_key = reflection.inverse_of.association_primary_key.to_sym
+
         count_by_id = if reflection.has_scope?
                         # ActiveRecord 5.0 unscopes #scope_for argument, so adding #where outside that:
                         # https://github.com/rails/rails/blob/v5.0.7/activerecord/lib/active_record/reflection.rb#L314-L316
-                        reflection.scope_for(reflection.klass.unscoped).where(reflection.inverse_of.name => records.map(&:id)).group(
+                        reflection.scope_for(reflection.klass.unscoped).where(reflection.inverse_of.name => records.map(&primary_key)).group(
                           reflection.inverse_of.foreign_key
                         ).count
                       else
-                        reflection.klass.where(reflection.inverse_of.name => records.map(&:id)).group(
+                        reflection.klass.where(reflection.inverse_of.name => records.map(&primary_key)).group(
                           reflection.inverse_of.foreign_key
                         ).count
                       end
 
         writer = define_count_accessor(records.first, association_name)
         records.each do |record|
-          record.public_send(writer, count_by_id.fetch(record.id, 0))
+          record.public_send(writer, count_by_id.fetch(record.public_send(primary_key), 0))
         end
       end
       records

data/lib/active_record/precounter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   class Precounter
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-precounter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: postgres
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,6 +118,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md