ar_lazy_preload 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44023d59df2053b73589d7b0baadad0933047105fb38986462347ce9c03414b6
-  data.tar.gz: fc4f589d5fec1c1731f82f5b43a3fe379f795445456721db5c6140190d3669a8
+  metadata.gz: ebe08f38d60625bee24c8ec26f8eb8d3381118f4c81f68e79abd047237d7a27e
+  data.tar.gz: 9d1665b388bba47dda01e592cd4dbcfaeb6b8aa3cafbd047b92628f651431e72
 SHA512:
-  metadata.gz: 1b434e21ffab60c6008dfb85c9825d0534d635ae464052bcce0544cd6d2fee81b02ec9a9e4a26d542a46f18209efcb03c971f68ca0964b807d3a6e64ec2ca1f7
-  data.tar.gz: e12171b02fd58053e8e189e95a2178cdddb163ac225b134b298f9a2f872117e8edcd7c0119d84e60e7d99f355e3f58bb7f9976d76a9e515edc435aaf1c95da98
+  metadata.gz: '089fe899897758c02c19e31b85edbe71ad6e1df28e727017a32ae5518ea01c6a86a9438e8ff4d99ffbd6f4c5c6cb92e8480b823bd4e9c023da15328aae66cc3c'
+  data.tar.gz: 381a082c5f96b9927d81effb0ed577b63f709e110344e241c7c278509785b0954bc553dfdb0cfd3531e71da61d9f9f111c7e61b469ae2eacd61c60ca6c5b106e

data/Rakefile

@@ -1,3 +1,4 @@
+require "appraisal"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
@@ -5,4 +6,10 @@ require "rubocop/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: [:rubocop, :spec]
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default do
+    sh "rubocop && appraisal install && rake appraisal spec"
+  end
+else
+  task default: [:rubocop, :spec]
+end

data/lib/ar_lazy_preload/active_record/collection_proxy.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module ArLazyPreload
+  # ActiveRecord::CollectionProxy patch for getting records for preload
+  module CollectionProxy
+    private
+
+    def ar_lazy_preload_records
+      target
+    end
+  end
+end

data/lib/ar_lazy_preload/active_record/relation.rb

@@ -10,7 +10,12 @@ module ArLazyPreload
     def load
       need_context = !loaded?
       result = super
-      Context.register(records: @records, association_tree: lazy_preload_values) if need_context
+      if need_context
+        Context.register(
+          records: ar_lazy_preload_records,
+          association_tree: lazy_preload_values
+        )
+      end
       result
     end
 
@@ -47,6 +52,10 @@ module ArLazyPreload
 
     private
 
+    def ar_lazy_preload_records
+      @records
+    end
+
     attr_writer :lazy_preload_values
   end
 end

data/lib/ar_lazy_preload/railtie.rb

@@ -5,6 +5,7 @@ require "ar_lazy_preload/active_record/relation"
 require "ar_lazy_preload/active_record/association"
 require "ar_lazy_preload/active_record/merger"
 require "ar_lazy_preload/active_record/association_relation"
+require "ar_lazy_preload/active_record/collection_proxy"
 
 module ArLazyPreload
   class Railtie < Rails::Railtie
@@ -20,6 +21,8 @@ module ArLazyPreload
           ActiveRecord::Associations::CollectionAssociation,
           ActiveRecord::Associations::Association
         ].each { |klass| klass.prepend(Association) }
+
+        ActiveRecord::Associations::CollectionProxy.prepend(CollectionProxy)
       end
     end
   end

data/lib/ar_lazy_preload/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArLazyPreload
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_lazy_preload
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 description: lazy_preload implementation for ActiveRecord models
 email:
 - dmitry.a.tsepelev@gmail.com
@@ -122,6 +136,7 @@ files:
 - lib/ar_lazy_preload/active_record/association.rb
 - lib/ar_lazy_preload/active_record/association_relation.rb
 - lib/ar_lazy_preload/active_record/base.rb
+- lib/ar_lazy_preload/active_record/collection_proxy.rb
 - lib/ar_lazy_preload/active_record/merger.rb
 - lib/ar_lazy_preload/active_record/relation.rb
 - lib/ar_lazy_preload/associated_context_builder.rb