goldiloader 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47531442377d70a4496f4c0e7887d1f907a8ca47
-  data.tar.gz: 8237c5844f7b0f0fb64b284f6d1cfb674f7faf2f
+  metadata.gz: 7d32eaea199d074ab8988ec521e8a4ee67a0bf55
+  data.tar.gz: 57c03bce045cb49c4aa70e47486ef36c56da654f
 SHA512:
-  metadata.gz: 899cc984c1e472134d7217d33f3d4873edde8f9ccdceba32a11a344893f43c5dc0d6d28395e839a2cbcd6a8e53f92bd8d188cbef995224ba2e6456484274a370
-  data.tar.gz: 10cb34ba3adcaac3c769568aaa6195d0dd7a8d0f00acbea222572a0a50afa7e4f9c2433d068b082c25b77277052b3c78aba64e7fc20afc0f37c6a74596ac5b1a
+  metadata.gz: deab2653b8827c4b58b284229e87fc8af127c56101551e0e6b20c709c258f5c6713d998906308a6dd16bd00aab228ecc5bb4b1a255773722d5ccf74568c30cf1
+  data.tar.gz: 54cca5bde1209f5f413a6bdd4f98fd286626022ecb03c23ccbde6de6c9cf34b0fe684507d5d1def4d91e14614737c3783eb322097592b51d68f145f89d71624c

data/lib/goldiloader/active_record_patches.rb

@@ -100,8 +100,8 @@ module Goldiloader
       association_info = Goldiloader::AssociationInfo.new(self)
       !association_info.limit? &&
         !association_info.offset? &&
-        !association_info.group? &&
-        !association_info.from? &&
+        (!association_info.group? || ::Goldiloader::Compatibility.group_eager_loadable?) &&
+        (!association_info.from? || ::Goldiloader::Compatibility.from_eager_loadable?) &&
         !association_info.instance_dependent? &&
         association_info.auto_include? &&
         (!owner.destroyed? || ::Goldiloader::Compatibility.destroyed_model_associations_eager_loadable?)

data/lib/goldiloader/compatibility.rb

@@ -4,6 +4,11 @@ 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')
+    POST_RAILS_5_1_4 = ACTIVE_RECORD_VERSION > ::Gem::Version.new('5.1.5')
+    PRE_RAILS_5_1_5 = ACTIVE_RECORD_VERSION < ::Gem::Version.new('5.1.5')
+    FROM_EAGER_LOADABLE = ACTIVE_RECORD_VERSION >= ::Gem::Version.new('5.1.5') ||
+      (ACTIVE_RECORD_VERSION >= ::Gem::Version.new('5.0.7') && ACTIVE_RECORD_VERSION < ::Gem::Version.new('5.1.0'))
+    GROUP_EAGER_LOADABLE = FROM_EAGER_LOADABLE
 
     def self.rails_4?
       ::ActiveRecord::VERSION::MAJOR == 4
@@ -17,5 +22,13 @@ module Goldiloader
     def self.destroyed_model_associations_eager_loadable?
       PRE_RAILS_5_2
     end
+
+    def self.from_eager_loadable?
+      FROM_EAGER_LOADABLE
+    end
+
+    def self.group_eager_loadable?
+      GROUP_EAGER_LOADABLE
+    end
   end
 end

data/lib/goldiloader/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord