optify-from_hash 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82bb6b8ae57bd5981e5858b9a91648d9a3f07a3b5d0e0122d775424e0784253
-  data.tar.gz: de084f1add61ca7a2c036600e78c771757e0bf966b7face1458e2fcc4667bbc0
+  metadata.gz: 1632ba5c0ae9ac2b6b30c9a60ba78b00cafb89ec15199fa7ba994e2d1fc90539
+  data.tar.gz: 9cd72e917b0688f61f5a0ec2d0d3ecb85f4939cdcd21b9a7bbdd494af67e9a93
 SHA512:
-  metadata.gz: f9f75938b15ea45a739f2f68c643737f4d0cbb39141075b412f131497efa2caaad8b2b85cabf2b5b0f10d8313e0281de6e9a18d9d6bc32fee74b827b4f394f52
-  data.tar.gz: 60985b018e36d3efcdeb66ace9fe4e473ca49115c57d8f6cffe04bf61cf210fd5eaec02504a64acad3ea88a1fa927bfc08914df6fae1029a8b9b3e0c6837bc8d
+  metadata.gz: 9d17e0f0d1bd9e8f868b168fb90ce0edaf3de4445b11780c48e24f790ed10b98c455b1c489d085658313043a6e6e7c8773d9aa744bf5b64d4f9a7423547ad3ba
+  data.tar.gz: c903dc3d0ca0fe29ff6a8c3dd50e68e9c1d946d66b8fb96db1cdd45df9104f8994b5c661485e9430bf5f73819183e08a95873f3730e658feb6f9c1ee67b9502c

data/lib/optify_from_hash/from_hashable.rb

@@ -4,7 +4,6 @@
 require 'json'
 require 'set'
 require 'sorbet-runtime'
-require 'tapioca'
 
 module Optify
   # A base class for classes that can be created from a hash.
@@ -139,16 +138,58 @@ 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)
 
-        result = hash
-                 .transform_values { |v| _convert_value(v, 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)
+        end
+      end
+
+      raise TypeError, "Could not convert hash #{hash} to `#{type}`."
+    end
 
-        return result.transform_keys!(&:to_sym) if type_for_keys.is_a?(T::Types::Simple) && type_for_keys.raw_type == Symbol
+    #: (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)
 
-        return result
+      value_type = if type.respond_to?(:raw_type)
+                     type #: as untyped
+                       .raw_type
+                   end
+      return value.to_sym if value_type == Symbol
+
+      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))
+        rescue TypeError, ArgumentError
+          # Ignore and try the next type.
+        end
       end
 
-      raise TypeError, "Could not convert hash #{hash} to `#{type}`."
+      return value_type.deserialize(value) if value_type && value_type != String && value_type.respond_to?(:deserialize)
+
+      _convert_value(value, type)
+    end
+
+    #: (T::Types::Base) -> bool
+    private_class_method def self._type_allows_string?(type)
+      if type.respond_to?(:raw_type)
+        value_type = type #: as untyped
+                     .raw_type
+        return true if value_type == String
+      end
+
+      if type.respond_to?(:types)
+        type #: as untyped
+          .types.each do |value_type|
+          return true if _type_allows_string?(value_type)
+        end
+      end
+
+      false
     end
 
     # Unwrap `T.nilable(...)` to get the inner type, or return the type as-is.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optify-from_hash
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin D. Harris
@@ -91,6 +91,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: enummify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement