activerecord-count_loader 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8489adecb44640ee21f220153382a63fded5759d
-  data.tar.gz: 49b3d38e965877df8269225787e5d234356aad8d
+  metadata.gz: e96fba115f86ec9df8e6b61b9e46963db8863389
+  data.tar.gz: c133bf5dbdc42da2033c895edbafb54aad6503d4
 SHA512:
-  metadata.gz: 455eafc3a74e192add146c9459bbec579ab4bc54d5021678ae2f9116a8c97af82df618dbaf5d58fbf6fb20d44c37cf283b4bff0daf90ab3cea6528da7aa95082
-  data.tar.gz: 2579d3db7c17e70aab0008fcbdac5978510e1a087974ab53b5144ef25acab4b83b18bc7b21e675727c950900b4ef1cf7fcbdaae23400bc2a952091e1851c780c
+  metadata.gz: 1fb324c9b4c13172114fa47337949bda6a45418e9fe6ebd4ef2d2702c1dc03df576220e014bf05d3069414063b384d17a649b345b48d0cc1f6baaf44afaee783
+  data.tar.gz: 0d5d2aaa5ebd82d0a60a8fee3b94fbce338072af25333fc173620f4b8f0e28f33725cd67c9656f56a991cdc69507cc5c12139826820f6bd2ad78fc4e0e3cb329

data/.travis.yml

@@ -1,5 +1,12 @@
+script: ci/travis.rb
 language: ruby
 rvm:
-  - 2.1.0
   - 2.1.5
-  - ruby-head
+gemfile:
+  - ci/Gemfile.activerecord-3.2.x
+  - ci/Gemfile.activerecord-4.0.x
+  - ci/Gemfile.activerecord-4.1.x
+env:
+  - ARCONN=sqlite3
+  - ARCONN=mysql2
+  - ARCONN=postgresql

data/README.md

@@ -63,6 +63,19 @@ Since it is association, you can preload nested `count_loader` association.
 end
 ```
 
+## Supported Versions
+
+- Ruby
+  - 2.1
+- Rails
+  - 3.2, 4.0, 4.1
+
+### Databases
+
+- sqlite
+- mysql
+- postgresql
+
 ## Testing
 
 ```bash

data/activerecord-count_loader.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.1"
   spec.add_runtime_dependency "activerecord", ">= 3.2.0"
-  spec.add_development_dependency "minitest", ">= 5.4"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "erubis"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "postgres"
   spec.add_development_dependency "pry"
 end

data/ci/Gemfile.activerecord-3.2.x

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem 'activerecord', '~> 3.2.0'
+gemspec path: '..'

data/ci/Gemfile.activerecord-4.0.x

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem 'activerecord', '~> 4.0.0'
+gemspec path: '..'

data/ci/Gemfile.activerecord-4.1.x

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

data/ci/Gemfile.activerecord-4.2.x

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

data/ci/travis.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+commands = [
+  'mysql -e "create database activerecord_unittest;"',
+  'mysql -e "create database activerecord_unittest2;"',
+  'psql  -c "create database activerecord_unittest;" -U postgres',
+  'psql  -c "create database activerecord_unittest2;" -U postgres'
+]
+
+commands.each do |command|
+  system("#{command} > /dev/null 2>&1")
+end

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

@@ -36,19 +36,6 @@ module ActiveRecord
           scope.where(association_key.in(ids)).pluck(association_key_name)
         end
       end
-
-      private
-
-      def preloader_for_with_count_loader(reflection, owners, rhs_klass)
-        preloader = preloader_for_without_count_loader(reflection, owners, rhs_klass)
-        return preloader if preloader
-
-        case reflection.macro
-        when :count_loader
-          CountLoader
-        end
-      end
-      alias_method_chain :preloader_for, :count_loader
     end
   end
 end

data/lib/active_record/count_loader/extend.rb

@@ -1,6 +1,7 @@
 ActiveSupport.on_load(:active_record) do
   module ActiveRecord
     Reflection.prepend(CountLoader::ReflectionExtension)
+    Associations::Preloader.prepend(CountLoader::PreloaderExtension)
     Associations::JoinDependency.prepend(CountLoader::JoinDependencyExtension)
     Associations::Builder::HasMany.prepend(CountLoader::Builder::HasManyExtension)
     Reflection::AssociationReflection.prepend(CountLoader::AssociationReflectionExtension)

data/lib/active_record/count_loader/preloader_extension.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  module CountLoader
+    module PreloaderExtension
+      def preloader_for(reflection, owners, rhs_klass)
+        preloader = super(reflection, owners, rhs_klass)
+        return preloader if preloader
+
+        case reflection.macro
+        when :count_loader
+          Associations::Preloader::CountLoader
+        end
+      end
+    end
+  end
+end

data/lib/active_record/count_loader/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module CountLoader
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/activerecord-count_loader.rb

@@ -7,5 +7,6 @@ require "active_record/associations/preloader/count_loader"
 
 require "active_record/count_loader/has_many_extension"
 require "active_record/count_loader/join_dependency_extension"
+require "active_record/count_loader/preloader_extension"
 require "active_record/count_loader/reflection_extension"
 require "active_record/count_loader/extend"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-count_loader
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: postgres
+  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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -122,12 +150,18 @@ files:
 - README.md
 - Rakefile
 - activerecord-count_loader.gemspec
+- ci/Gemfile.activerecord-3.2.x
+- ci/Gemfile.activerecord-4.0.x
+- ci/Gemfile.activerecord-4.1.x
+- ci/Gemfile.activerecord-4.2.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/count_loader/extend.rb
 - lib/active_record/count_loader/has_many_extension.rb
 - lib/active_record/count_loader/join_dependency_extension.rb
+- lib/active_record/count_loader/preloader_extension.rb
 - lib/active_record/count_loader/reflection_extension.rb
 - lib/active_record/count_loader/version.rb
 - lib/activerecord-count_loader.rb