goldiloader 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea2be18413e1cc1e5d2dc0a325a808f64165a52
-  data.tar.gz: b9ea0538d9894df028174a7e081acd5b96b4455b
+  metadata.gz: 5f23e35eaad8987983cf1c95ec9c99e281e23715
+  data.tar.gz: 9882b6e39452af1d0a9d55b28b7d1d40e3e3513a
 SHA512:
-  metadata.gz: 28df2ae2eed0bc12cd4d29458aebbc16cf5f667d2950d8b113bf92859447b75a2380d83abf59ef1b36ec0d707fe3954ef25d12b642b69502850d142aa590607e
-  data.tar.gz: 1ebb5abe80281c1a76fc3b3dd8eed50367ccde1dce353493d90d7da468750e436c4d273e39e1d1388800d31ba2676e4729fbc37ee271e063267a83b6612c96c5
+  metadata.gz: 22065fba51aa33fbc113ddc113a84d998de8b5915108c0dd54a878b182684155b957be4aa86bec6971010ff6f930a94116e4ebc4ff3490e6c0257975e0e26272
+  data.tar.gz: 03244b1b7fc590389d9a89a0a5f26376c0198b1e0ce68e5605e5e254ad116e203ae88573da24ca671ed2b5bb44fe0d58cc19f9509a754c462fa9d0e9e2c36129

data/lib/goldiloader.rb

@@ -4,7 +4,7 @@ require 'active_support/all'
 require 'active_record'
 require 'goldiloader/compatibility'
 require 'goldiloader/auto_include_context'
-require 'goldiloader/association_info'
+require 'goldiloader/scope_info'
 require 'goldiloader/association_options'
 require 'goldiloader/association_loader'
 require 'goldiloader/active_record_patches'

data/lib/goldiloader/active_record_patches.rb

@@ -76,6 +76,35 @@ module Goldiloader
   end
   ActiveRecord::Relation::Merger.prepend(::Goldiloader::MergerPatch)
 
+  module AssociationReflectionPatch
+    def eager_loadable?
+      return @eager_loadable if instance_variable_defined?(:@eager_loadable)
+
+      @eager_loadable = if scope.nil?
+                          # Associations without any scoping options are eager loadable
+                          true
+                        elsif scope.arity > 0
+                          # The scope will be evaluated for every model instance so it can't
+                          # be eager loaded
+                          false
+                        else
+                          scope_info = if Goldiloader::Compatibility.rails_4?
+                                         Goldiloader::ScopeInfo.new(klass.unscoped.instance_exec(&scope) || klass.unscoped)
+                                       else
+                                         Goldiloader::ScopeInfo.new(scope_for(klass.unscoped))
+                                       end
+                          scope_info.auto_include? &&
+                            !scope_info.limit? &&
+                            !scope_info.offset? &&
+                            (!has_one? || !scope_info.order?) &&
+                            (::Goldiloader::Compatibility.group_eager_loadable? || !scope_info.group?) &&
+                            (::Goldiloader::Compatibility.from_eager_loadable? || !scope_info.from?)
+                        end
+    end
+  end
+  ActiveRecord::Reflection::AssociationReflection.include(::Goldiloader::AssociationReflectionPatch)
+  ActiveRecord::Reflection::ThroughReflection.include(::Goldiloader::AssociationReflectionPatch)
+
   module AssociationPatch
     extend ActiveSupport::Concern
 
@@ -97,25 +126,26 @@ module Goldiloader
     private
 
     def eager_loadable?
-      association_info = Goldiloader::AssociationInfo.new(self)
-      association_info.auto_include? &&
-        !association_info.limit? &&
-        !association_info.offset? &&
-        (!association_info.has_one? || !association_info.order?) &&
-        (::Goldiloader::Compatibility.group_eager_loadable? || !association_info.group?) &&
-        (::Goldiloader::Compatibility.from_eager_loadable? || !association_info.from?) &&
-        (::Goldiloader::Compatibility.destroyed_model_associations_eager_loadable? || !owner.destroyed?) &&
-        !association_info.instance_dependent?
+      reflection.eager_loadable? &&
+        (::Goldiloader::Compatibility.destroyed_model_associations_eager_loadable? || !owner.destroyed?)
     end
 
     def load_with_auto_include
       if loaded? && !stale_target?
         target
-      elsif auto_include?
+      elsif !auto_include?
+        yield
+      elsif owner.auto_include_context.size == 1
+        # Bypassing the preloader for a single model reduces object allocations by ~5% in benchmarks
+        result = yield
+        # As of https://github.com/rails/rails/commit/bd3b28f7f181dce53e872daa23dda101498b8fb4
+        # ActiveRecord does not use ActiveRecord::Relation#exec_queries to resolve association
+        # queries
+        Goldiloader::AutoIncludeContext.register_models(result)
+        result
+      else
         Goldiloader::AssociationLoader.load(owner, reflection.name)
         target
-      else
-        yield
       end
     end
   end

data/lib/goldiloader/association_options.rb

@@ -18,10 +18,10 @@ module Goldiloader
     end
 
     def register
-      if ::ActiveRecord::VERSION::MAJOR >= 5
-        ActiveRecord::Associations::Builder::Association.extensions << AssociationBuilderExtension
-      else
+      if Goldiloader::Compatibility.rails_4?
         ActiveRecord::Associations::Builder::Association.valid_options.concat(OPTIONS)
+      else
+        ActiveRecord::Associations::Builder::Association.extensions << AssociationBuilderExtension
       end
     end
   end

data/lib/goldiloader/auto_include_context.rb

@@ -4,6 +4,8 @@ module Goldiloader
   class AutoIncludeContext
     attr_reader :models
 
+    delegate :size, to: :models
+
     def initialize
       @models = []
     end

data/lib/goldiloader/scope_info.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Goldiloader
+  class ScopeInfo
+    attr_reader :scope
+
+    def initialize(scope)
+      @scope = scope
+    end
+
+    def offset?
+      scope.offset_value.present?
+    end
+
+    def limit?
+      scope.limit_value.present?
+    end
+
+    def auto_include?
+      scope.auto_include_value
+    end
+
+    def from?
+      if Goldiloader::Compatibility.rails_4?
+        scope.from_value.present?
+      else
+        scope.from_clause.present?
+      end
+    end
+
+    def group?
+      scope.group_values.present?
+    end
+
+    def order?
+      scope.order_values.present?
+    end
+  end
+end

data/lib/goldiloader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Goldiloader
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -64,6 +64,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  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'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -186,11 +200,11 @@ files:
 - LICENSE.txt
 - lib/goldiloader.rb
 - lib/goldiloader/active_record_patches.rb
-- lib/goldiloader/association_info.rb
 - lib/goldiloader/association_loader.rb
 - lib/goldiloader/association_options.rb
 - lib/goldiloader/auto_include_context.rb
 - lib/goldiloader/compatibility.rb
+- lib/goldiloader/scope_info.rb
 - lib/goldiloader/version.rb
 homepage: https://github.com/salsify/goldiloader
 licenses:

data/lib/goldiloader/association_info.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Goldiloader
-  class AssociationInfo
-
-    def initialize(association)
-      @association = association
-    end
-
-    delegate :association_scope, :reflection, to: :@association
-
-    def has_one? # rubocop:disable Naming/PredicateName
-      reflection.has_one?
-    end
-
-    def offset?
-      association_scope && association_scope.offset_value.present?
-    end
-
-    def limit?
-      association_scope && association_scope.limit_value.present?
-    end
-
-    def auto_include?
-      association_scope.nil? || association_scope.auto_include_value
-    end
-
-    def from?
-      if ActiveRecord::VERSION::MAJOR >= 5
-        association_scope && association_scope.from_clause.present?
-      else
-        association_scope && association_scope.from_value.present?
-      end
-    end
-
-    def group?
-      association_scope && association_scope.group_values.present?
-    end
-
-    def order?
-      association_scope && association_scope.order_values.present?
-    end
-
-    def instance_dependent?
-      reflection.scope.present? && reflection.scope.arity > 0
-    end
-  end
-end