active_serialize 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 367ae37d7d28d38e8b6ad1a449590ddb72b42a94
-  data.tar.gz: 527f9f6c0bbbb718aa4c88229088237918429465
+  metadata.gz: f0a81eb1f2145ece2d057636e2021baad5dd37c7
+  data.tar.gz: 4bb5c2a4768d42f7f4eee7475c66c7e7d0e99085
 SHA512:
-  metadata.gz: 0cea92163449a43f483e950a4df97bafbdcd351a2851cfe0cec9be18f6d7a18fc8c258e2f595d656ca65b170f61647b8ffbfc40bd1fd33973cd1d9f509643622
-  data.tar.gz: 2b9c1d407792742d64270a95c79bdda36690c5605cf3d00e05a2e80465ab644df05b8470cf67969ae56967435ba24087a6e33b69fd0a1673a415b004f7b000c8
+  metadata.gz: b7ecff72c8e297875b1f305039d8ea2e99ea42180075242e7a91a0b7b030624e2105c50617904648636d2c9c6d6b190f2ed307277dd9b1b37959fe260563195f
+  data.tar.gz: 58abc1ca68a47f01d1e790aacdf4076e5bfa8700572f640a7e42edf9ac521c26476b2bb29514db4c9b0613554f3fa460cb28fa3973c67149152942802ec13705

data/lib/active_serialize.rb

@@ -35,12 +35,10 @@ module ActiveSerialize
       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
+      instance_exec(&keys[:if].first) \
+          ? keys[:if].last[:only] || keys[:normal] + (keys[:if].last[:add] || [ ]) - (keys[:if].last[:rmv] || [ ])
+          : keys[:normal] \
+          if keys.is_a?(Hash)
 
       KeyFormatter.(_active_serialize[:key_format],
           keys.map { |key| [ key, public_send(key) ] }.to_h

data/lib/active_serialize/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_serialize
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - zhandao