active_record_to_hash 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dad42a17504338c73d8e8f5038c66f8bdc41f919884baa2cdf0a4bcd512c318
-  data.tar.gz: 60d9acd461a383b9c6129481fe8fddb4d09e6cd7e5f185cc480cb0b860876b68
+  metadata.gz: 1fa2aa0c803cdaa15448897462fd144eeb3c1465b1010767ff3693e0f8d1b237
+  data.tar.gz: 657ef30f57cb45c48adb334dac896d341211d8b68ae89f197ee88997282dad34
 SHA512:
-  metadata.gz: 5cce8d2eade4c9a502d25e15f04e97393573c9e8e7fea9ff3e65121254cc426a9b62d5523789064bee710ca1f788201363bd57196665b65076b372aa51ba2339
-  data.tar.gz: 3ddafabc332fa03629d9478c75dded7ae5a9768910c261455d5ae7934d26aae49983e63b99583d0b860bf9af2778f565ab571d192c4815040d4cdba7c2c34273
+  metadata.gz: d56deb1ac8c203ba63b6f0ad1afcef993f3af4dbe5d28a56dfe9f41825b3af69eb2850c815a986796ef9986d5958c516f3be0799a4097f8f84f32b7d3269ff62
+  data.tar.gz: 05efcbb527ebb3d8ad2d0aa7ce75e77c94305b99a857c349a2b7927e58f42fc5239afb55ffa43d430648192d03a9f3e202364b6ee0a76dd6fa3df82a05ddad7e

data/lib/active_record_to_hash/active_record.rb

@@ -23,6 +23,8 @@ module ActiveRecordToHash
 
         ActiveRecordToHash.handle_with_options(options) do |hash_key, attr_name, child_options|
           child = ActiveRecordToHash.retrieve_child_attribute(self, attr_name, child_options, __callee__)
+          next if child_options[:optional] == true && child.blank?
+
           result[hash_key] = ActiveRecordToHash.handle_alter(child, child_options)
         end
 

data/lib/active_record_to_hash/utilities.rb

@@ -20,7 +20,11 @@ module ActiveRecordToHash
   end
 
   def retrieve_child_attribute(record, attr_name, options, callee) # rubocop:disable Metrics/AbcSize
-    return options[:value] if options[:value]
+    if options.key?(:value)
+      return options[:value].call(record) if options[:value].is_a? Proc
+
+      return options[:value]
+    end
 
     args = options[:args] || []
     value = record.public_send(attr_name, *args)

data/lib/active_record_to_hash/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordToHash
-  VERSION = '1.0.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_to_hash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails