active_record_custom_preloader 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087d4fa01c068564e4d5610c7eca87a3966fbdd9b56cc4b82a42f4a041eab1b1'
-  data.tar.gz: a5adb93c3bc7cf099470f5c77bce2c41d0de20c56972f3782b299593280d9ebe
+  metadata.gz: 7c5402d3636a7fc7337118a453032e0f0a38cf241e31f603842e109ae1e10b80
+  data.tar.gz: 8cc9d34c0075cb1194c3d36173886bb2be6297368216ddf49e4f9f1122505cfb
 SHA512:
-  metadata.gz: 6bada7cc31ccd296f3e7c8029fed931aef8907cfd9bbedcbb3788b6c7f4d959bc1a5352e241091fe5132f11d42ba2576d375d6f207ce55e8f3e04d7612fbb088
-  data.tar.gz: e3ce2a2539bb02352190cdb4264c854b6dfe42ca472da616515736678e7c183ec35e6971d2400b1ecf3a2acaa590351c83f40ee3d5af4d9bde1ba67a93d2bafc
+  metadata.gz: 9f463d113f55c2611f38eae30b9174ece10f06f9d0ead2b21f345234e2a93af628ebf153fc44e7c73667d9dc9eea295f7d016bf4522a179509a83ea730315b4a
+  data.tar.gz: e6ca5f43a6327cd9181a0d3503406634a394f88a7d890afddb99ef3baec266eef0b53b5222269161d149991c1cfa0aa37550b3d663bf3d61224ccd73d31b3545

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.1
+  - 2.5.7
 env:
-  - RAILS_VERSION=5.2.3
+  - RAILS_VERSION=6.0.1
 before_install: gem install bundler -v 2.0.1

data/README.md

@@ -1,6 +1,9 @@
 # ActiveRecordCustomPreloader
 
-custom preloader for ActiveRecord model
+Custom preloader for ActiveRecord model.
+
+Gem version `2.X.X` and `master` branch compatible with Rails `6.X.X` and upper.
+For Rails `5.X.X` see branch `rails-5` and gem version `1.X.X`.
 
 ## Installation
 

data/active_record_custom_preloader.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'activerecord', '~> 5.0'
+  spec.add_dependency 'activerecord', '>= 6.0.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/active_record_custom_preloader/associations_preloader.rb

@@ -5,23 +5,23 @@ module ActiveRecordCustomPreloader
   class AssociationsPreloader < ::ActiveRecord::Associations::Preloader
     private
 
-    def preloaders_on(association, records, scope)
+    def preloaders_on(association, records, scope, polymorphic_parent = false)
       if association.is_a?(PreloadWithOptions)
-        preloaders_for_one(association, records, scope)
+        preloaders_for_one(association, records, scope, polymorphic_parent)
         return
       end
 
       klass = records.first.class
       if klass.respond_to?(:has_custom_loader?) && klass.has_custom_loader?(association)
         association = PreloadWithOptions.new(association)
-        preloaders_for_one(association, records, scope)
+        preloaders_for_one(association, records, scope, polymorphic_parent)
         return
       end
 
       super
     end
 
-    def preloaders_for_one(association, records, scope)
+    def preloaders_for_one(association, records, scope, polymorphic_parent)
       if records.size > 0 && association.is_a?(PreloadWithOptions)
         association.loader_for(records.first.class).preload(records)
         return

data/lib/active_record_custom_preloader/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordCustomPreloader
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_custom_preloader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Denis Talakevich
@@ -28,16 +28,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -141,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Custom preloader for ActiveRecord.