active_record-json_associations 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 104232cfff6f8890c439884dc7947734c5e68286
-  data.tar.gz: 5a5d497ff55c46a75164df58857ab6a73ba07ba2
+  metadata.gz: f910924a4b7db4fbb8b85ae587d920bd6d3dd443
+  data.tar.gz: 29b868a54bf20c8a0aac20273d0b03555bb7dd44
 SHA512:
-  metadata.gz: 3f9186e895cf92be3e1ab85a2b41be00e6979a0c4916b3cacb7af15a0d76b7d6dd6a8d32ca24b2b64218685aef646609b6e0a5eb6623ad6aa63b667451399ae9
-  data.tar.gz: dddbb32c0182d9cee3475d87913cd696f6aaa338af1cddf0691cb701043c8a3c7490b395a1f659492d1370e119042928af0cc10d7ede7af01661cf0283ac9524
+  metadata.gz: 3fdbaf90f761a9c81cc43468abc4b6c004e3c1ddac60be7eb97420f4b65e930dffc80ba09b320614006ae07934a0d5549772947e50d0f56f6d9b21722963ccbc
+  data.tar.gz: b1675d6693fb78632dfef7a9c021fad62370ed0068bbefd7fd16f1690cb16d22296617a12d856f23eaad562bb0ccc4337556c92bd9005cbd88677e61636a1e84

data/lib/active_record/json_associations.rb

@@ -39,7 +39,7 @@ module ActiveRecord
     end
 
     def has_many many, scope = nil, options = {}, &extension
-      unless scope.try(:[], :json_foreign_key) || options.try(:[], :json_foreign_key)
+      unless (scope.is_a?(Hash) && scope[:json_foreign_key]) || (options.is_a?(Hash) && options[:json_foreign_key])
         return super
       end
 

data/lib/active_record/json_associations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JsonAssociations
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

data/spec/json_associations_spec.rb

@@ -28,6 +28,11 @@ describe ActiveRecord::JsonAssociations do
 
     class Pet < ActiveRecord::Base
       has_many :parents, json_foreign_key: :fuzzy_ids
+
+      # ensure that regular .has_many invocations still work
+      has_many :fallback_parents
+      has_many :fallback_parents_with_options, class_name: "Pet"
+      has_many :fallback_parents_with_scope, -> { order(:id) }
     end
   end
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-json_associations
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord