duck_record 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7d54969d15361adf50337c375c54e7a48ef472
-  data.tar.gz: feab9768812adce2d166a63494cb6aef69503eb9
+  metadata.gz: 50cfc614adaa1a3af48769d41305d88b4ace7149
+  data.tar.gz: ba8306b2ac4d88f8e7e69600e6398f6312132746
 SHA512:
-  metadata.gz: bc44187a1c2f6f1272461ded1dccf257f88cbeafc3ac8635ab09f79212cbfc661f8d5eebdb92e20aa80efdc5e1d575916ffc4fe0795418ae5f03a7f2cab677a8
-  data.tar.gz: 306114eb4f427c1acdc753484843a139eb8c2ad05ea73caccff8dda7167269e2630cf0a15147272d88dfc917aed88c9487fdcffa10a8b4edf4e0806ffb7d5cd8
+  metadata.gz: d8249209d1c8315953b4b5404b4f591bc9138a24d04fc4af0c9c8c7d75b277a827721b5a2431695baea747b3a0fffe1be460e814b979180853ab3c4f7255769d
+  data.tar.gz: f7a092d53c15c85a5938d6558f66d93c4b9f01d1db23e561b76fedfa764d2bfd054270fd622d987c6a740b0994ffa22063ab336c490bf943abef5e554d8acc17

data/lib/duck_record/serialization.rb

@@ -8,19 +8,18 @@ module DuckRecord #:nodoc:
       self.include_root_in_json = false
     end
 
-    def serializable_hash(options = nil)
-      options = options.try(:dup) || {}
-
-      options[:except] = Array(options[:except]).map(&:to_s)
-
-      super(options)
+    def serializable_hash(options = {})
+      options = (options || {}).reverse_merge except: Array(options[:except]).map(&:to_s)
+      super options
     end
 
     private
 
     def read_attribute_for_serialization(key)
       v = send(key)
-      if v.respond_to?(:to_ary)
+      if v.respond_to?(:serializable_hash)
+        v.serializable_hash
+      elsif v.respond_to?(:to_ary)
         v.to_ary
       elsif v.respond_to?(:to_hash)
         v.to_hash

data/lib/duck_record/version.rb

@@ -1,3 +1,3 @@
 module DuckRecord
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duck_record
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - jasl