optify-config 1.2.1-aarch64-linux → 1.3.0-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1491a366fbde27577442974f75571b4511a496dda599618d1e6521049f7018d2
-  data.tar.gz: 49872bd6f3c1602ca9410109fb2b93860cce7e9fd29b5605758293cbeb7659cc
+  metadata.gz: 034ea3406d9abddf721a9bf996e316c237bffb8d1a3a4c60dd6cfcf11d810256
+  data.tar.gz: 8d295a6002b969dac15b2621c3ee5b092450067fd3710c80e910b09b143991f6
 SHA512:
-  metadata.gz: e4dbcd831671624bd0453867bce599e3e25c7cad4401d9c31dfd9db4ba83a79a965314c61d701b554168b913ce9a27dc49ea0efb81b79f8575f363f732d5e822
-  data.tar.gz: b2f49cbfd890cd88d27aa483502b9bfa97c2f2173ea786d5c27b32e89e741d61a41aa4fc2447d3d25095150409c0c313c4500904e6abf859fe8331854cb5a569
+  metadata.gz: 1ec9a5b790be0fb4153bfc49d7d9afb17182bf240eac27e8378e88f8b16e10c05f1f87b311460e2464a7cc72ee53f7f84a93063a1b85c6f0c204880938d316f5
+  data.tar.gz: 175d1586630d1766ed03b3399447734a0778c77da584ac9e19488b6e64e38f7662f50ceef319a9d44594b060d8a41ddf129110e9924b356088e57e5efb1a192f

data/lib/optify_ruby/base_config.rb

@@ -23,19 +23,24 @@ module Optify
     # @return The new instance.
     #: (Hash[untyped, untyped] hash) -> instance
     def self.from_hash(hash)
-      result = new
+      instance = new
 
       hash.each do |key, value|
         sig_return_type = T::Utils.signature_for_method(instance_method(key)).return_type
         value = _convert_value(value, sig_return_type)
-        result.instance_variable_set("@#{key}", value)
+        instance.instance_variable_set("@#{key}", value)
       end
 
-      T.unsafe(result).freeze if T.unsafe(result).respond_to?(:freeze)
+      instance.freeze
     end
 
     #: (untyped value, untyped type) -> untyped
     def self._convert_value(value, type)
+      if type.is_a?(T::Types::Untyped)
+        # No preferred type is given, so return the value as is.
+        return value
+      end
+
       case value
       when Array
         # Handle `T.nilable(T::Array[...])`
@@ -43,39 +48,50 @@ module Optify
         inner_type = type.type
         return value.map { |v| _convert_value(v, inner_type) }.freeze
       when Hash
-        # Handle `T.nilable(T::Hash[...])`
-        type = type.unwrap_nilable if type.respond_to?(:unwrap_nilable)
+        # Handle `T.nilable(T::Hash[...])` and `T.any(...)`.
+        # We used to use `type = type.unwrap_nilable if type.respond_to?(:unwrap_nilable)`, but it's not needed now that we handle `T.any(...)`
+        # because using `.types` works for both cases.
+        if type.respond_to?(:types)
+          # Find a type that works for the hash.
+          type.types.each do |t|
+            return _convert_hash(value, t).freeze
+          rescue StandardError
+            # Ignore and try the next type.
+          end
+          raise TypeError, "Could not convert hash: #{value} to #{type}."
+        end
         return _convert_hash(value, type).freeze
       end
 
+      # It would be nice to validate that the value is of the correct type here.
+      # For example that a string is a string and an Integer is an Integer.
       value
     end
 
     #: (Hash[untyped, untyped] hash, untyped type) -> untyped
-    def self._convert_hash(hash, type) # rubocop:disable Metrics/PerceivedComplexity
+    def self._convert_hash(hash, type)
       if type.respond_to?(:raw_type)
         # There is an object for the hash.
+        # It could be a custom class, a String, or maybe something else.
         type_for_hash = type.raw_type
         return type_for_hash.from_hash(hash) if type_for_hash.respond_to?(:from_hash)
-      elsif type.instance_of?(T::Types::TypedHash)
+      elsif type.is_a?(T::Types::TypedHash)
         # The hash should be a hash, but the values might be objects to convert.
         type_for_values = type.values
 
         if type_for_values.respond_to?(:raw_type)
-          raw_type_for_values = type_for_values.raw_type
+          raw_type_for_values = T.unsafe(type_for_values).raw_type
           if raw_type_for_values.respond_to?(:from_hash)
             # Use proper types.
             return hash.transform_values { |v| raw_type_for_values.from_hash(v) }
           end
         end
 
-        # The values are not recognized objects.
+        # The values are not specific recognized objects.
         return hash.transform_values { |v| _convert_value(v, type_for_values) }
       end
 
-      # Fallback to doing nothing.
-      # This can happen if there are is no type information for a key in the hash.
-      hash
+      raise TypeError, "Could not convert hash #{hash} to `#{type}`."
     end
 
     private_class_method :_convert_hash, :_convert_value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optify-config
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: aarch64-linux
 authors:
 - Justin D. Harris
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-25 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime