jit_preloader 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed5a725f8d7f312a774f6a1a3c58e0f1345027d4
-  data.tar.gz: 9d0ef45b43032043aee85d162343bd51783a94e3
+SHA256:
+  metadata.gz: 9a3ebb3488bb221f516f32ebd2fbbedcee866b57d3ccc3c171f3843b9cc0af45
+  data.tar.gz: 7bcaa0e57a6ee5541ca0fac7013f4188113f3425675df4ad29cab7cba3c8a540
 SHA512:
-  metadata.gz: 5db4eb1d7b2fc74a2c7a0e8e0e7238b88e6270495f0b8cca71ed31de85da9ced40092186ab1dc188b25dc759d40a0d014288cc1f161534baf48943a684cf906a
-  data.tar.gz: 5ccd2555def314a25a8a022f2aac717e5114ac65a5b32a6fc31c9ffdf176d7db54ff8834ca01962bc037b09bda0a6182204478e387b457c081b03542a9321aa6
+  metadata.gz: 7d696d0f3465be1aa319ae86c335e087b967847fefcd49a926e27c1cc24681be824ecc2a95a6365a129ae668f2abb341d570841f242cbb4b47295f974a3bf71e
+  data.tar.gz: 5ac6f866cc9ee0fbab43e36d8bd2134e42782e6a6e9e4e635bd9b15e5951a02ed2d1d86b003afdbf5aeac736ffd3a23aadc7e9f75db1679cfd0768e132e2d5b4

data/jit_preloader.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "> 4.2", "< 7"
+  spec.add_dependency "activerecord", "> 5.0", "< 7"
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler"

data/lib/jit_preloader/active_record/associations/preloader/ar5_association.rb

@@ -18,20 +18,11 @@ module JitPreloader
     # end
 
     def run(preloader)
-      all_records = []
-      records = load_records do |record|
-        owner = owners_by_key[convert_key(record[association_key_name])]
-        association = owner.association(reflection.name)
-        association.set_inverse_instance(record)
+      super.tap do
+        if preloaded_records.any? && preloaded_records.none?(&:jit_preloader)
+          JitPreloader::Preloader.attach(preloaded_records) if owners.any?(&:jit_preloader) || JitPreloader.globally_enabled?
+        end
       end
-
-      owners.each do |owner|
-        owned_records = records[convert_key(owner[owner_key_name])] || []
-        all_records.concat(Array(owned_records)) if owner.jit_preloader || JitPreloader.globally_enabled?
-        associate_records_to_owner(owner, owned_records)
-      end
-
-      JitPreloader::Preloader.attach(all_records) if all_records.any?
     end
 
     # Original method:
@@ -54,6 +45,7 @@ module JitPreloader
         # the original copy so that we don't blow away in-memory changes.
         new_records = association.target.any? ? records - association.target : records
         association.target.concat(new_records)
+        association.loaded!
       else
         association.target ||= records.first unless records.empty?
       end
@@ -69,3 +61,4 @@ module JitPreloader
 end
 
 ActiveRecord::Associations::Preloader::Association.prepend(JitPreloader::PreloaderAssociation)
+ActiveRecord::Associations::Preloader::ThroughAssociation.prepend(JitPreloader::PreloaderAssociation)

data/lib/jit_preloader/active_record/associations/preloader/ar6_association.rb

@@ -6,58 +6,43 @@ module JitPreloader
     # part of the target, then attach all of the records to a new jit preloader.
     #
     # def run
-    #   if !preload_scope || preload_scope.empty_scope?
-    #     owners.each do |owner|
-    #       associate_records_to_owner(owner, records_by_owner[owner] || [])
-    #     end
-    #   else
-    #     # Custom preload scope is used and
-    #     # the association can not be marked as loaded
-    #     # Loading into a Hash instead
-    #     records_by_owner
-    #   end
+    #   records = records_by_owner
+
+    #   owners.each do |owner|
+    #     associate_records_to_owner(owner, records[owner] || [])
+    #   end if @associate
+
     #   self
     # end
-    def run
-      all_records = []
 
-      owners.each do |owner|
-        owned_records = records_by_owner[owner] || []
-        all_records.concat(Array(owned_records)) if owner.jit_preloader || JitPreloader.globally_enabled?
-        associate_records_to_owner(owner, owned_records)
+    def run
+      super.tap do
+        if preloaded_records.any? && preloaded_records.none?(&:jit_preloader)
+          JitPreloader::Preloader.attach(preloaded_records) if owners.any?(&:jit_preloader) || JitPreloader.globally_enabled?
+        end
       end
-
-      JitPreloader::Preloader.attach(all_records) if all_records.any?
-
-      self
     end
 
     # Original method:
     # def associate_records_to_owner(owner, records)
     #   association = owner.association(reflection.name)
-    #   association.loaded!
     #   if reflection.collection?
-    #     association.target.concat(records)
+    #     association.target = records
     #   else
-    #     association.target = records.first unless records.empty?
+    #     association.target = records.first
     #   end
     # end
     def associate_records_to_owner(owner, records)
       association = owner.association(reflection.name)
-      association.loaded!
-
       if reflection.collection?
-        # It is possible that some of the records are loaded already.
-        # We don't want to duplicate them, but we also want to preserve
-        # the original copy so that we don't blow away in-memory changes.
         new_records = association.target.any? ? records - association.target : records
         association.target.concat(new_records)
+        association.loaded!
       else
-        association.target ||= records.first unless records.empty?
+        association.target = records.first
       end
     end
 
-
     def build_scope
       super.tap do |scope|
         scope.jit_preload! if owners.any?(&:jit_preloader) || JitPreloader.globally_enabled?
@@ -67,3 +52,4 @@ module JitPreloader
 end
 
 ActiveRecord::Associations::Preloader::Association.prepend(JitPreloader::PreloaderAssociation)
+ActiveRecord::Associations::Preloader::ThroughAssociation.prepend(JitPreloader::PreloaderAssociation)

data/lib/jit_preloader/active_record/base.rb

@@ -18,37 +18,59 @@ module JitPreloadExtension
     end
   end
 
-  def preload_scoped_relation(name:, base_association:, preload_scope: nil)
-    return jit_preload_scoped_relations[name] if jit_preload_scoped_relations&.key?(name)
+  if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.0.0")
+    def preload_scoped_relation(name:, base_association:, preload_scope: nil)
+      return jit_preload_scoped_relations[name] if jit_preload_scoped_relations&.key?(name)
+
+      records = jit_preloader&.records || [self]
+
+      preloader_association = ActiveRecord::Associations::Preloader.new.preload(
+        records,
+        base_association,
+        preload_scope
+      ).first
+
+      records.each do |record|
+        record.jit_preload_scoped_relations ||= {}
+        association = record.association(base_association)
+        record.jit_preload_scoped_relations[name] = preloader_association.records_by_owner[record]
+      end
+
+      jit_preload_scoped_relations[name]
+    end
+  else
+    def preload_scoped_relation(name:, base_association:, preload_scope: nil)
+      return jit_preload_scoped_relations[name] if jit_preload_scoped_relations&.key?(name)
+
+      records = jit_preloader&.records || [self]
+      previous_association_values = {}
+
+      records.each do |record|
+        association = record.association(base_association)
+        if association.loaded?
+          previous_association_values[record] = association.target
+          association.reset
+        end
+      end
 
-    records = jit_preloader&.records || [self]
-    previous_association_values = {}
+      ActiveRecord::Associations::Preloader.new.preload(
+        records,
+        base_association,
+        preload_scope
+      )
 
-    records.each do |record|
-      association = record.association(base_association)
-      if association.loaded?
-        previous_association_values[record] = association.target
+      records.each do |record|
+        record.jit_preload_scoped_relations ||= {}
+        association = record.association(base_association)
+        record.jit_preload_scoped_relations[name] = association.target
         association.reset
+        if previous_association_values.key?(record)
+          association.target = previous_association_values[record]
+        end
       end
-    end
 
-    ActiveRecord::Associations::Preloader.new.preload(
-      records,
-      base_association,
-      preload_scope
-    )
-
-    records.each do |record|
-      record.jit_preload_scoped_relations ||= {}
-      association = record.association(base_association)
-      record.jit_preload_scoped_relations[name] = association.target
-      association.reset
-      if previous_association_values.key?(record)
-        association.target = previous_association_values[record]
-      end
+      jit_preload_scoped_relations[name]
     end
-
-    jit_preload_scoped_relations[name]
   end
 
   def self.prepended(base)

data/lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jit_preloader
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -193,8 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Tool to understand N+1 queries and to remove them