active_serialize 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c37b91e388b4825a96e1054e39d9c3df6bf98a50
-  data.tar.gz: 37c32696a41aa300b79ab9119a9d5e697b71ff0d
+  metadata.gz: 367ae37d7d28d38e8b6ad1a449590ddb72b42a94
+  data.tar.gz: 527f9f6c0bbbb718aa4c88229088237918429465
 SHA512:
-  metadata.gz: 9f3b807ed104b10aeb173193cb34de6d6d4bf9255c6c790fdc3882694af04720187bd60e5e61d19ed1623b1cb153d15d317b8c425daf027edee5d44d87765cee
-  data.tar.gz: 788348b34876bdf18be7dbd59d02f081f88ad36ad9dbe10da56a1797d077ba47ddba65a2f8f575296cb1c080554f078f74c74c41b71084f8fa97e35bd43443ea
+  metadata.gz: 0cea92163449a43f483e950a4df97bafbdcd351a2851cfe0cec9be18f6d7a18fc8c258e2f595d656ca65b170f61647b8ffbfc40bd1fd33973cd1d9f509643622
+  data.tar.gz: 2b9c1d407792742d64270a95c79bdda36690c5605cf3d00e05a2e80465ab644df05b8470cf67969ae56967435ba24087a6e33b69fd0a1673a415b004f7b000c8

data/lib/active_serialize/class_methods.rb

@@ -28,10 +28,12 @@ module ActiveSerialize
       _active_serialize[:map].merge! settings
     end
 
-    def active_serialize_keys(*groups, rmv: [ ], add: [ ])
+    def active_serialize_keys(*groups, rmv: [ ], add: [ ], only: nil, **opts)
+      return only if only
       _active_serialize[:final] ||= column_names.map(&:to_sym) - _active_serialize[:rmv] + _active_serialize[:add]
-      _active_serialize[:final] - Array(rmv) + Array(add) +
+      result = _active_serialize[:final] - Array(rmv) + Array(add) +
           _active_serialize[:groups].values_at(*groups).flatten.compact.uniq
+      opts[:if] ? { normal: result, if: opts[:if] } : result
     end
   end
 end

data/lib/active_serialize/version.rb

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

data/lib/active_serialize.rb

@@ -31,13 +31,19 @@ module ActiveSerialize
   end
 
   module ToH
-    def to_h(*groups, rmv: [ ], add: [ ], flat_add: [ ], recursive: [ ], plucked: { }, merge: { })
+    def to_h(*groups, rmv: [ ], add: [ ], flat_add: [ ], recursive: [ ], plucked: { }, merge: { }, **opts)
       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?
+      keys = active_serialize_keys(*groups, rmv: rmv, add: add, **opts)
+      if keys.is_a?(Hash) && instance_exec(&keys[:if].first)
+        keys = keys[:if].last[:only] ||
+            keys[:normal] + (keys[:if].last[:add] || [ ]) - (keys[:if].last[:rmv] || [ ])
+      else
+        keys = keys[:normal]
+      end
 
       KeyFormatter.(_active_serialize[:key_format],
-          active_serialize_keys(*groups, rmv: rmv, add: add)
-              .map { |key| [ key, public_send(key) ] }.to_h
+          keys.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!

metadata

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