active_serialize 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9b2859163166929c779368b00c17271635964c
-  data.tar.gz: 6ecb6dc7d235f89b2e95eaf382c84b72cc6dfc0e
+  metadata.gz: c37b91e388b4825a96e1054e39d9c3df6bf98a50
+  data.tar.gz: 37c32696a41aa300b79ab9119a9d5e697b71ff0d
 SHA512:
-  metadata.gz: 192b5263921799f1a0acaa837a006b780a9939572d67d8cf3cec783b549358bc122276776668f988f3cf8e5f1b186c8e21358608b85ff24ea6a0a8a551f321ed
-  data.tar.gz: 8036dd8ceb1d21917b6e282c27fc512cce92e3717774d032e04eca05da97d206e2ad91eade924a250f7957d9224c90c93ef4126d2953ffcbc9b55c373642c9b5
+  metadata.gz: 9f3b807ed104b10aeb173193cb34de6d6d4bf9255c6c790fdc3882694af04720187bd60e5e61d19ed1623b1cb153d15d317b8c425daf027edee5d44d87765cee
+  data.tar.gz: 788348b34876bdf18be7dbd59d02f081f88ad36ad9dbe10da56a1797d077ba47ddba65a2f8f575296cb1c080554f078f74c74c41b71084f8fa97e35bd43443ea

data/lib/active_serialize.rb

@@ -31,14 +31,16 @@ module ActiveSerialize
   end
 
   module ToH
-    def to_h(*groups, rmv: [ ], add: [ ], recursive: [ ], plucked: { }, merge: { })
-      tran_key  = ->(key) { (_active_serialize[:map][key] || key).to_s }
-      recursion = (_active_serialize[:recursive] + recursive).map { |k| [ k, public_send(k)&.to_ha ] }.to_h
+    def to_h(*groups, rmv: [ ], add: [ ], flat_add: [ ], recursive: [ ], plucked: { }, merge: { })
+      recursion = (_active_serialize[:recursive] + recursive).map { |k| [ k, public_send(k)&.to_ha(*groups) ] }.to_h
+      merge.merge!(flat_add.map(&method(:public_send)).reduce({ }, :merge)) if flat_add.present?
 
       KeyFormatter.(_active_serialize[:key_format],
           active_serialize_keys(*groups, rmv: rmv, add: add)
-              .map{ |key| [ tran_key.(key), public_send(key) ] }.to_h
-              .merge(plucked.merge(recursion).merge(merge).transform_keys(&tran_key))
+              .map { |key| [ key, public_send(key) ] }.to_h
+              .merge(plucked).merge(recursion).merge(merge)
+              .transform_keys { |key| _active_serialize[:map][key] || key }
+              .deep_stringify_keys!
       )
     end
 

data/lib/active_serialize/relation.rb

@@ -2,20 +2,20 @@
 
 module ActiveSerialize
   module Relation
-    def to_ha(pluck: [ ], plucked: nil, **args)
+    def to_ha(*groups, pluck: [ ], plucked: nil, **args)
       plucked ||=
           if pluck.is_a?(Proc)
             instance_eval(&pluck)
           else
-            (_active_serialize[:pluck] + pluck).map { |key| [ key, instance_eval(&method(key)) ] }.to_h
+            (_active_serialize[:pluck] + pluck).uniq.map { |key| [ key, instance_eval(&method(key)) ] }.to_h
           end
 
       if plucked.present?
         each_with_index.map do |record, i|
-          record.to_h(plucked: plucked.each_key.map { |k| [ k, plucked[k][i] ] }.to_h, **args)
+          record.to_h(*groups, plucked: plucked.each_key.map { |k| [ k, plucked[k][i] ] }.to_h, **args)
         end
       else
-        map { |record| record.to_h(**args) }
+        map { |record| record.to_h(*groups, **args) }
       end
     end
 

data/lib/active_serialize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveSerialize
-  VERSION = '2.4.0'
+  VERSION = '2.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_serialize
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler