jit_preloader 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612515b854cf998692cc121a1b5a04b802f6d287
-  data.tar.gz: fdd24d5df16d9e4239013bba560f1f6ebeee6059
+  metadata.gz: eca89dc638bbbebd84f69ba52f731374496e4e34
+  data.tar.gz: 2126a1bb08e1a80439eb14f2d298d5f571dfce89
 SHA512:
-  metadata.gz: f3514afa58d8942b0e506e6e1daeba465f6214f45fb89016bc98a22b8f5e27e15a7bf18fc0adb589072c07c608d3d9fd14a20dba790446c9534e76769a6f70e4
-  data.tar.gz: 11b3e498bd08b46c9cadce50ad68f0a3ffcccc9df6aa9edc1625ec1bdb2f10fc709f23631d39c0523bd73acdc5507032cf689a5df1cf31069900f48da5a033ea
+  metadata.gz: 27df8fe13432a9026259fba55e00c7de531a619431e6cf803273c652dc9bd31d35062202a3081b6653d980b2c3a8fd160d0e6a60ad64b82930f04b027b718906
+  data.tar.gz: 8f1a8c01680f7a8c25532b7ecb4d80965dbea03c35149e9e25d2b7b08ab328fce139124ddbb151eedc677ff0fd57815a175de7841bafdc779fb7ad3d9e6a4e19

data/Gemfile.lock

@@ -1,34 +1,31 @@
 PATH
   remote: .
   specs:
-    jit_preloader (0.0.6)
-      activerecord (~> 4.2)
+    jit_preloader (0.0.8)
+      activerecord (> 4.2, < 6)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
+    arel (8.0.0)
     byebug (9.0.6)
+    concurrent-ruby (1.0.5)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.10.1)
+    i18n (0.8.1)
+    minitest (5.10.2)
     rake (10.5.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -44,8 +41,8 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     sqlite3 (1.3.12)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS

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"
+  spec.add_dependency "activerecord", "> 4.2", "< 6"
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/jit_preloader.rb

@@ -5,7 +5,6 @@ require 'active_record'
 
 require "jit_preloader/version"
 require 'jit_preloader/active_record/base'
-require 'jit_preloader/active_record/query_methods'
 require 'jit_preloader/active_record/relation'
 require 'jit_preloader/active_record/associations/collection_association'
 require 'jit_preloader/active_record/associations/singular_association'

data/lib/jit_preloader/active_record/associations/collection_association.rb

@@ -1,30 +1,32 @@
-class ActiveRecord::Associations::CollectionAssociation
+module JitPreloader
+  module ActiveRecordAssociationsCollectionAssociation
 
-  def load_target_with_jit
-    was_loaded = loaded?
+    def load_target
+      was_loaded = loaded?
 
-    if !loaded? && owner.persisted? && owner.jit_preloader
-      owner.jit_preloader.jit_preload(reflection.name)
-    end
+      if !loaded? && owner.persisted? && owner.jit_preloader
+        owner.jit_preloader.jit_preload(reflection.name)
+      end
 
-    jit_loaded = loaded?
+      jit_loaded = loaded?
 
-    load_target_without_jit.tap do |records|
-      # We should not act on non-persisted objects, or ones that are already loaded.
-      if owner.persisted? && !was_loaded
-        # If we went through a JIT preload, then we will have attached another JitPreloader elsewhere.
-        JitPreloader::Preloader.attach(records) if records.any? && !jit_loaded && JitPreloader.globally_enabled?
+      super.tap do |records|
+        # We should not act on non-persisted objects, or ones that are already loaded.
+        if owner.persisted? && !was_loaded
+          # If we went through a JIT preload, then we will have attached another JitPreloader elsewhere.
+          JitPreloader::Preloader.attach(records) if records.any? && !jit_loaded && JitPreloader.globally_enabled?
 
-        # If the records were not pre_loaded
-        records.each{ |record| record.jit_n_plus_one_tracking = true }
+          # If the records were not pre_loaded
+          records.each{ |record| record.jit_n_plus_one_tracking = true }
 
-        if !jit_loaded && owner.jit_n_plus_one_tracking
-          ActiveSupport::Notifications.publish("n_plus_one_query",
-                                               source: owner, association: reflection.name)
+          if !jit_loaded && owner.jit_n_plus_one_tracking
+            ActiveSupport::Notifications.publish("n_plus_one_query",
+                                                 source: owner, association: reflection.name)
+          end
         end
       end
     end
   end
-  alias_method_chain :load_target, :jit
-
 end
+
+ActiveRecord::Associations::CollectionAssociation.prepend(JitPreloader::ActiveRecordAssociationsCollectionAssociation)

data/lib/jit_preloader/active_record/associations/singular_association.rb

@@ -1,29 +1,31 @@
-class ActiveRecord::Associations::SingularAssociation
+module JitPreloader
+  module ActiveRecordAssociationsSingularAssociation
 
-  def load_target_with_jit
-    was_loaded = loaded?
+    def load_target
+      was_loaded = loaded?
 
-    if !loaded? && owner.persisted? && owner.jit_preloader
-      owner.jit_preloader.jit_preload(reflection.name)
-    end
+      if !loaded? && owner.persisted? && owner.jit_preloader
+        owner.jit_preloader.jit_preload(reflection.name)
+      end
 
-    jit_loaded = loaded?
+      jit_loaded = loaded?
 
-    load_target_without_jit.tap do |record|
-      if owner.persisted? && !was_loaded
-        # If the owner doesn't track N+1 queries, then we don't need to worry about
-        # tracking it on the record. This is because you can do something like:
-        # model.foo.bar (where foo and bar are singular associations) and that isn't
-        # always an N+1 query.
-        record.jit_n_plus_one_tracking ||= owner.jit_n_plus_one_tracking if record
+      super.tap do |record|
+        if owner.persisted? && !was_loaded
+          # If the owner doesn't track N+1 queries, then we don't need to worry about
+          # tracking it on the record. This is because you can do something like:
+          # model.foo.bar (where foo and bar are singular associations) and that isn't
+          # always an N+1 query.
+          record.jit_n_plus_one_tracking ||= owner.jit_n_plus_one_tracking if record
 
-        if !jit_loaded && owner.jit_n_plus_one_tracking
-          ActiveSupport::Notifications.publish("n_plus_one_query",
-                                               source: owner, association: reflection.name)
+          if !jit_loaded && owner.jit_n_plus_one_tracking
+            ActiveSupport::Notifications.publish("n_plus_one_query",
+                                                 source: owner, association: reflection.name)
+          end
         end
       end
     end
   end
-  alias_method_chain :load_target, :jit
-
 end
+
+ActiveRecord::Associations::SingularAssociation.prepend(JitPreloader::ActiveRecordAssociationsSingularAssociation)

data/lib/jit_preloader/active_record/base.rb

@@ -8,9 +8,18 @@ module JitPreloadExtension
     attr_accessor :jit_preload_aggregates
 
     def reload(*args)
-      self.jit_preload_aggregates = {}
+      clear_jit_preloader!
       super
     end
+
+    def clear_jit_preloader!
+      self.jit_preload_aggregates = {}
+      if jit_preloader
+        jit_preloader.records.delete(self)
+        self.jit_preloader = nil
+      end
+    end
+
   end
 
   class_methods do

data/lib/jit_preloader/active_record/relation.rb

@@ -1,26 +1,41 @@
-class ActiveRecord::Relation
+module JitPreloader
+  module ActiveRecordRelation
 
-  def calculate_with_jit(*args)
-    if respond_to?(:proxy_association) && proxy_association.owner && proxy_association.owner.jit_n_plus_one_tracking
-      ActiveSupport::Notifications.publish("n_plus_one_query",
-                                           source: proxy_association.owner,
-                                           association: "#{proxy_association.reflection.name}.#{args.first}")
+    def jit_preload(*args)
+      spawn.jit_preload!(*args)
+    end
+
+    def jit_preload!(*args)
+      @jit_preload = true
+      self
     end
-    calculate_without_jit(*args)
-  end
 
-  alias_method_chain :calculate, :jit
+    def jit_preload?
+      @jit_preload
+    end
+
+    def calculate(*args)
+      if respond_to?(:proxy_association) && proxy_association.owner && proxy_association.owner.jit_n_plus_one_tracking
+        ActiveSupport::Notifications.publish("n_plus_one_query",
+                                             source: proxy_association.owner,
+                                             association: "#{proxy_association.reflection.name}.#{args.first}")
+      end
 
-  def exec_queries_with_jit
-    exec_queries_without_jit.tap do |records|
-      if limit_value != 1
-        records.each{ |record| record.jit_n_plus_one_tracking = true }
-        if jit_preload? || JitPreloader.globally_enabled?
-          JitPreloader::Preloader.attach(records)
+      super(*args)
+    end
+
+    def exec_queries
+      super.tap do |records|
+        if limit_value != 1
+          records.each{ |record| record.jit_n_plus_one_tracking = true }
+          if jit_preload? || JitPreloader.globally_enabled?
+            JitPreloader::Preloader.attach(records)
+          end
         end
       end
     end
-  end
-  alias_method_chain :exec_queries, :jit
 
+  end
 end
+
+ActiveRecord::Relation.prepend(JitPreloader::ActiveRecordRelation)

data/lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/spec/lib/jit_preloader/preloader_spec.rb

@@ -146,7 +146,7 @@ RSpec.describe JitPreloader::Preloader do
         ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
           Contact.find(contact1.id).tap{|c| c.addresses.collect(&:country); c.email_address }
         end
-        address_queries = Address.where(contact_id: 1).product([[:country]])
+        address_queries = Address.where(contact_id: 1).to_a.product([[:country]])
         expect(source_map).to eql(Hash[address_queries])
       end
     end
@@ -157,7 +157,7 @@ RSpec.describe JitPreloader::Preloader do
           Contact.find(contact1.id, contact2.id).each{|c| c.addresses.collect(&:country); c.email_address }
         end
         contact_queries = [contact1,contact2].product([[:addresses, :email_address]])
-        address_queries = Address.where(contact_id: contact1.id).product([[:country]])
+        address_queries = Address.where(contact_id: contact1.id).to_a.product([[:country]])
 
         expect(source_map).to eql(Hash[address_queries.concat(contact_queries)])
       end
@@ -169,7 +169,7 @@ RSpec.describe JitPreloader::Preloader do
           Contact.first.tap{|c| c.addresses.collect(&:country); c.email_address }
         end
 
-        address_queries = Address.where(contact_id: contact1.id).product([[:country]])
+        address_queries = Address.where(contact_id: contact1.id).to_a.product([[:country]])
 
         expect(source_map).to eql(Hash[address_queries])
       end
@@ -181,7 +181,7 @@ RSpec.describe JitPreloader::Preloader do
           Contact.all.each{|c| c.addresses.collect(&:country); c.email_address }
         end
         contact_queries = [contact1,contact2,contact3].product([[:addresses, :email_address]])
-        address_queries = Address.all.product([[:country]])
+        address_queries = Address.all.to_a.product([[:country]])
         expect(source_map).to eql(Hash[address_queries.concat(contact_queries)])
       end
 
@@ -191,7 +191,7 @@ RSpec.describe JitPreloader::Preloader do
             Contact.preload(:addresses).each{|c| c.addresses.collect(&:country); c.email_address }
           end
           contact_queries = [contact1,contact2,contact3].product([[:email_address]])
-          address_queries = Address.all.product([[:country]])
+          address_queries = Address.all.to_a.product([[:country]])
           expect(source_map).to eql(Hash[address_queries.concat(contact_queries)])
         end
       end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: jit_preloader
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +151,6 @@ files:
 - lib/jit_preloader/active_record/associations/preloader/singular_association.rb
 - lib/jit_preloader/active_record/associations/singular_association.rb
 - lib/jit_preloader/active_record/base.rb
-- lib/jit_preloader/active_record/query_methods.rb
 - lib/jit_preloader/active_record/relation.rb
 - lib/jit_preloader/preloader.rb
 - lib/jit_preloader/version.rb

data/lib/jit_preloader/active_record/query_methods.rb

@@ -1,16 +0,0 @@
-module ActiveRecord::QueryMethods
-
-  def jit_preload(*args)
-    spawn.jit_preload!(*args)
-  end
-
-  def jit_preload!(*args)
-    @jit_preload = true
-    self
-  end
-
-  def jit_preload?
-    @jit_preload
-  end
-
-end