predictive_load 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f59d44d0c89dbf1ef633348451e1df43d6b059ddb50094549e2bc6a5f4843531
-  data.tar.gz: 75cd6c8518d8f200c13a8c52ed887b7e1a0d1e72aa02205305f7bc65d1b4b9ca
+  metadata.gz: 738aa194d5fa872a614133eafb9bf2eefe2bc4c6958eaf02784cdee1e3b56ade
+  data.tar.gz: ff4d1953f00722fee627b1b73c41d1af2ee3b5168993886dfa9bd65529d616d5
 SHA512:
-  metadata.gz: cfb8c2e28057981f773794139483805712c17faad421506c39d5309961b2be0c7d2b541c6afd4e0877f2e40703e3c036832651b6f569e57799d12ae0bd8ca20e
-  data.tar.gz: 49482a1ffcd183092f0f71242ab78fecca8b583a69aa8f90816173edcee4226f389061a36bccb27d455679132cb8dc6a756f6d3dc025293198213e5e7962cba4
+  metadata.gz: 7d5c7f2b7bd5ce257238cc0a767f44dbb0889b5fbd5311dd7f56ce0cc237c6d424e9a78f0758fac73ca2e8ec55226f01db3f843455a7d2324b7d02f1aead937f
+  data.tar.gz: 3fd1edf5e995179c55e9bfba6a1801daad33f036f2f95ac2f56b928c143f65957d9be7221434592f5896ce7087f50f0eb1103b3f2022ffe710a16133a49a7ebd

data/README.md

@@ -41,8 +41,29 @@ Some things cannot be preloaded, use `predictive_load: false`
 has_many :foos, predictive_load: false
 ```
 
+### Instrumentation
+
+The library can be instrumented by providing a callback, to be invoked every time automatic preloading happens. The callback must be a callable that receives two arguments:
+* The record (instance) on which the queries that triggered automatic preloading are being performed, in the form of some association call.
+* The association object, which can be inspected to check the type and name of the association.
+
+For example, the callback could be used to emit some metrics:
+
+```ruby
+require "active_support/core_ext/string"
+
+PredictiveLoad.callback = -> (record, association) do
+  METRICS_CLIENT.increment_counter(
+    "active_record.automatic_preloads",
+    tags: [
+      "model:#{record.class.name.underscore}",
+      "association:#{association.reflection.name}"
+    ]
+  )
+end
+```
+
 #### Known limitations:
 
 * Calling association#size will trigger an N+1 on SELECT COUNT(*). Work around by calling #length, loading all records.
 * Calling first / last will trigger an N+1.
-* Rails 4: unscoped will disable eager loading to circument a rails bug ... hopefully fixed in rails 5 https://github.com/rails/rails/pull/16531

data/lib/predictive_load/active_record_collection_observation.rb

@@ -1,5 +1,4 @@
 module PredictiveLoad::ActiveRecordCollectionObservation
-
   def self.included(base)
     ActiveRecord::Relation.class_attribute :collection_observer
     if ActiveRecord::VERSION::MAJOR >= 5
@@ -38,9 +37,7 @@ module PredictiveLoad::ActiveRecordCollectionObservation
   end
 
   module CollectionMember
-
     attr_accessor :collection_observer
-
   end
 
   # disable eager loading since includes + unscoped is broken on rails 4
@@ -73,9 +70,7 @@ module PredictiveLoad::ActiveRecordCollectionObservation
     protected
 
     def notify_collection_observer
-      if @owner.collection_observer
-        @owner.collection_observer.loading_association(@owner, self)
-      end
+      @owner.collection_observer&.loading_association(@owner, self)
     end
   end
 
@@ -86,5 +81,4 @@ module PredictiveLoad::ActiveRecordCollectionObservation
       super
     end
   end
-
 end

data/lib/predictive_load/loader.rb

@@ -23,6 +23,7 @@ module PredictiveLoad
       association_name = association.reflection.name
 
       if all_records_will_likely_load_association?(association_name) && supports_preload?(association)
+        PredictiveLoad.callback&.call(record, association)
         preload(association_name)
       end
     end
@@ -32,7 +33,7 @@ module PredictiveLoad
     attr_reader :records
 
     def all_records_will_likely_load_association?(association_name)
-      if defined?(Mocha) && association_name.to_s.index('_stub_')
+      if defined?(Mocha) && association_name.to_s.index("_stub_")
         false
       else
         true
@@ -43,11 +44,11 @@ module PredictiveLoad
       return false if ActiveRecord::Base.predictive_load_disabled.include?(association.klass)
       return false if association.reflection.options[:predictive_load] == false
       return false if association.reflection.options[:conditions].respond_to?(:to_proc) # rails 3 conditions proc (we do not know if it uses instance methods)
-      if scope = association.reflection.scope
+      if (scope = association.reflection.scope)
         if scope.is_a?(Proc)
           # rails 4+ conditions block, if it uses a passed in object, we assume it is not preloadable
           return false if scope.arity.to_i > 0
-        elsif where = scope.options[:where]
+        elsif (where = scope.options[:where])
           # ActiveRecord::Associations::Builder::DeprecatedOptionsProc from rails 4.0 and deprecated finders
           # when conditions was a proc the where will be a proc too -> check arity
           return false if where.is_a?(Proc) && where.arity > 0
@@ -74,7 +75,7 @@ module PredictiveLoad
     else
       def preload(association_name)
         rs = records_with_association(association_name).reject { |r| r.association(association_name).loaded? }
-        ActiveRecord::Associations::Preloader.new.preload(rs, [ association_name ])
+        ActiveRecord::Associations::Preloader.new.preload(rs, [association_name])
       end
     end
 

data/lib/predictive_load/preload_log.rb

@@ -1,8 +1,7 @@
-require 'active_record/associations/preloader'
+require "active_record/associations/preloader"
 
 module PredictiveLoad
   class PreloadLog < ActiveRecord::Associations::Preloader
-
     attr_accessor :logger
 
     def preload(association)
@@ -17,7 +16,7 @@ module PredictiveLoad
 
           preload_sql = preloader.scope.where(collection_arel(preloader)).to_sql
 
-          log("would preload with: #{preload_sql.to_s}")
+          log("would preload with: #{preload_sql}")
           klass.connection.explain(preload_sql).each_line do |line|
             log(line)
           end
@@ -34,7 +33,5 @@ module PredictiveLoad
     def log(message)
       ActiveRecord::Base.logger.info("predictive_load: #{message}")
     end
-
   end
-
 end

data/lib/predictive_load.rb

@@ -4,6 +4,27 @@ module PredictiveLoad
       super + [:predictive_load]
     end
   end
+
+  class << self
+    attr_reader :callback
+
+    # Configure a callback to be invoked when the library preloads some association.
+    #
+    # It must be a callable with an arity of two.
+    # The callback receives two arguments:
+    # - The record (instance) on which the queries that triggered automatic preloading
+    #   are being performed, in the form of some association call.
+    # - The association object, which can be inspected to check the type and name of
+    #   the association.
+    #
+    def callback=(c)
+      if c.nil? || (c.respond_to?(:call) && c.respond_to?(:arity) && c.arity == 2)
+        @callback = c
+      else
+        raise ArgumentError, "wrong callback type, it must be a callable that supports 2 arguments"
+      end
+    end
+  end
 end
 
 if ActiveRecord::VERSION::MAJOR >= 5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predictive_load
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Eric Chapweske
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-09-13 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.0
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -47,7 +47,7 @@ homepage: https://github.com/zendesk/predictive_load
 licenses:
 - Apache License Version 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -55,15 +55,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []