activerecord-precount 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b966bc8459e4470af32e26fa47a9b1c23c0ca2f5
-  data.tar.gz: 8a036719d57f1a1e4978c6655473e3c6b8112219
+  metadata.gz: d9a9eb42c1ba767640277c85e4f3ac5253e4527b
+  data.tar.gz: 94b98083c83b85e45e1349c88d8560311d3c2d79
 SHA512:
-  metadata.gz: eb7d18f68c02a4c30b33ac1b64ef44f26e430b03ca46a6fe58342220dd3c4f88b1185eab3e1c69dc34169dcbd4f6cc98979a2a7386e118369502706bade6d3dd
-  data.tar.gz: ee694266b59423dd92a44600c9588adb26416950211c5e7ccaf8ecc00bda0253f080b73df124c37744cf0d54d08fc576f5e518863ecd6fbdf672252e4e293533
+  metadata.gz: c743dde55020595f377651df070394db415ea62f6ef12614d5eaca8b0bb4a5c2b6861d426bf5d87122e652511868b1c9c4d166bb26f70aa077a28e3bb7c7de82
+  data.tar.gz: fc1020127a928f74bf6f99846f542d469e5664a4d10a6341d6316c9759d2d912d43b49435ac65939ea22f197ac3d42c63c5bf2b7bb9267276f59a0a673a141c1

data/.travis.yml

@@ -2,28 +2,31 @@ script: ci/travis.rb
 language: ruby
 sudo: false
 cache: bundler
+branches:
+  only:
+    - master
 matrix:
   include:
-    - rvm: 2.0
+    - rvm: 2.1.10
       env: TASK=test ARCONN=mysql2
       gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.1
+    - rvm: 2.2.5
       env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.2
+      gemfile: ci/Gemfile.activerecord-5.0.x
+    - rvm: 2.3.1
       env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-4.1.x
-    - rvm: 2.2
-      env: TASK=test ARCONN=sqlite3
       gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.2
+    - rvm: 2.3.1
+      env: TASK=test ARCONN=sqlite3
+      gemfile: ci/Gemfile.activerecord-5.0.x
+    - rvm: 2.3.1
       env: TASK=test ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.2
+      gemfile: ci/Gemfile.activerecord-5.0.x
+    - rvm: 2.3.1
       env: TASK=test ARCONN=postgresql
-      gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.2
+      gemfile: ci/Gemfile.activerecord-5.0.x
+    - rvm: 2.3.1
       env: TASK=benchmark ARCONN=mysql2
-      gemfile: ci/Gemfile.activerecord-4.2.x
+      gemfile: ci/Gemfile.activerecord-5.0.x
   allow_failures:
     - env: TASK=benchmark ARCONN=mysql2

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in activerecord-precount.gemspec
 gemspec
-
-gem 'rbench', github: 'miloops/rbench'

data/README.md

@@ -77,9 +77,9 @@ gem 'activerecord-precount'
 ## Supported Versions
 
 - Ruby
-  - 2.0, 2.1, 2.2
+  - 2.1, 2.2, 2.3
 - Rails
-  - 4.1, 4.2
+  - 4.2, 5.0
 - Databases
   - sqlite
   - mysql

data/activerecord-precount.gemspec

@@ -16,9 +16,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.0"
-  spec.add_runtime_dependency "activerecord", ">= 3.2.0"
+  spec.required_ruby_version = ">= 2.1"
+  spec.add_runtime_dependency "activerecord", ">= 4.2"
+  spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "erubis"
   spec.add_development_dependency "bundler"
@@ -26,6 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "mysql2", ">= 0.3", "< 0.4"
   spec.add_development_dependency "postgres"
-  spec.add_development_dependency "rbench"
   spec.add_development_dependency "dalli"
 end

data/benchmark.rb

@@ -1,54 +1,42 @@
 $LOAD_PATH.unshift File.expand_path('../test', __FILE__)
 
-require 'rbench'
+require 'benchmark/ips'
 require 'cases/db_config'
 require 'models/favorite'
 require 'models/tweet'
 
-RBench.run(50) do
-  column :counter_cache,          title: 'counter_cache'
-  column :left_join,              title: 'LEFT JOIN'
-  column :eager_count,            title: 'eager_count'
-  column :precount,               title: 'precount'
-  column :slow_eager_count,       title: 'slow eager_count'
-  column :slow_precount,          title: 'slow precount'
-  column :has_many,               title: 'preload'
-  column :count_query,            title: 'N+1 COUNT'
+join_relation = Tweet.joins('LEFT JOIN favorites ON tweets.id = favorites.tweet_id').
+  select('tweets.*, COUNT(favorites.id) AS joined_count').group('tweets.id')
 
-  join_relation = Tweet.joins('LEFT JOIN favorites ON tweets.id = favorites.tweet_id').
-    select('tweets.*, COUNT(favorites.id) AS joined_count').group('tweets.id')
+def prepare_records(tweets_count, favorites_count)
+  Tweet.delete_all
+  Favorite.delete_all
 
-  def prepare_records(tweets_count, favorites_count)
-    Tweet.delete_all
-    Favorite.delete_all
-
-    tweets_count.times do
-      t = Tweet.create(favorites_count_cache: 0)
-      favorites_count.times { Favorite.create(tweet: t) }
-    end
+  tweets_count.times do
+    t = Tweet.create(favorites_count_cache: 0)
+    favorites_count.times { Favorite.create(tweet: t) }
   end
+end
 
-  test_cases = [
-    [10, 5],
-    [20, 20],
-    [30, 100],
-    [50, 10],
-  ]
-
-  test_cases.each do |tweets_count, favorites_count|
-    prepare_records(tweets_count, favorites_count)
-
-    report "N = #{tweets_count}, count = #{favorites_count}" do
-      counter_cache          { Tweet.all.map(&:favorites_count_cache) }
-      left_join              { Tweet.joins('LEFT JOIN favorites ON tweets.id = favorites.tweet_id').
-                               select('tweets.*, COUNT(favorites.id) AS joined_count').
-                               group('tweets.id').map(&:joined_count) }
-      eager_count            { Tweet.eager_count(:favorites).map(&:favorites_count) }
-      precount               { Tweet.precount(:favorites).map(&:favorites_count) }
-      slow_eager_count       { Tweet.eager_count(:favorites).map { |t| t.favorites.count } }
-      slow_precount          { Tweet.precount(:favorites).map { |t| t.favorites.count } }
-      has_many               { Tweet.preload(:favorites).map{ |t| t.favorites.size } }
-      count_query            { Tweet.all.map{ |t| t.favorites.count } }
-    end
+test_cases = [
+  [30, 100],
+]
+
+test_cases.each do |tweets_count, favorites_count|
+  prepare_records(tweets_count, favorites_count)
+
+  puts "N = #{tweets_count}, count = #{favorites_count}"
+  Benchmark.ips do |x|
+    x.report('counter_cache')    { Tweet.all.map(&:favorites_count_cache) }
+    x.report('LEFT JOIN')        { Tweet.joins('LEFT JOIN favorites ON tweets.id = favorites.tweet_id').
+                                   select('tweets.*, COUNT(favorites.id) AS joined_count').
+                                   group('tweets.id').map(&:joined_count) }
+    x.report('eager_count')      { Tweet.eager_count(:favorites).map(&:favorites_count) }
+    x.report('precount')         { Tweet.precount(:favorites).map(&:favorites_count) }
+    x.report('slow eager_count') { Tweet.eager_count(:favorites).map { |t| t.favorites.count } }
+    x.report('slow precount')    { Tweet.precount(:favorites).map { |t| t.favorites.count } }
+    x.report('preload')          { Tweet.preload(:favorites).map{ |t| t.favorites.size } }
+    x.report('N+1 COUNT')        { Tweet.all.map{ |t| t.favorites.count } }
+    x.compare!
   end
 end

data/ci/.gitignore

@@ -0,0 +1 @@
+*.lock

data/ci/Gemfile.activerecord-4.2.x

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem 'rails', '~> 4.2.0'
+gem 'rails', '~> 4.2.6'
 gemspec path: '..'

data/ci/{Gemfile.activerecord-4.1.x → Gemfile.activerecord-5.0.x}

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem 'rails', '~> 4.1.0'
+gem 'rails', '5.0.0.rc1'
 gemspec path: '..'

data/lib/active_record/precount.rb

@@ -0,0 +1,12 @@
+require "active_support/lazy_load_hooks"
+
+ActiveSupport.on_load(:active_record) do
+  require "active_record/precount/association_reflection_extension"
+  require "active_record/precount/base_extension"
+  require "active_record/precount/collection_proxy_extension"
+  require "active_record/precount/has_many_extension"
+  require "active_record/precount/relation_extension"
+  require "active_record/precount/reflection_extension"
+  require "active_record/precount/preloader_extension"
+  require "active_record/precount/join_dependency_extension"
+end

data/lib/active_record/precount/association_reflection_extension.rb

@@ -0,0 +1,45 @@
+module ActiveRecord
+  module Associations
+    class CountLoader < SingularAssociation
+      # Not preloaded behaviour of count_loader association
+      # When this method is called, it will be N+1 query
+      def load_target
+        count_target = reflection.name_without_count.to_sym
+        @target = owner.association(count_target).count
+
+        loaded! unless loaded?
+        target
+      rescue ActiveRecord::RecordNotFound
+        reset
+      end
+    end
+  end
+
+  module Precount
+    module AssociationReflectionExtension
+      def klass
+        case macro
+        when :count_loader
+          @klass ||= active_record.send(:compute_type, options[:class_name] || name_without_count.singularize.classify)
+        else
+          super
+        end
+      end
+
+      def name_without_count
+        name.to_s.sub(/_count$/, "")
+      end
+
+      def association_class
+        case macro
+        when :count_loader
+          ActiveRecord::Associations::CountLoader
+        else
+          super
+        end
+      end
+    end
+  end
+
+  Reflection::AssociationReflection.prepend(Precount::AssociationReflectionExtension)
+end

data/lib/active_record/precount/base_extension.rb

@@ -8,12 +8,10 @@ module ActiveRecord
       end
 
       def reflection_for(name)
-        if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 2
-          reflections[name.to_s]
-        else
-          reflections[name.to_sym]
-        end
+        reflections[name.to_s]
       end
     end
   end
+
+  Base.send(:extend, Precount::BaseExtension)
 end

data/lib/active_record/precount/collection_proxy_extension.rb

@@ -15,4 +15,6 @@ module ActiveRecord
       end
     end
   end
+
+  Associations::CollectionProxy.prepend(Precount::CollectionProxyExtension)
 end

data/lib/active_record/precount/has_many_extension.rb

@@ -1,7 +1,31 @@
 module ActiveRecord
+  module Associations
+    module Builder
+      class CountLoader < SingularAssociation
+        def self.valid_options(*)
+          [:class, :class_name, :foreign_key]
+        end
+
+        if ActiveRecord.version.segments.first >= 5
+          def self.macro
+            :count_loader
+          end
+        else
+          def macro
+            :count_loader
+          end
+        end
+
+        def self.valid_dependent_options
+          []
+        end
+      end
+    end
+  end
+
   module Precount
     module Builder
-      module HasManyExtension
+      module Rails4HasManyExtension
         def valid_options
           super + [:count_loader]
         end
@@ -20,6 +44,35 @@ module ActiveRecord
           Reflection.add_reflection(model, name_with_count, reflection)
         end
       end
+
+      module Rails5HasManyExtension
+        def valid_options(*)
+          super + [:count_loader]
+        end
+
+        def build(model, name, scope, options, &block)
+          if scope.is_a?(Hash)
+            options = scope
+            scope   = nil
+          end
+
+          if options[:count_loader]
+            name_with_count = :"#{name}_count"
+            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, scope, valid_options)
+            Reflection.add_reflection(model, name_with_count, reflection)
+          end
+          super
+        end
+      end
     end
   end
+
+  if ActiveRecord.version.segments.first >= 5
+    Associations::Builder::HasMany.send(:extend, Precount::Builder::Rails5HasManyExtension)
+  else
+    Associations::Builder::HasMany.prepend(Precount::Builder::Rails4HasManyExtension)
+  end
 end

data/lib/active_record/precount/join_dependency_extension.rb

@@ -46,4 +46,6 @@ module ActiveRecord
       end
     end
   end
+
+  Associations::JoinDependency.prepend(Precount::JoinDependencyExtension)
 end

data/lib/active_record/precount/preloader_extension.rb

@@ -1,4 +1,73 @@
 module ActiveRecord
+  module Associations
+    class Preloader
+      class CountLoader < SingularAssociation
+        if ActiveRecord.version.segments.first >= 5
+          def association_key_name
+            reflection.foreign_key
+          end
+
+          def owner_key_name
+            reflection.active_record_primary_key
+          end
+
+          private
+
+          def preload(preloader)
+            associated_records_by_owner(preloader).each do |owner, associated_records|
+              owner.association(reflection.name).target = associated_records.first.to_i
+            end
+          end
+
+          def load_records
+            return {} if owner_keys.empty?
+
+            slices  = owner_keys.each_slice(klass.connection.in_clause_length || owner_keys.size)
+            @preloaded_records = slices.flat_map { |slice|
+              records_for(slice)
+            }
+
+            Hash[@preloaded_records.first.map { |key, count| [key, [count]] }]
+          end
+
+          def query_scope(ids)
+            scope.where(association_key.in(ids)).group(association_key_name).count(association_key_name)
+          end
+        else
+          def association_key_name
+            reflection.foreign_key
+          end
+
+          def owner_key_name
+            reflection.active_record_primary_key
+          end
+
+          private
+
+          def preload(preloader)
+            associated_records_by_owner(preloader).each do |owner, associated_records|
+              owner.association(reflection.name).target = associated_records.first.to_i
+            end
+          end
+
+          def load_slices(slices)
+            @preloaded_records = slices.flat_map { |slice|
+              records_for(slice)
+            }
+
+            @preloaded_records.first.map { |key, count|
+              [count, key]
+            }
+          end
+
+          def query_scope(ids)
+            scope.where(association_key.in(ids)).group(association_key_name).count(association_key_name)
+          end
+        end
+      end
+    end
+  end
+
   module Precount
     module PreloaderExtension
       def preloader_for(reflection, owners, rhs_klass)
@@ -12,4 +81,6 @@ module ActiveRecord
       end
     end
   end
+
+  Associations::Preloader.prepend(Precount::PreloaderExtension)
 end

data/lib/active_record/precount/reflection_extension.rb

@@ -1,4 +1,14 @@
 module ActiveRecord
+  module Reflection
+    class CountLoaderReflection < AssociationReflection
+      def initialize(name, scope, options, active_record)
+        super(name, scope, options, active_record)
+      end
+
+      def macro; :count_loader; end
+    end
+  end
+
   module Precount
     module ReflectionExtension
       def self.prepended(base)
@@ -11,40 +21,14 @@ module ActiveRecord
         def create(macro, name, scope, options, ar)
           case macro
           when :count_loader
-            if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 2
-              Reflection::CountLoaderReflection.new(name, scope, options, ar)
-            else
-              Reflection::AssociationReflection.new(macro, name, scope, options, ar)
-            end
+            Reflection::CountLoaderReflection.new(name, scope, options, ar)
           else
             super(macro, name, scope, options, ar)
           end
         end
       end
     end
-
-    module AssociationReflectionExtension
-      def klass
-        case macro
-        when :count_loader
-          @klass ||= active_record.send(:compute_type, options[:class_name] || name_without_count.singularize.classify)
-        else
-          super
-        end
-      end
-
-      def name_without_count
-        name.to_s.sub(/_count$/, "")
-      end
-
-      def association_class
-        case macro
-        when :count_loader
-          ActiveRecord::Associations::CountLoader
-        else
-          super
-        end
-      end
-    end
   end
+
+  Reflection.prepend(Precount::ReflectionExtension)
 end

data/lib/active_record/precount/relation_extension.rb

@@ -55,4 +55,6 @@ module ActiveRecord
       end
     end
   end
+
+  Relation.prepend(Precount::RelationExtension)
 end

data/lib/active_record/precount/version.rb

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

data/lib/activerecord-precount.rb

@@ -1,8 +1 @@
-require "active_record"
-require "active_support/lazy_load_hooks"
-
-require "active_record/associations/count_loader"
-require "active_record/associations/builder/count_loader"
-require "active_record/associations/preloader/count_loader"
-
-require "active_record/precount/extend"
+require "active_record/precount"

data/test/cases/associations/eager_count_test.rb

@@ -8,17 +8,13 @@ class EagerCountTest < ActiveRecord::CountLoader::TestCase
         Favorite.create(tweet: tweet, user_id: j + 1)
       end
     end
+  end
 
+  def teardown
     if Tweet.has_reflection?(:favs_count)
-      if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 2
-        Tweet._reflections.delete('favs_count')
-      else
-        Tweet._reflections.delete(:favs_count)
-      end
+      Tweet.reflections.delete('favs_count')
     end
-  end
 
-  def teardown
     [Tweet, Favorite].each(&:delete_all)
   end
 

data/test/cases/associations/eager_load_test.rb

@@ -1,6 +1,4 @@
 require 'cases/helper'
-require 'models/favorite'
-require 'models/tweet'
 
 class EagerLoadTest < ActiveRecord::CountLoader::TestCase
   def setup

data/test/cases/associations/precount_test.rb

@@ -8,17 +8,13 @@ class PrecountTest < ActiveRecord::CountLoader::TestCase
         Favorite.create(tweet: tweet, user_id: j + 1)
       end
     end
+  end
 
+  def teardown
     if Tweet.has_reflection?(:favs_count)
-      if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 2
-        Tweet._reflections.delete('favs_count')
-      else
-        Tweet._reflections.delete(:favs_count)
-      end
+      Tweet.reflections.delete('favs_count')
     end
-  end
 
-  def teardown
     [Tweet, Favorite].each(&:delete_all)
   end
 

data/test/cases/helper.rb

@@ -2,3 +2,6 @@ require 'cases/db_config'
 
 require 'support/autorun'
 require 'cases/test_case'
+
+require 'models/favorite'
+require 'models/tweet'

data/test/schema/schema.rb

@@ -2,7 +2,7 @@ ActiveRecord::Schema.define do
   create_table :favorites, force: true do |t|
     t.integer  :tweet_id
     t.integer  :user_id
-    t.timestamps
+    t.timestamps null: false
   end
   add_index :favorites, :tweet_id
 
@@ -10,7 +10,7 @@ ActiveRecord::Schema.define do
     t.integer  :in_reply_to_tweet_id
     t.integer  :user_id
     t.integer  :favorites_count_cache
-    t.timestamps
+    t.timestamps null: false
   end
   add_index :tweets, :in_reply_to_tweet_id
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-precount
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-line
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,20 +170,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rbench
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -185,15 +199,14 @@ files:
 - Rakefile
 - activerecord-precount.gemspec
 - benchmark.rb
-- ci/Gemfile.activerecord-4.1.x
+- ci/.gitignore
 - ci/Gemfile.activerecord-4.2.x
+- ci/Gemfile.activerecord-5.0.x
 - ci/travis.rb
-- lib/active_record/associations/builder/count_loader.rb
-- lib/active_record/associations/count_loader.rb
-- lib/active_record/associations/preloader/count_loader.rb
+- lib/active_record/precount.rb
+- lib/active_record/precount/association_reflection_extension.rb
 - lib/active_record/precount/base_extension.rb
 - lib/active_record/precount/collection_proxy_extension.rb
-- lib/active_record/precount/extend.rb
 - lib/active_record/precount/has_many_extension.rb
 - lib/active_record/precount/join_dependency_extension.rb
 - lib/active_record/precount/preloader_extension.rb
@@ -285,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -293,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: N+1 count query killer for ActiveRecord

data/lib/active_record/associations/builder/count_loader.rb

@@ -1,13 +0,0 @@
-module ActiveRecord::Associations::Builder
-  class CountLoader < SingularAssociation
-    self.valid_options = [:class, :class_name, :foreign_key]
-
-    def macro
-      :count_loader
-    end
-
-    def self.valid_dependent_options
-      []
-    end
-  end
-end

data/lib/active_record/associations/count_loader.rb

@@ -1,27 +0,0 @@
-module ActiveRecord
-  module Associations
-    class CountLoader < SingularAssociation
-      # Not preloaded behaviour of count_loader association
-      # When this method is called, it will be N+1 query
-      def load_target
-        count_target = reflection.name_without_count.to_sym
-        @target = owner.association(count_target).count
-
-        loaded! unless loaded?
-        target
-      rescue ActiveRecord::RecordNotFound
-        reset
-      end
-    end
-  end
-
-  module Reflection
-    class CountLoaderReflection < AssociationReflection
-      def initialize(name, scope, options, active_record)
-        super(name, scope, options, active_record)
-      end
-
-      def macro; :count_loader; end
-    end
-  end
-end

data/lib/active_record/associations/preloader/count_loader.rb

@@ -1,37 +0,0 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class CountLoader < SingularAssociation
-        def association_key_name
-          reflection.foreign_key
-        end
-
-        def owner_key_name
-          reflection.active_record_primary_key
-        end
-
-        private
-
-        def preload(preloader)
-          associated_records_by_owner(preloader).each do |owner, associated_records|
-            owner.association(reflection.name).target = associated_records.first.to_i
-          end
-        end
-
-        def load_slices(slices)
-          @preloaded_records = slices.flat_map { |slice|
-            records_for(slice)
-          }
-
-          @preloaded_records.first.map { |key, count|
-            [count, key]
-          }
-        end
-
-        def query_scope(ids)
-          scope.where(association_key.in(ids)).group(association_key_name).count(association_key_name)
-        end
-      end
-    end
-  end
-end

data/lib/active_record/precount/extend.rb

@@ -1,20 +0,0 @@
-require "active_record/precount/base_extension"
-require "active_record/precount/collection_proxy_extension"
-require "active_record/precount/has_many_extension"
-require "active_record/precount/join_dependency_extension"
-require "active_record/precount/preloader_extension"
-require "active_record/precount/reflection_extension"
-require "active_record/precount/relation_extension"
-
-ActiveSupport.on_load(:active_record) do
-  module ActiveRecord
-    Base.send(:extend, Precount::BaseExtension)
-    Relation.send(:prepend, Precount::RelationExtension)
-    Reflection.send(:prepend, Precount::ReflectionExtension)
-    Associations::Preloader.send(:prepend, Precount::PreloaderExtension)
-    Associations::JoinDependency.send(:prepend, Precount::JoinDependencyExtension)
-    Associations::CollectionProxy.send(:prepend, Precount::CollectionProxyExtension)
-    Associations::Builder::HasMany.send(:prepend, Precount::Builder::HasManyExtension)
-    Reflection::AssociationReflection.send(:prepend, Precount::AssociationReflectionExtension)
-  end
-end