goldiloader 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eb9e7e83e2023f73d88bbd044bba76e452e5eb3
-  data.tar.gz: aaf853bba04d29f1ac111bc3c3c048735cb8b766
+  metadata.gz: 47531442377d70a4496f4c0e7887d1f907a8ca47
+  data.tar.gz: 8237c5844f7b0f0fb64b284f6d1cfb674f7faf2f
 SHA512:
-  metadata.gz: 16106d1ea68ac57291e0e9bf0f5285d1fa7317af25f658dcb8d123b3f605fdb87e4617523ae1a693fd23b4adc05c821f1f9e1dc494c1042b711c92353fc9a31f
-  data.tar.gz: 717893a31670aac38041fc842bfa0d026372f5985b966d8c8c8e5bfbbe0240f1c3e95333999febb82d2cfee62554cdacb0b30faa84ab02d3b863e55c1537a700
+  metadata.gz: 899cc984c1e472134d7217d33f3d4873edde8f9ccdceba32a11a344893f43c5dc0d6d28395e839a2cbcd6a8e53f92bd8d188cbef995224ba2e6456484274a370
+  data.tar.gz: 10cb34ba3adcaac3c769568aaa6195d0dd7a8d0f00acbea222572a0a50afa7e4f9c2433d068b082c25b77277052b3c78aba64e7fc20afc0f37c6a74596ac5b1a

data/lib/goldiloader/active_record_patches.rb

@@ -103,7 +103,8 @@ module Goldiloader
         !association_info.group? &&
         !association_info.from? &&
         !association_info.instance_dependent? &&
-        association_info.auto_include?
+        association_info.auto_include? &&
+        (!owner.destroyed? || ::Goldiloader::Compatibility.destroyed_model_associations_eager_loadable?)
     end
 
     def load_with_auto_include

data/lib/goldiloader/compatibility.rb

@@ -3,6 +3,7 @@
 module Goldiloader
   module Compatibility
     ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING)
+    PRE_RAILS_5_2 = ACTIVE_RECORD_VERSION < ::Gem::Version.new('5.2.0')
 
     def self.rails_4?
       ::ActiveRecord::VERSION::MAJOR == 4
@@ -11,5 +12,10 @@ module Goldiloader
     def self.rails_5_0?
       ::ActiveRecord::VERSION::MAJOR == 5 && ::ActiveRecord::VERSION::MINOR == 0
     end
+
+    # See https://github.com/rails/rails/pull/32375
+    def self.destroyed_model_associations_eager_loadable?
+      PRE_RAILS_5_2
+    end
   end
 end

data/lib/goldiloader/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,21 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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
@@ -167,7 +181,11 @@ files:
 homepage: https://github.com/salsify/goldiloader
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/salsify/goldiloader
+  changelog_uri: https://github.com/salsify/goldiloader/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/salsify/goldiloader/
+  bug_tracker_uri: https://github.com/salsify/goldiloader/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -184,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Automatic Rails association eager loading