goldiloader 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abf48daca16a3eb1ee9eef6a059d1ff3eb77153
-  data.tar.gz: 06b4f7f3d16be572b0981c579141de46f363d28b
+  metadata.gz: 218ef1dd67241dac5ee6c56cc0fc5e9dc01edd8a
+  data.tar.gz: 8dfc1cd8a8a9c7c4e42a7ece035734b6e72d8762
 SHA512:
-  metadata.gz: 5fd2ab09fd21e0f18aa97210d9c3f6696bf96a4fa4d07bd5a163237431e24019641ab5586c42b59219f31b0827481364dea662f86c8c50c72e3f34eca5be2c3a
-  data.tar.gz: bcf2dbf9cc413af86f6dcd0cffafcc435fd52bde9b8e6c9752abe38b5dcae34b42b2952b53dc5af45fbc04ab229f7e13c04a1c6e5728225029bcd4619a543d9d
+  metadata.gz: 471b2b2f4ac390b7d31ce55810eadcbc845adb7e5f9a34a5b3f1a63d49430e1f8f8cdd384d445ceb9c4c308c427ae4be3d0297c0e87c9e82609204189ea10a6b
+  data.tar.gz: 73120bf84295153faee36635aecb18920c4cf86df13333fcef6c4e857b3715dd0afdf9fe6538dee7e578eb3472694eed1a7fb4077fba80406e3ae84cef8d7cfc

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 env:
-  - 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"
+  - RAILS_VERSION="~> 3.2.20" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.0.11" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.1.7" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.2.0.beta4" JRUBY_OPTS="$JRUBY_OPTS --debug"
 rvm:
   - 1.9.3
   - 2.0.0
@@ -13,4 +13,4 @@ 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"
+      env: RAILS_VERSION="~> 4.2.0.beta4" JRUBY_OPTS="$JRUBY_OPTS --debug"

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.0.8 (unreleased)
+* Fix [issue 23](https://github.com/salsify/goldiloader/issues/23) - Handle polymorphic belongs_to
+  associations in Rails 4 that have a mix of non-nil and nil values.
+  
+
 ### 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

data/README.md

@@ -170,7 +170,7 @@ Goldiloader detects associations with any of these options and disables automati
 
 ## Status
 
-This gem is tested with Rails 3.2, 4.0, and 4.1 using MRI 1.9.3, 2.0.0, 2.1.0 and JRuby in 1.9 mode. 
+This gem is tested with Rails 3.2, 4.0, 4.1, and 4.2 using MRI 1.9.3, 2.0.0, 2.1.0 and JRuby in 1.9 mode. 
 
 Let us know if you find any issues or have any other feedback. 
 

data/lib/goldiloader/association_info.rb

@@ -16,32 +16,32 @@ module Goldiloader
       delegate :association_scope, :reflection, to: :@association
 
       def read_only?
-        association_scope.readonly_value.present?
+        association_scope && association_scope.readonly_value.present?
       end
 
       def offset?
-        association_scope.offset_value.present?
+        association_scope && association_scope.offset_value.present?
       end
 
       def limit?
-        association_scope.limit_value.present?
+        association_scope && association_scope.limit_value.present?
       end
 
       def from?
-        association_scope.from_value.present?
+        association_scope && association_scope.from_value.present?
       end
 
       def group?
-        association_scope.group_values.present?
+        association_scope && association_scope.group_values.present?
       end
 
       def joins?
         # Yuck - Through associations will always have a join for *each* 'through' table
-        (association_scope.joins_values.size - num_through_joins) > 0
+        association_scope && (association_scope.joins_values.size - num_through_joins) > 0
       end
 
       def uniq?
-        association_scope.uniq_value
+        association_scope && association_scope.uniq_value
       end
 
       def instance_dependent?
@@ -50,6 +50,7 @@ module Goldiloader
 
       def unscope?
         Goldiloader::Compatibility.unscope_query_method_enabled? &&
+            association_scope &&
             association_scope.unscope_values.present?
       end
 

data/lib/goldiloader/version.rb

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

data/spec/db/schema.rb

@@ -10,6 +10,8 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :title
     t.integer :blog_id
     t.integer :author_id
+    t.string :owner_type
+    t.integer :owner_id
   end
 
   create_table(:users, force: true) do |t|
@@ -106,6 +108,8 @@ class Post < ActiveRecord::Base
   has_many :post_tags
   has_many :tags, through: :post_tags
 
+  belongs_to :owner, polymorphic: true
+
   if ActiveRecord::VERSION::MAJOR >= 4
     has_many :unique_tags, -> { distinct }, through: :post_tags, source: :tag, class_name: 'Tag'
   else

data/spec/goldiloader/goldiloader_spec.rb

@@ -475,13 +475,46 @@ describe Goldiloader do
       expect(posts.first.unique_tags.to_a).to match_array([child_tag1, child_tag3])
     end
 
-    it "auto eager the association" do
+    it "auto eager loads the association" do
       posts.each do |blog|
         expect(blog.association(:unique_tags)).to be_loaded
       end
     end
   end
 
+  context "polymorphic associations with nil" do
+    let!(:user) { User.create! }
+    let!(:group) { Group.create! }
+
+    let!(:post1) do
+      Post.create! { |post| post.owner = user }
+    end
+
+    let!(:post2) do
+      Post.create! { |post| post.owner = group }
+    end
+
+    let!(:post3) do
+      Post.create!
+    end
+
+    let(:posts) { Post.where(id: [post1, post2, post3].map(&:id)).order(:id).to_a }
+
+    before do
+      posts.first.owner
+    end
+
+    it "loads the association correctly" do
+      expect(posts.map(&:owner)).to eq [user, group, nil]
+    end
+
+    it "auto eager loads the association" do
+      posts.select(&:owner_id).each do |post|
+        expect(post.association(:owner)).to be_loaded
+      end
+    end
+  end
+
   context "when a model is destroyed" do
     let!(:posts) { Post.where(blog_id: blog1.id).to_a }
     let(:destroyed_post) { posts.first }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord