active_record_association_query_economizer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355ea812e8ba8feb4ca63050bd626b78c6936e10
-  data.tar.gz: 8458eacf613335460b0208f759624a4fc28f1a90
+  metadata.gz: c512b60190cebde831ca82b0a42671d657499e37
+  data.tar.gz: 874cce3d0678a84dd1532add0ed804c6b4cb14c1
 SHA512:
-  metadata.gz: 9484c25735a390151bd1825429a17379ecb6e38cc4d9b5a4978c86c15ec9d952988620fe141a8dc82661aa6a2817d622d10967d3ac23c77c96d9fd190fc4f753
-  data.tar.gz: 596a09e6e146ed8110e12555bf1cb000314a5dccc425774f802e14c5c795583750a6dd84082e1772abfc7ca9bf4f81885b5e5d600fcc3ac2e330c37bfad5a958
+  metadata.gz: 9547a824bd77a70b631363dff07e42f5ecb11a4f880560fc3e1aa3a00bf15cf30c4a2a0d78685d59a7c07cb8014cf07624886e30d1eca2907cdeccf2a4a86616
+  data.tar.gz: f5ec72a45ed44dab2dfcf2f9658d8766982a96d4d1b510ee195d5dbee03d134f3bd1cf82697ae87f0ae6b88bc4da0df087a1e894f00aaa13a106a248bfb1e021

data/Rakefile

@@ -12,25 +12,31 @@ task :default => :test
 
 pwd = File.expand_path('../', __FILE__)
 
-gemfiles = %w(
-  activerecord-42
-  activerecord-50
-  activerecord-51
-)
+# set an array ["4.2.0", "4.2.1", ... "4.2.9", "5.0.0", "5.0.1", ... "5.1.0", ... "5.1.6", "5.2.0"]
+activerecord_versions =
+  { "4.2" => (0..9).to_a,
+    "5.0" => (0..6).to_a,
+    "5.1" => (0..6).to_a,
+    "5.2" => [0],
+  }.map do |base_version, tiny_versions|
+    tiny_versions.map { |tiny_version| "#{base_version}.#{tiny_version}" }
+  end.flatten
 
 namespace :test do
-  gemfiles.each do |gemfile|
-    desc "Run Tests by #{gemfile}.gemfile"
-    task gemfile do
-      sh "BUNDLE_GEMFILE='#{pwd}/gemfiles/#{gemfile}.gemfile' bundle install --path #{pwd}/.bundle"
-      sh "BUNDLE_GEMFILE='#{pwd}/gemfiles/#{gemfile}.gemfile' bundle exec rake -t test"
+  activerecord_versions.each do |activerecord_version|
+    desc "Run Tests with activerecord #{activerecord_version}"
+    task "activerecord-#{activerecord_version}" do
+      gemfile = "#{pwd}/gemfiles/test.gemfile"
+      sh "VERSION=#{activerecord_version} BUNDLE_GEMFILE='#{gemfile}' bundle install --path #{pwd}/.bundle"
+      sh "VERSION=#{activerecord_version} BUNDLE_GEMFILE='#{gemfile}' bundle exec rake -t test"
+      sh "rm #{gemfile}.lock"
     end
   end
 
   desc "Run All Tests"
   task :all do
-    gemfiles.each do |gemfile|
-      Rake::Task["test:#{gemfile}"].invoke
+    activerecord_versions.each do |activerecord_version|
+      Rake::Task["test:activerecord-#{activerecord_version}"].invoke
     end
   end
 end

data/active_record_association_query_economizer.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
 
-  spec.add_runtime_dependency 'activerecord', '>= 4.2', '<= 5.1.5'
+  spec.add_runtime_dependency 'activerecord', '>= 4.2', '<= 5.2.0'
 end

data/gemfiles/{activerecord-42.gemfile → test.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "= #{ENV['VERSION']}"
 
 gemspec :path => "../"

data/lib/active_record_association_query_economizer.rb

@@ -5,7 +5,7 @@ activerecord_version = ActiveRecord.version
 case activerecord_version
 when Gem::Requirement.create(['>= 4.2', '< 5'])
   require 'active_record_association_query_economizer/rails4-2/associations'
-when Gem::Requirement.create(['>= 5.0', '<= 5.1.5'])
+when Gem::Requirement.create(['>= 5.0', '<= 5.2.0'])
   require 'active_record_association_query_economizer/rails5/associations'
 else
   Kernel.warn "active_record_association_query_economizer doesn't yet do anything on ActiveRecord #{activerecord_version}"

data/lib/active_record_association_query_economizer/rails5/associations.rb

@@ -12,7 +12,7 @@ module ActiveRecord
     class Preloader
       class Association #:nodoc:
         def preload_filters
-          [options[:preload_if]].flatten.compact
+          [reflection.options[:preload_if]].flatten.compact
         end
 
         def owners_filtered

data/lib/active_record_association_query_economizer/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordAssociationQueryEconomizer
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_association_query_economizer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - toru.yagi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ dependencies:
         version: '4.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '4.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.0
 description: 
 email: 
 executables: []
@@ -101,9 +101,7 @@ files:
 - active_record_association_query_economizer.gemspec
 - bin/console
 - bin/setup
-- gemfiles/activerecord-42.gemfile
-- gemfiles/activerecord-50.gemfile
-- gemfiles/activerecord-51.gemfile
+- gemfiles/test.gemfile
 - lib/active_record_association_query_economizer.rb
 - lib/active_record_association_query_economizer/association_extension.rb
 - lib/active_record_association_query_economizer/rails4-2/associations.rb

data/gemfiles/activerecord-50.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-
-gemspec :path => "../"

data/gemfiles/activerecord-51.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.0"
-
-gemspec :path => "../"