goldiloader 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fcd566afe07738acd5ebf7a634c40c310314ba3
-  data.tar.gz: d7db565dac03de0ef17bd44f372a0b861c9663c0
+  metadata.gz: 526a23489a3e8b11cc8f0f54bbad2d172aab998c
+  data.tar.gz: 65d84a61f5f1d7c1efee2ac66e46b4661cdbc8ac
 SHA512:
-  metadata.gz: eeae5d642ddd6e2b7a613045f328b92c327840ff4f7f061ab4c6a51647d0c2a47d999016628b0141b4943759b9185c623df9f41f97011d2b7033774130db504a
-  data.tar.gz: e9afd2b2bb91fdcfd821ce2701f1af6e13a0eea244b384f67179fc90ffb53eb8897aa0806941943bf110f02fe85c07bd083926c715297952fdef6054b7f2128d
+  metadata.gz: 7b689413962ae9ae86dcec25f2a27a3472f7c406a3b932f7b20f4f92dade3900c8a6d20e5eca79f7e6762c886d5520d1512904479aa28f428b3e519983b2ac9c
+  data.tar.gz: 363b20372285117f68e22281b823586ca0136417b0449cf94f47a345ecad372e6cc2f3d09336911d476d4c15b080bdc0c421d91074fe78f16c0c472822cd8b18

data/.travis.yml

@@ -1,28 +1,28 @@
 language: ruby
 sudo: false
 env:
-  - RAILS_VERSION="~> 3.2.22" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 3.2.22.2" JRUBY_OPTS="$JRUBY_OPTS --debug"
   - RAILS_VERSION="~> 4.0.13" JRUBY_OPTS="$JRUBY_OPTS --debug"
-  - RAILS_VERSION="~> 4.1.14" JRUBY_OPTS="$JRUBY_OPTS --debug"
-  - RAILS_VERSION="~> 4.2.5" JRUBY_OPTS="$JRUBY_OPTS --debug"
-  - RAILS_VERSION="~> 5.0.0.beta3" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.1.16" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 4.2.7.1" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - RAILS_VERSION="~> 5.0.1" JRUBY_OPTS="$JRUBY_OPTS --debug"
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.6
-  - 2.2.2
-  - 2.3.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
   - jruby-19mode
-  - jruby-9.0.5.0
+  - jruby-9.1.7.0
 matrix:
   exclude:
     - rvm: 1.9.3
-      env: RAILS_VERSION="~> 5.0.0.beta3" JRUBY_OPTS="$JRUBY_OPTS --debug"
+      env: RAILS_VERSION="~> 5.0.1" JRUBY_OPTS="$JRUBY_OPTS --debug"
     - rvm: 2.0.0
-      env: RAILS_VERSION="~> 5.0.0.beta3" JRUBY_OPTS="$JRUBY_OPTS --debug"
-    - rvm: 2.1.6
-      env: RAILS_VERSION="~> 5.0.0.beta3" JRUBY_OPTS="$JRUBY_OPTS --debug"
+      env: RAILS_VERSION="~> 5.0.1" JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: 2.1.10
+      env: RAILS_VERSION="~> 5.0.1" JRUBY_OPTS="$JRUBY_OPTS --debug"
     - rvm: jruby-19mode
-      env: RAILS_VERSION="~> 5.0.0.beta3" JRUBY_OPTS="$JRUBY_OPTS --debug"
-    - rvm: jruby-9.0.5.0
-      env: RAILS_VERSION="~> 5.0.0.beta3" JRUBY_OPTS="$JRUBY_OPTS --debug"
+      env: RAILS_VERSION="~> 5.0.1" JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: jruby-9.1.7.0
+      env: RAILS_VERSION="~> 5.0.1" JRUBY_OPTS="$JRUBY_OPTS --debug"

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-### 0.0.10 (unreleased)
+### 0.0.11 (unreleased)
+* Fix [issue 34](https://github.com/salsify/goldiloader/issues/34) - HABTM associations now honor 
+  the auto_include option.
+* Fix [issue 39](https://github.com/salsify/goldiloader/issues/39) - `CollectionProxy#exists?` should return false 
+  for a new model's association with no values.
+  
+### 0.0.10
 * Fix [issue 13](https://github.com/salsify/goldiloader/issues/13) - Eager load associations with unscope
   in Rails 4.1.9+ now that the underlying Rails bug has been fixed.
 * Fix [issue 11](https://github.com/salsify/goldiloader/issues/11) - Eager load associations with joins in 
@@ -8,6 +14,7 @@
 * Initial support for Rails 5. There are no known issues but see 
   [issue 27](https://github.com/salsify/goldiloader/issues/27) for remaining tasks.
 * MRI 2.3.0 support.
+* JRuby 9000 support.
 
 ### 0.0.9
 * Merge [pull request](https://github.com/salsify/goldiloader/pull/24) - Optimization: Cache compatibility

data/README.md

@@ -14,7 +14,7 @@ Wouldn't it be awesome if ActiveRecord didn't make you think about eager loading
 
 Consider the following models:
 
-```
+```ruby
 class Blog < ActiveRecord::Base
   has_many :posts
 end
@@ -26,7 +26,7 @@ end
 
 Here are some sample queries without the Goldiloader:
 
-```
+```ruby
 > blogs = Blogs.limit(5).to_a
 # SELECT * FROM blogs LIMIT 5
 
@@ -40,7 +40,7 @@ Here are some sample queries without the Goldiloader:
 
 Here are the same queries with the Goldiloader:
 
-```
+```ruby
 > blogs = Blogs.limit(5).to_a
 # SELECT * FROM blogs LIMIT 5
 
@@ -78,7 +78,7 @@ Goldiloader supports a few options on ActiveRecord associations to customize its
 
 You can disable automatic eager loading on specific associations with the `auto_include` option:
 
-```
+```ruby
 class Blog < ActiveRecord::Base
   has_many :posts, auto_include: false
 end
@@ -102,7 +102,7 @@ There are several association methods that ActiveRecord can either execute on in
 
 This can cause problems for certain usage patterns if we're no longer specifying eager loads:
 
-```
+```ruby
 > blogs = Blogs.limit(5).to_a
 # SELECT * FROM blogs LIMIT 5
 
@@ -118,7 +118,7 @@ This can cause problems for certain usage patterns if we're no longer specifying
 
 Notice the first call to `blog.posts.exists?` was executed via SQL because the `posts` association wasn't yet loaded. The `fully_load` option can be used to force ActiveRecord to fully load the association (and do any necessary automatic eager loading) when evaluating methods like `exists?`:
 
-```
+```ruby
 class Blog < ActiveRecord::Base
   has_many :posts, fully_load: true
 end
@@ -132,7 +132,7 @@ Goldiloader leverages the ActiveRecord eager loader so it shares some of the sam
 
 You should not try to auto eager load (or regular eager load) `has_one` associations that actually correspond to multiple records and rely on a SQL limit to only return one record. Consider the following example:
 
-```
+```ruby
 class Blog < ActiveRecord::Base
   has_many :posts
   has_one :most_recent_post, -> { order(published_at: desc) }, class_name: 'Post'
@@ -141,13 +141,13 @@ end
 
 With standard Rails lazy loading the `most_recent_post` association is loaded with a query like this:
 
-```
+```sql
 SELECT * FROM posts WHERE blog_id = 1 ORDER BY published_at DESC LIMIT 1
 ```
 
 With auto eager loading (or regular eager loading) the `most_recent_post` association is loaded with a query like this:
 
-```
+```sql
 SELECT * FROM posts WHERE blog_id IN (1,2,3,4,5) ORDER BY published_at DESC
 ```
 

data/goldiloader.gemspec

@@ -23,13 +23,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2'
+  spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'simplecov', '~> 0.7.1'
   # mime-type 3 requires Ruby >= 2.0
   spec.add_development_dependency 'mime-types', '~> 2'
 
   if RUBY_PLATFORM == 'java'
-    spec.add_development_dependency 'jdbc-sqlite3'
+    # jdbc-sqlite3 > 3.8 doesn't work with JRuby 1.7
+    spec.add_development_dependency 'jdbc-sqlite3', '~> 3.8.11'
     spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
   else
     spec.add_development_dependency 'sqlite3'

data/lib/goldiloader/active_record_patches.rb

@@ -138,6 +138,29 @@ if ActiveRecord::VERSION::MAJOR < 4
   end
 end
 
+# In Rails >= 4.1 has_and_belongs_to_many associations create a has_many associations
+# under the covers so we need to make sure to propagate the auto_include option to that
+# association
+if Goldiloader::Compatibility::ACTIVE_RECORD_VERSION >= ::Gem::Version.new('4.1')
+  ActiveRecord::Associations::ClassMethods.class_eval do
+    
+    def has_and_belongs_to_many_with_auto_include_option(name, scope = nil, options = {}, &extension)
+      if scope.is_a?(Hash)
+        options = scope
+        scope = nil
+      end
+
+      result = has_and_belongs_to_many_without_auto_include_option(name, scope, options, &extension)
+      if options.include?(:auto_include)
+        _reflect_on_association(name).options[:auto_include] = options[:auto_include]
+      end
+      result
+    end
+
+    Goldiloader::Compatibility.alias_method_chain self, :has_and_belongs_to_many, :auto_include_option
+  end
+end
+
 # The CollectionProxy just forwards exists? to the underlying scope so we need to intercept this and
 # force it to use size which handles fully_load properly.
 ActiveRecord::Associations::CollectionProxy.class_eval do
@@ -145,6 +168,12 @@ ActiveRecord::Associations::CollectionProxy.class_eval do
     # We don't fully_load the association when arguments are passed to exists? since Rails always
     # pushes this query into the database without any caching (and it likely not a common
     # scenario worth optimizing).
-    args.empty? && @association.fully_load? ? size > 0 : super
+    if args.empty? && @association.fully_load?
+      size > 0
+    elsif Goldiloader::Compatibility::RAILS_3
+      scoped.exists?(*args)
+    else
+      scope.exists?(*args)
+    end
   end
 end

data/lib/goldiloader/association_loader.rb

@@ -10,8 +10,8 @@ module Goldiloader
       end
 
       eager_load(models, association_name)
-
-      # Workaround Rails #15853 by setting models read only
+      
+      # Workaround Rails #15853 for Rails < 4.2.0 by setting models read only
       if read_only?(models, association_name)
         associated_models = associated_models(models, association_name)
         mark_read_only(associated_models)

data/lib/goldiloader/compatibility.rb

@@ -4,7 +4,8 @@ module Goldiloader
   module Compatibility
 
     ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING)
-    MASS_ASSIGNMENT_SECURITY = ACTIVE_RECORD_VERSION < ::Gem::Version.new('4') || defined?(::ActiveRecord::MassAssignmentSecurity)
+    RAILS_3 = ACTIVE_RECORD_VERSION < ::Gem::Version.new('4')
+    MASS_ASSIGNMENT_SECURITY = RAILS_3 || defined?(::ActiveRecord::MassAssignmentSecurity)
     ASSOCIATION_FINDER_SQL = ACTIVE_RECORD_VERSION < ::Gem::Version.new('4.1')
     UNSCOPE_QUERY_METHOD = ACTIVE_RECORD_VERSION >= ::Gem::Version.new('4.1')
     JOINS_EAGER_LOADABLE = ACTIVE_RECORD_VERSION >= ::Gem::Version.new('4.2')

data/lib/goldiloader/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Goldiloader
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11'.freeze
 end

data/spec/db/schema.rb

@@ -120,6 +120,8 @@ class Post < ActiveRecord::Base
     has_and_belongs_to_many :unique_tags_has_and_belongs, join_table: :post_tags, class_name: 'Tag', uniq: true
   end
 
+  has_and_belongs_to_many :tags_without_auto_include, join_table: :post_tags, class_name: 'Tag', auto_include: false
+
   after_destroy :after_post_destroy
 
   if Goldiloader::Compatibility.mass_assignment_security_enabled?

data/spec/goldiloader/goldiloader_spec.rb

@@ -732,6 +732,17 @@ describe Goldiloader do
       end
     end
 
+    it "doesn't auto eager load has_and_belongs_to_many associations" do
+      posts = Post.all.to_a
+
+      # Force the first post's tags to load
+      posts.first.tags_without_auto_include.to_a
+
+      posts.drop(1).each do |post|
+        expect(post.association(:tags_without_auto_include)).to_not be_loaded
+      end
+    end
+
     it "still auto eager loads nested associations" do
       posts = Post.order(:title).to_a
       # Force the first post's blog to load
@@ -752,4 +763,25 @@ describe Goldiloader do
       end
     end
   end
+
+  describe "CollectionProxy#exists?" do
+    it "returns true for collections with values" do
+      expect(parent_tag1.children).to exist
+    end
+
+    it "returns false for collections without values" do
+      expect(child_tag1.children).not_to exist
+    end
+
+    if Goldiloader::Compatibility::RAILS_3
+      # Make sure we mimic the broken behavior of Rails 3
+      it "returns true for new models with empty associations" do
+        expect(Tag.new.children).to exist
+      end
+    else
+      it "returns false for new models with empty associations" do
+        expect(Tag.new.children).not_to exist
+      end
+    end
+  end
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Joel Turkel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -20,7 +20,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -28,11 +30,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -40,7 +40,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -48,120 +50,104 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: coveralls
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-  prerelease: false
+        version: '3'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: mime-types
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: jdbc-sqlite3
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbcsqlite3-adapter
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
 description: Automatically eager loads Rails associations as associations are traversed
 email:
 - jturkel@salsify.com
@@ -195,7 +181,7 @@ homepage: https://github.com/salsify/goldiloader
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -210,14 +196,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Automatic Rails association eager loading
 test_files:
-- spec/spec_helper.rb
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/goldiloader/auto_include_context_spec.rb
 - spec/goldiloader/goldiloader_spec.rb
+- spec/spec_helper.rb