activerecord-has_count 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69e774d016a1d4b507eb55f8f0f9504cbf198a3b
-  data.tar.gz: abbd2d57baa8ebdf82d65ce8f6080febafaaaf57
+  metadata.gz: a7893887f07e1bbe2bc7da27c608db42bc940882
+  data.tar.gz: ad7e88db1ae15690c451bdbf1d070db28d7ebf57
 SHA512:
-  metadata.gz: 7ef3dacda31025b0d12def2faa3b14a75b43ab114a0389489a7962bc0e1c53542402991e0809198192ba8c28cc77c0bfd56c7533f79ca05a5cc6fe0406c65b94
-  data.tar.gz: 30460a520bfd15c0f131ec19091415976834fb0b876bc4c362148bc604f34a71827b39e76e33f00d1f07d03f8e4148e1e480191829e007ad4daad26dad74a73c
+  metadata.gz: 49e9c595905967d652903f6eb152b5d1f2e95d38976f88ea8a3928fd49db8639a95ebaaaa57d3867abdc7fdf0a2f6d60ab0ac7a80719599f08bf4fa3def6b408
+  data.tar.gz: 2b08a6920e97ce7a60a8faa7e852530276d41ecf87e949518b14d2ddc5a37faa023fa12c2262f60aa827d5259498f04e70aa2d82e18baf8b2500ddc9b796eed2

data/benchmarks/benchmark.rb

@@ -1,4 +1,5 @@
 require "benchmark"
+require "pry"
 require "active_record"
 require "activerecord-import"
 require "activerecord-has_count"
@@ -52,6 +53,12 @@ Benchmark.bmbm do |bench|
     tweets.each { |t| t.replies_count }
   end
 
+  bench.report("preloaded has_count") do
+    tweets = Tweet.preload(:replies_count).first(TWEET_COUNT)
+
+    tweets.each { |t| t.replies_count }
+  end
+
   bench.report("size of preloaded association") do
     tweets = Tweet.preload(:replies).first(TWEET_COUNT)
 

data/lib/active_record/associations/has_count.rb

@@ -4,7 +4,7 @@ module ActiveRecord
       # Not preloaded behaviour of has_count association
       # When this method is called, it will be N+1 query
       def load_target
-        count_target = name_without_count.to_sym
+        count_target = reflection.name_without_count.to_sym
         @target = owner.association(count_target).count
 
         loaded! unless loaded?
@@ -12,15 +12,6 @@ module ActiveRecord
       rescue ActiveRecord::RecordNotFound
         reset
       end
-
-      # This method is used by preloader when grouping preload target's class
-      def klass
-        reflection.active_record.send(:compute_type, name_without_count.singularize.classify)
-      end
-
-      def name_without_count
-        reflection.name.to_s.sub(/_count$/, "")
-      end
     end
   end
 end

data/lib/active_record/reflection/has_count.rb

@@ -13,6 +13,19 @@ module ActiveRecord
 
     class AssociationReflection
       module HasCount
+        def klass_with_has_count
+          case macro
+          when :has_count
+            @klass ||= active_record.send(:compute_type, name_without_count.singularize.classify)
+          else
+            klass_without_has_count
+          end
+        end
+
+        def name_without_count
+          name.to_s.sub(/_count$/, "")
+        end
+
         def association_class_with_has_count
           case macro
           when :has_count

data/lib/activerecord-has_count/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HasCount
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/activerecord-has_count.rb

@@ -21,6 +21,7 @@ module ActiveRecord
 
     class AssociationReflection
       include HasCount
+      alias_method_chain :klass, :has_count
       alias_method_chain :association_class, :has_count
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-has_count
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Takashi Kokubun