activerecord-precounter 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09078896e68490e75c8beb5645afcd62ad0d5ea91c00e4bce6caf56c78fef5a8'
-  data.tar.gz: 584556fa31db7232716409333ddc670679846fab59660a66c20432eef6eb95b5
+  metadata.gz: a80cb8c2919851956774b0c573d3a3271a9b4f017e33edca6fae411f1c4c189b
+  data.tar.gz: 9d479d623ceacf1a93ad4cc64b6ad58ce32f586e07dc8b6335d9e380f82e7d9b
 SHA512:
-  metadata.gz: 978b940f2cc5adf4206bb399fbdb0e35f745336095df5a411d9d7fc98e9c3f43b3e0974c905d23b3d96811c9a55cc75d1da1aa3c1f3317b3c33cc20412224d6d
-  data.tar.gz: 194cd5631328971a328c71ecf853cf80f10f309dff0cf3ff23a9b57275d3bd78b00cfd43ff8e070f6c023d0b5a4183b92fd03e9f2e2edc08e0f18257af38234f
+  metadata.gz: ae135551e4619a121e488e62517c072b3692dd8b717867b45114ffe904ee50ad6cec6f3924755f511a48f640510d902986be83e0205b5b7178a054eae6d9b47d
+  data.tar.gz: 295507cafb1c6de872f92163d74ebfd37bae295cb2fe4478b3c313b967c0faf657090596fb37153a5a32ac5201be6c48b2384d697ca8901c98f4b0f1fe79da42

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.4.0
+
+* [breaking] Raise `NotPrecountedError` instead of returning nil if `*_count` is called without precount
+* Add `ActiveRecord::Precountable` module to actively define `*_count` readers and writers by `precounts` DSL on ActiveRecord::Base.
+
 ## v0.3.3
 
 * Support passing a single record to `ActiveRecord::Precounter.new` [#8](https://github.com/k0kubun/activerecord-precounter/pull/8)

data/lib/active_record/precountable.rb

@@ -0,0 +1,20 @@
+module ActiveRecord
+  module Precountable
+    class NotPrecountedError < StandardError
+    end
+
+    def precounts(*association_names)
+      association_names.each do |association_name|
+        var_name = "#{association_name}_count"
+        instance_var_name = "@#{var_name}"
+
+        attr_writer(var_name)
+        define_method(var_name) do
+          count = instance_variable_get(instance_var_name)
+          raise NotPrecountedError.new("`#{association_name}' not precounted") unless count
+          count
+        end
+      end
+    end
+  end
+end

data/lib/active_record/precounter.rb

@@ -1,4 +1,5 @@
 require 'active_record/precounter/version'
+require 'active_record/precountable'
 
 module ActiveRecord
   class Precounter
@@ -47,7 +48,7 @@ module ActiveRecord
                         ).count
                       end
 
-        writer = define_count_accessor(records.first, association_name)
+        writer = define_count_accessor(klass, association_name)
         records.each do |record|
           record.public_send(writer, count_by_id.fetch(record.public_send(primary_key), 0))
         end
@@ -57,15 +58,16 @@ module ActiveRecord
 
     private
 
-    # @param [ActiveRecord::Base] record
+    # @param [Class] record class
     # @param [String] association_name
     # @return [String] writer method name
-    def define_count_accessor(record, association_name)
+    def define_count_accessor(klass, association_name)
       reader_name = "#{association_name}_count"
       writer_name = "#{reader_name}="
 
-      if !record.respond_to?(reader_name) && !record.respond_to?(writer_name)
-        record.class.send(:attr_accessor, reader_name)
+      if !klass.method_defined?(reader_name) && !klass.method_defined?(writer_name)
+        klass.extend(ActiveRecord::Precountable)
+        klass.public_send(:precounts, association_name)
       end
 
       writer_name

data/lib/active_record/precounter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   class Precounter
-    VERSION = '0.3.3'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-precounter
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -131,6 +131,7 @@ files:
 - ci/Gemfile.activerecord-5.1.x
 - ci/Gemfile.activerecord-5.2.x
 - ci/travis.rb
+- lib/active_record/precountable.rb
 - lib/active_record/precounter.rb
 - lib/active_record/precounter/version.rb
 - lib/activerecord-precounter.rb
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: Yet Another N+1 COUNT Query Killer for ActiveRecord