duck_record 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d19663344eb4aa892dd369cda75cc59da67b7e3
-  data.tar.gz: 188bf00418075e218d1ec4df018c1bd46a694a8e
+  metadata.gz: 5c60a2c907aa9a22ad192c994a66556ac592feeb
+  data.tar.gz: f7b7f5170b02163d523382d6d8345b37a6119c6d
 SHA512:
-  metadata.gz: c00ca372657108f0bb63c0c697f57704cb3b2c1fba0d3586588883779dba371505cafe12a60ed69406a9d19424e5a6b4b10f9cfa909463ebed4f49e9b3edc826
-  data.tar.gz: 6de741eb0250fba42ae8d0812940d7056329714fc4d48c8b11fb3fd66083f17f1aa221454479c2af9f51a65f120a661944e9b259abcab2be0a8516d422af4562
+  metadata.gz: f0d27e1d7a536532a86567579c2fe3951378251dc8f6b920d620a21245700abe0693d5b149ee9a3a351985ba3c4e0e774f32206b7fc833694baff24b15941e35
+  data.tar.gz: 797cb8c2df95a6ba32846f7bbd7258627eadd2ac46fe49b1b81bc5d4a88a69802058b9ec4ed372e52e08f2e03271fd652bda3f188b8eceac054db727d6f9e997

data/lib/duck_record/associations/association.rb

@@ -90,9 +90,11 @@ module DuckRecord
       # by scope.scoping { ... } or with_scope { ... } etc, which affects the scope which
       # actually gets built.
       def association_scope
-        if klass
-          @association_scope ||= ActiveRecord::Associations::AssociationScope.scope(self, klass.connection)
-        end
+        return unless klass
+
+        @association_scope ||= ActiveRecord::Associations::AssociationScope.scope(self)
+      rescue ArgumentError
+        @association_scope ||= ActiveRecord::Associations::AssociationScope.scope(self, klass.connection)
       end
 
       def reset_scope
@@ -116,6 +118,8 @@ module DuckRecord
       # Can be overridden (i.e. in ThroughAssociation) to merge in other scopes (i.e. the
       # through association's scope)
       def target_scope
+        ActiveRecord::AssociationRelation.create(klass, self).merge!(klass.all)
+      rescue ArgumentError
         ActiveRecord::AssociationRelation.create(klass, klass.arel_table, klass.predicate_builder, self).merge!(klass.all)
       end
 

data/lib/duck_record/version.rb

@@ -1,3 +1,3 @@
 module DuckRecord
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_record
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-22 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport