goldiloader 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d32eaea199d074ab8988ec521e8a4ee67a0bf55
-  data.tar.gz: 57c03bce045cb49c4aa70e47486ef36c56da654f
+  metadata.gz: c7414c0de13b4e9b5c87d8106cedfdb2028a3640
+  data.tar.gz: 2a0650488a2ebdc94d665fa12b3dc7d88282c791
 SHA512:
-  metadata.gz: deab2653b8827c4b58b284229e87fc8af127c56101551e0e6b20c709c258f5c6713d998906308a6dd16bd00aab228ecc5bb4b1a255773722d5ccf74568c30cf1
-  data.tar.gz: 54cca5bde1209f5f413a6bdd4f98fd286626022ecb03c23ccbde6de6c9cf34b0fe684507d5d1def4d91e14614737c3783eb322097592b51d68f145f89d71624c
+  metadata.gz: 46d11df02dbae98f7915b06df38937ba93937671433403ff1f161def9568b92cb1a310eb55eed6c9edb073e5851660bb890d7c324cafca12c99585d269ebd0e9
+  data.tar.gz: '09179806ac8786f88f059d0c3cba83c4a85acd7f9fe1794dca06ac6672da948b854264263c709911425689493c2932d7f242504a2b0d0d5f9818d0487b58da17'

data/lib/goldiloader/active_record_patches.rb

@@ -100,6 +100,7 @@ module Goldiloader
       association_info = Goldiloader::AssociationInfo.new(self)
       !association_info.limit? &&
         !association_info.offset? &&
+        (!association_info.has_one? || !association_info.order?) &&
         (!association_info.group? || ::Goldiloader::Compatibility.group_eager_loadable?) &&
         (!association_info.from? || ::Goldiloader::Compatibility.from_eager_loadable?) &&
         !association_info.instance_dependent? &&

data/lib/goldiloader/association_info.rb

@@ -9,6 +9,10 @@ module Goldiloader
 
     delegate :association_scope, :reflection, to: :@association
 
+    def has_one?
+      reflection.has_one?
+    end
+
     def offset?
       association_scope && association_scope.offset_value.present?
     end
@@ -33,6 +37,10 @@ module Goldiloader
       association_scope && association_scope.group_values.present?
     end
 
+    def order?
+      association_scope && association_scope.order_values.present?
+    end
+
     def instance_dependent?
       reflection.scope.present? && reflection.scope.arity > 0
     end

data/lib/goldiloader/version.rb

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

metadata

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