batch-loader-active-record 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d1ba39cf3a3de836849d980d1f31815990d6e0
-  data.tar.gz: ce551c5339a932ba20dda200364e2789f644bafb
+  metadata.gz: e4226fd9bec34dbc68ba4427ae97fc1bfc5b4d5e
+  data.tar.gz: 2ec29536a53ab2be6dec550a6c748d8b8c309a95
 SHA512:
-  metadata.gz: 386454aeb0a0152f309eb5922a6cb629546d06e3228830257038fc2770d6102eb6a347eda3d19885a34d6c868825e1f83ae2e607d2d16b655301366f73c1d11d
-  data.tar.gz: 4a98d66b1cf4c93045856335572cd642daee0493106c02ab169946f1dde2cb016f63a012c5a56e85ddd682e7a2f0bbbe30ed6ef02028b7bd4a5f5ea6813afcd6
+  metadata.gz: e4c5c9aae13acb4b3a435273d0b61d703b6fe7ca183962e8fa3763d6a816d68bda0eb900f7b00caddabe5786e9dbbebb3490e6ef1287c8c8cd4c650c36381f25
+  data.tar.gz: ad5c86ad8f9b772865d256b6fa9f1185ad23424b08248bef27d8cfccdf07057267d29ca0da28d64bfa570c471348a2cf8544c57f4dccd12e53146df5f9013220

data/.travis.yml

@@ -6,3 +6,9 @@ rvm:
 sudo: false
 
 before_install: gem install bundler -v 1.16.0
+
+gemfile:
+  - gemfiles/activerecord_4_2.gemfile
+  - gemfiles/activerecord_5_0.gemfile
+  - gemfiles/activerecord_5_1.gemfile
+  - gemfiles/activerecord_5_2.gemfile

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "activerecord-4-2" do
+  gem "activerecord", "4.2.10"
+end
+
+appraise "activerecord-5-0" do
+  gem "activerecord", "5.0.6"
+end
+
+appraise "activerecord-5-1" do
+  gem "activerecord", "5.1.4"
+end
+
+appraise "activerecord-5-2" do
+  gem "activerecord", "5.2.0.beta1"
+end

data/CHANGELOG.md

@@ -4,6 +4,10 @@ Unreleased
 
 * none
 
+v0.4.2
+
+* fix to support activerecord v4.2.10 and test v4.2, v5.0, v5.1 and v5.2 using appraisal
+
 v0.4.1
 
 * fix cache issue when calling lazy association accessor with different scopes for `has_and_belongs_to` associations

data/Gemfile.lock

@@ -1,26 +1,21 @@
 PATH
   remote: .
   specs:
-    batch-loader-active-record (0.4.1)
-      activerecord (>= 4.2.0, < 5.2.0)
-      activesupport (>= 4.2.0, < 5.2.0)
+    batch-loader-active-record (0.4.2)
       batch-loader (~> 1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
-      arel (~> 8.0)
     activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     batch-loader (1.2.0)
     byebug (9.1.0)
     coderay (1.1.2)
@@ -33,7 +28,7 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.5.0)
+    pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
     rake (10.5.0)
@@ -51,6 +46,7 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
     sqlite3 (1.3.13)
+    thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
@@ -59,6 +55,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 4.2.0, < 5.2.0)
+  appraisal (~> 2.2.0)
   batch-loader-active-record!
   bundler (~> 1.16)
   pry-byebug (~> 3.5)

data/README.md

@@ -66,6 +66,8 @@ Or install it yourself as:
 
     $ gem install batch-loader-active-record
 
+Note that this gem supports [active record gem](https://rubygems.org/gems/activerecord) version 4.2.10 and above.
+
 
 ## Usage
 
@@ -224,6 +226,12 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+Use [appraisal](https://github.com/thoughtbot/appraisal) to select the version of activerecord to run with. i.e.: run tests with activerecord v5.1 with:
+
+```shell
+bundle exec appraisal activerecord-5-1 rspec
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/mathieul/batch-loader-active-record. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/batch-loader-active-record.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "batch-loader", "~> 1.2.0"
-  spec.add_dependency "activerecord", ">= 4.2.0", "< 5.2.0"
-  spec.add_dependency "activesupport", ">= 4.2.0", "< 5.2.0"
+  # spec.add_dependency "activerecord", ">= 4.2.0", "< 5.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry-byebug", "~> 3.5"
   spec.add_development_dependency "sqlite3", "~> 1.3.13"
+  spec.add_development_dependency "activesupport", ">= 4.2.0", "< 5.2.0"
+  spec.add_development_dependency "appraisal", "~> 2.2.0"
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/activerecord_4_2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.2.10"
+
+gemspec path: "../"

data/gemfiles/activerecord_4_2.gemfile.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: ..
+  specs:
+    batch-loader-active-record (0.4.1)
+      batch-loader (~> 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.4)
+    batch-loader (1.2.0)
+    builder (3.2.3)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.0)
+    minitest (5.10.3)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.5.1)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 4.2.10)
+  activesupport (>= 4.2.0, < 5.2.0)
+  appraisal (~> 2.2.0)
+  batch-loader-active-record!
+  bundler (~> 1.16)
+  pry-byebug (~> 3.5)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sqlite3 (~> 1.3.13)
+
+BUNDLED WITH
+   1.16.0

data/gemfiles/activerecord_5_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.6"
+
+gemspec path: "../"

data/gemfiles/activerecord_5_0.gemfile.lock

@@ -0,0 +1,76 @@
+PATH
+  remote: ..
+  specs:
+    batch-loader-active-record (0.4.1)
+      batch-loader (~> 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.6)
+      activesupport (= 5.0.6)
+    activerecord (5.0.6)
+      activemodel (= 5.0.6)
+      activesupport (= 5.0.6)
+      arel (~> 7.0)
+    activesupport (5.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    batch-loader (1.2.0)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.0)
+    minitest (5.10.3)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.5.1)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.0.6)
+  activesupport (>= 4.2.0, < 5.2.0)
+  appraisal (~> 2.2.0)
+  batch-loader-active-record!
+  bundler (~> 1.16)
+  pry-byebug (~> 3.5)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sqlite3 (~> 1.3.13)
+
+BUNDLED WITH
+   1.16.0

data/gemfiles/activerecord_5_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.1.4"
+
+gemspec path: "../"

data/gemfiles/activerecord_5_1.gemfile.lock

@@ -0,0 +1,76 @@
+PATH
+  remote: ..
+  specs:
+    batch-loader-active-record (0.4.1)
+      batch-loader (~> 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (8.0.0)
+    batch-loader (1.2.0)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.0)
+    minitest (5.10.3)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.5.1)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.1.4)
+  activesupport (>= 4.2.0, < 5.2.0)
+  appraisal (~> 2.2.0)
+  batch-loader-active-record!
+  bundler (~> 1.16)
+  pry-byebug (~> 3.5)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sqlite3 (~> 1.3.13)
+
+BUNDLED WITH
+   1.16.0

data/gemfiles/activerecord_5_2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.2.0.beta1"
+
+gemspec path: "../"

data/gemfiles/activerecord_5_2.gemfile.lock

@@ -0,0 +1,76 @@
+PATH
+  remote: ..
+  specs:
+    batch-loader-active-record (0.4.1)
+      batch-loader (~> 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.0.beta1)
+      activesupport (= 5.2.0.beta1)
+    activerecord (5.2.0.beta1)
+      activemodel (= 5.2.0.beta1)
+      activesupport (= 5.2.0.beta1)
+      arel (>= 9.0)
+    activesupport (5.2.0.beta1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    batch-loader (1.2.0)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.0)
+    minitest (5.10.3)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.5.1)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.2.0.beta1)
+  activesupport (>= 4.2.0, < 5.2.0)
+  appraisal (~> 2.2.0)
+  batch-loader-active-record!
+  bundler (~> 1.16)
+  pry-byebug (~> 3.5)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sqlite3 (~> 1.3.13)
+
+BUNDLED WITH
+   1.16.0

data/lib/batch_loader_active_record/association_manager.rb

@@ -32,7 +32,7 @@ module BatchLoaderActiveRecord
       custom_key += [instance_scope.to_sql.hash] unless instance_scope.nil?
       BatchLoader.for(instance.id).batch(default_value: [], key: custom_key) do |model_ids, loader|
         relation = relation_with_scope(instance_scope)
-        if reflection.through_reflection?
+        if reflection.through_reflection
           instances = fetch_for_model_ids(model_ids, relation: relation)
           instances.each do |instance|
             loader.call(instance.public_send(:_instance_id)) { |value| value << instance }
@@ -119,7 +119,7 @@ module BatchLoaderActiveRecord
     end
 
     def reflection_join(orig_reflection, model_class)
-      reflection = orig_reflection.through_reflection? ? orig_reflection.through_reflection : orig_reflection
+      reflection = orig_reflection.through_reflection || orig_reflection
       id_path = id_path_for(reflection, model_class)
       table_name = reflection.active_record.table_name
       id_column = reflection.belongs_to? ? reflection.foreign_key : reflection.active_record.primary_key

data/lib/batch_loader_active_record/version.rb

@@ -1,3 +1,3 @@
 module BatchLoaderActiveRecord
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch-loader-active-record
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - mathieul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: batch-loader
@@ -24,46 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +94,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.13
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 description: Active record lazy association generator leveraging batch-loader to avoid
   N+1 DB queries.
 email:
@@ -145,6 +139,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -155,6 +150,15 @@ files:
 - batch-loader-active-record.gemspec
 - bin/console
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/activerecord_4_2.gemfile
+- gemfiles/activerecord_4_2.gemfile.lock
+- gemfiles/activerecord_5_0.gemfile
+- gemfiles/activerecord_5_0.gemfile.lock
+- gemfiles/activerecord_5_1.gemfile
+- gemfiles/activerecord_5_1.gemfile.lock
+- gemfiles/activerecord_5_2.gemfile
+- gemfiles/activerecord_5_2.gemfile.lock
 - lib/batch-loader-active-record.rb
 - lib/batch_loader_active_record.rb
 - lib/batch_loader_active_record/association_manager.rb