optify-from_hash 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1632ba5c0ae9ac2b6b30c9a60ba78b00cafb89ec15199fa7ba994e2d1fc90539
-  data.tar.gz: 9cd72e917b0688f61f5a0ec2d0d3ecb85f4939cdcd21b9a7bbdd494af67e9a93
+  metadata.gz: 04cdd079cbaa31083b4e495031c5532361a7be37a79cd39a78e039ec47cc9644
+  data.tar.gz: '085245e223204d83447610bbe9f8b0866294b665b6e5c49fdc23cbf24cff2add'
 SHA512:
-  metadata.gz: 9d17e0f0d1bd9e8f868b168fb90ce0edaf3de4445b11780c48e24f790ed10b98c455b1c489d085658313043a6e6e7c8773d9aa744bf5b64d4f9a7423547ad3ba
-  data.tar.gz: c903dc3d0ca0fe29ff6a8c3dd50e68e9c1d946d66b8fb96db1cdd45df9104f8994b5c661485e9430bf5f73819183e08a95873f3730e658feb6f9c1ee67b9502c
+  metadata.gz: 48a357c5882ca2533e4f77e0e01a3f9bd358cf35a8d7176c9a3f580a2e33ed1330343d21f6c0c1e9ba10eca62f1cca0d07a9b0196dfa2e32b3c9a5cb2e70e618
+  data.tar.gz: 7da7e93844a03c15b18ed9a211a387ce6a0fbd36a3e8ac1ad25d314ad3a09029f879a4def44616b583274641f94d258a982be91879652a355f908204bff88609

data/lib/optify_from_hash/from_hashable.rb

@@ -101,6 +101,8 @@ module Optify
       unwrapped_type = _unwrap_nilable(type)
       return value&.to_sym if unwrapped_type.is_a?(T::Types::Simple) && unwrapped_type.raw_type == Symbol
 
+      value = _convert_string(value, unwrapped_type)
+
       case value
       when Array
         return _convert_array(value, unwrapped_type)
@@ -138,21 +140,18 @@ module Optify
         # The hash should be a hash, but the values might be objects to convert.
         type_for_keys = type.keys
         type_for_values = type.values
-        type_for_keys_allows_string = _type_allows_string?(type_for_keys)
-        type_for_values_allows_string = _type_allows_string?(type_for_values)
 
         return hash.each_with_object(Hash.new(capacity: hash.size)) do |(k, v), result|
-          result[_convert_typed_hash_value(k, type_for_keys, type_for_keys_allows_string)] =
-            _convert_typed_hash_value(v, type_for_values, type_for_values_allows_string)
+          result[_convert_value(k, type_for_keys)] = _convert_value(v, type_for_values)
         end
       end
 
       raise TypeError, "Could not convert hash #{hash} to `#{type}`."
     end
 
-    #: (untyped, T::Types::Base, bool) -> untyped
-    private_class_method def self._convert_typed_hash_value(value, type, type_allows_string) # rubocop:disable Metrics/PerceivedComplexity
-      return _convert_value(value, type) if type_allows_string || !value.is_a?(String)
+    #: (untyped, T::Types::Base) -> untyped
+    private_class_method def self._convert_string(value, type) # rubocop:disable Metrics/PerceivedComplexity
+      return value if !value.is_a?(String) || _type_allows_string?(type)
 
       value_type = if type.respond_to?(:raw_type)
                      type #: as untyped
@@ -163,7 +162,7 @@ module Optify
       if type.respond_to?(:types)
         type #: as untyped
           .types.each do |inner_type|
-          return _convert_typed_hash_value(value, inner_type, _type_allows_string?(inner_type))
+          return _convert_string(value, inner_type)
         rescue TypeError, ArgumentError
           # Ignore and try the next type.
         end
@@ -171,7 +170,7 @@ module Optify
 
       return value_type.deserialize(value) if value_type && value_type != String && value_type.respond_to?(:deserialize)
 
-      _convert_value(value, type)
+      value
     end
 
     #: (T::Types::Base) -> bool
@@ -197,7 +196,7 @@ module Optify
     private_class_method def self._unwrap_nilable(type)
       if type.respond_to?(:unwrap_nilable)
         type #: as untyped
-          .unwrap_nilable
+          .unwrap_nilable || type
       else
         type
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optify-from_hash
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin D. Harris