goldiloader 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e5d374d8cba8f3ed0e484f0030a896af17c6315
-  data.tar.gz: 0749a259d93c68ff35c45207edfc7d87648b70c5
+  metadata.gz: 0abf48daca16a3eb1ee9eef6a059d1ff3eb77153
+  data.tar.gz: 06b4f7f3d16be572b0981c579141de46f363d28b
 SHA512:
-  metadata.gz: 436cb0208f7cba5db8779af7ef9ad3d539ed988a2e48db1d8cbd3735885330afccba1844f8bbe8f540d5c37fc652cfe59c4edae7dc0c68cbc7282e153a209880
-  data.tar.gz: 41c5e5916200de2d44aa8228d18aa2ddc01a2e38dd29b4526212c51a3a27dae028602866e815baeb889a6277c4d1a9ac000c4f96b876b51592152060b27ae85a
+  metadata.gz: 5fd2ab09fd21e0f18aa97210d9c3f6696bf96a4fa4d07bd5a163237431e24019641ab5586c42b59219f31b0827481364dea662f86c8c50c72e3f34eca5be2c3a
+  data.tar.gz: bcf2dbf9cc413af86f6dcd0cffafcc435fd52bde9b8e6c9752abe38b5dcae34b42b2952b53dc5af45fbc04ab229f7e13c04a1c6e5728225029bcd4619a543d9d

data/.travis.yml

@@ -1,11 +1,16 @@
 language: ruby
 env:
-  matrix:
-    - RAILS_VERSION="~> 3.2.19" JRUBY_OPTS="$JRUBY_OPTS --debug"
-    - RAILS_VERSION="~> 4.0.10" JRUBY_OPTS="$JRUBY_OPTS --debug"
-    - RAILS_VERSION="~> 4.1.6" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 3.2.19" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.0.10" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.1.6" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.2.0.beta2" JRUBY_OPTS="$JRUBY_OPTS --debug"
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - jruby-19mode
+matrix:
+  exclude:
+    # See https://github.com/salsify/goldiloader/issues/22
+    - rvm: jruby-19mode
+      env: RAILS_VERSION="~> 4.2.0.beta2" JRUBY_OPTS="$JRUBY_OPTS --debug"

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-### 0.0.6 (unreleased)
+### 0.0.7
+* Fix [issue 20](https://github.com/salsify/goldiloader/issues/20) by not auto-eager loading 
+  associations that are instance dependent. Eager loading these associations produces potentially
+  incorrect results and leads to a deprecation warning in Rails 4.2.
+* Fix [issue 21](https://github.com/salsify/goldiloader/issues/21) - Handle explicit eager loads
+  of singular associations that are nil.
+* Rails 4.2 support.
+
+### 0.0.6
 * Workaround [issue 16](https://github.com/salsify/goldiloader/issues/16) by not auto-eager loading 
   has_and_belongs_to_many associations with a uniq in Rails 3.2 since Rails doesn't eager load them 
   properly.

data/goldiloader.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 4.2'])
-  spec.add_dependency 'activesupport', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 4.2'])
+  spec.add_dependency 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 4.3'])
+  spec.add_dependency 'activesupport', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 4.3'])
 
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'

data/lib/goldiloader/active_record_patches.rb

@@ -67,7 +67,8 @@ ActiveRecord::Associations::Association.class_eval do
         # Joins not properly eager loaded - See https://github.com/salsify/goldiloader/issues/11
         !association_info.joins? &&
         # Unscope not properly eager loaded - See https://github.com/salsify/goldiloader/issues/13
-        !association_info.unscope?
+        !association_info.unscope? &&
+        !association_info.instance_dependent?
   end
 
   def load_with_auto_include(load_method, *args)

data/lib/goldiloader/association_info.rb

@@ -7,44 +7,50 @@ module Goldiloader
       @association = association
     end
 
-    def unscope?
-      Goldiloader::Compatibility.unscope_query_method_enabled? &&
-        @association.association_scope.unscope_values.present?
-    end
-
     def finder_sql?
       Goldiloader::Compatibility.association_finder_sql_enabled? &&
-        @association.options[:finder_sql].present?
+        association_options[:finder_sql].present?
     end
 
     if ActiveRecord::VERSION::MAJOR >= 4
+      delegate :association_scope, :reflection, to: :@association
+
       def read_only?
-        @association.association_scope.readonly_value.present?
+        association_scope.readonly_value.present?
       end
 
       def offset?
-        @association.association_scope.offset_value.present?
+        association_scope.offset_value.present?
       end
 
       def limit?
-        @association.association_scope.limit_value.present?
+        association_scope.limit_value.present?
       end
 
       def from?
-        @association.association_scope.from_value.present?
+        association_scope.from_value.present?
       end
 
       def group?
-        @association.association_scope.group_values.present?
+        association_scope.group_values.present?
       end
 
       def joins?
         # Yuck - Through associations will always have a join for *each* 'through' table
-        (@association.association_scope.joins_values.size - num_through_joins) > 0
+        (association_scope.joins_values.size - num_through_joins) > 0
       end
 
       def uniq?
-        @association.association_scope.uniq_value
+        association_scope.uniq_value
+      end
+
+      def instance_dependent?
+        reflection.scope.present? && reflection.scope.arity > 0
+      end
+
+      def unscope?
+        Goldiloader::Compatibility.unscope_query_method_enabled? &&
+            association_scope.unscope_values.present?
       end
 
       private
@@ -60,15 +66,15 @@ module Goldiloader
       end
     else
       def read_only?
-        @association.options[:readonly].present?
+        association_options[:readonly].present?
       end
 
       def offset?
-        @association.options[:offset].present?
+        association_options[:offset].present?
       end
 
       def limit?
-        @association.options[:limit].present?
+        association_options[:limit].present?
       end
 
       def from?
@@ -76,7 +82,7 @@ module Goldiloader
       end
 
       def group?
-        @association.options[:group].present?
+        association_options[:group].present?
       end
 
       def joins?
@@ -85,9 +91,24 @@ module Goldiloader
       end
 
       def uniq?
-        @association.options[:uniq]
+        association_options[:uniq]
+      end
+
+      def instance_dependent?
+        # Rails 3 didn't support this
+        false
+      end
+
+      def unscope?
+        # Rails 3 didn't support this
+        false
       end
     end
 
+    private
+
+    def association_options
+      @association.options
+    end
   end
 end

data/lib/goldiloader/auto_include_context.rb

@@ -21,7 +21,7 @@ module Goldiloader
         associations.each do |association|
           nested_models = models.flat_map do |model|
             model.association(association).target
-          end
+          end.compact
 
           register_models(nested_models, nested_associations[association])
         end

data/lib/goldiloader/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Goldiloader
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/db/schema.rb

@@ -67,6 +67,7 @@ class Blog < ActiveRecord::Base
     has_many :grouped_posts, -> { group(:blog_id) }, class_name: 'Post'
     has_many :offset_posts, -> { offset(2) }, class_name: 'Post'
     has_many :from_posts, -> { from('(select distinct blog_id from posts) as posts') }, class_name: 'Post'
+    has_many :instance_dependent_posts, ->(instance) { Post.where(blog_id: instance.id) }, class_name: 'Post'
 
     has_many :posts_ordered_by_author, -> { joins(:author).order('users.name') }, class_name: 'Post'
 

data/spec/goldiloader/auto_include_context_spec.rb

@@ -114,6 +114,37 @@ describe Goldiloader::AutoIncludeContext do
       end
     end
 
+    context "when nested associations are nil" do
+      let!(:roots) do
+        [
+            create_mock_model(car: cars.first),
+            create_mock_model(car: nil),
+            create_mock_model(car: cars.last)
+        ]
+      end
+
+      let!(:cars) do
+        [
+            create_mock_model,
+            create_mock_model
+        ]
+      end
+
+      before do
+        Goldiloader::AutoIncludeContext.register_models(roots, :car)
+      end
+
+      it "sets the AutoIncludeContext for roots" do
+        expect(roots.map(&:auto_include_context).uniq.size).to eq 1
+        expect(roots.first.auto_include_context.models).to match_array(roots)
+      end
+
+      it "sets the AutoIncludeContext for child nested associations" do
+        expect(cars.map(&:auto_include_context).uniq.size).to eq 1
+        expect(cars.first.auto_include_context.models).to match_array(cars)
+      end
+    end
+
     def create_mock_models(num)
       num.times.map { create_mock_model }
     end

data/spec/goldiloader/goldiloader_spec.rb

@@ -440,6 +440,20 @@ describe Goldiloader do
         end
       end
     end
+
+    if ActiveRecord::VERSION::MAJOR >= 4
+      context "associations with an instance dependent scope" do
+        before do
+          blogs.first.instance_dependent_posts.to_a
+        end
+
+        it "applies the scope correctly" do
+          expect(blogs.first.instance_dependent_posts.to_a).to match_array(blogs.first.posts)
+        end
+
+        it_behaves_like "it doesn't auto eager the association", :instance_dependent_posts
+      end
+    end
   end
 
   context "associations with a uniq" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement