optify-from_hash 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab3e37acc0afa16b17fbfb4bcbbf95e31b38d75c321d3d3d3a9a9f8a9fb7afb5
-  data.tar.gz: b087d7433c8329a6e62262d129f80cd538dae2459337e619ad2ab760df21bbc5
+  metadata.gz: 1f6e409cfccf83b515e84d3cc19713e1897ed53cf4340d66de2843433c355445
+  data.tar.gz: 630ed4471403551570ba2f18d3ec687ba4790dec90332496d6f9d39100f353f5
 SHA512:
-  metadata.gz: 968c5aa5b223c043a8558f5e2ac2b4cf8efb7925ed408bf6dffc458734a51a6da0d4b85e781688354b8432c0b6307067c4102521f7792d801859a1a80bdf391c
-  data.tar.gz: 57b11b0707b45887e544ad8d32286e0780a37d89f1fc87ea293139ed13a26140e2cde81cf1afe534827e4c9be69e6a3c5812b236b2ed5fd6438e73e1985ed206
+  metadata.gz: b9414cd9843a25f5b1ed1ab7f1560d5e73c0f85b3900859daa786c03f02bfd04dbc4947120bf519c8ff5f80b3712947b3b53a20c778b1e8e354c259b7c266e19
+  data.tar.gz: de4275bb6b2300dfa3e154dbc04ec49120d28ec3f20e17e537c51e1cde5a065772eaad10269abdeb8fa7a528043b376a49d2c2655d810b47373137f322a39fdc

data/lib/optify_from_hash/from_hashable.rb

@@ -14,7 +14,6 @@ module Optify
 
     # Create a new immutable instance of the class from a hash.
     #
-    # This is a class method so that it can set members with private setters.
     # @param hash The hash to create the instance from.
     # @return The new instance.
     #: (Hash[untyped, untyped]) -> instance
@@ -40,20 +39,20 @@ module Optify
       instance.freeze
     end
 
-    #: (untyped, untyped) -> untyped
+    #: (untyped, T::Types::Base) -> 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
 
-      return value.to_sym if type.is_a?(T::Types::Simple) && type.raw_type == Symbol
+      unwrapped_type = _unwrap_nilable(type)
+      return value&.to_sym if unwrapped_type.is_a?(T::Types::Simple) && unwrapped_type.raw_type == Symbol
 
       case value
       when Array
-        # Handle `T.nilable(T::Array[...])`
-        type = type.unwrap_nilable if type.respond_to?(:unwrap_nilable)
-        inner_type = type.type
+        inner_type = unwrapped_type #: as untyped
+                     .type
         return value.map { |v| _convert_value(v, inner_type) }.freeze
       when Hash
         # Handle `T.nilable(T::Hash[...])` and `T.any(...)`.
@@ -61,7 +60,8 @@ module Optify
         # `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|
+          type #: as untyped
+            .types.each do |t|
             return _convert_hash(value, t).freeze
           rescue StandardError
             # Ignore and try the next type.
@@ -76,12 +76,13 @@ module Optify
       value
     end
 
-    #: (Hash[untyped, untyped], untyped) -> untyped
+    #: (Hash[untyped, untyped], T::Types::Base) -> untyped
     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
+        type_for_hash = type #: as untyped
+                        .raw_type
         return type_for_hash.from_hash(hash) if type_for_hash.respond_to?(:from_hash)
       elsif type.is_a?(T::Types::TypedHash)
         # The hash should be a hash, but the values might be objects to convert.
@@ -100,7 +101,18 @@ module Optify
       raise TypeError, "Could not convert hash #{hash} to `#{type}`."
     end
 
-    private_class_method :_convert_hash, :_convert_value
+    # Unwrap `T.nilable(...)` to get the inner type, or return the type as-is.
+    #: (T::Types::Base) -> T::Types::Base
+    def self._unwrap_nilable(type)
+      if type.respond_to?(:unwrap_nilable)
+        type #: as untyped
+          .unwrap_nilable
+      else
+        type
+      end
+    end
+
+    private_class_method :_convert_hash, :_convert_value, :_unwrap_nilable
 
     # Compare this object with another object for equality.
     # @param other The object to compare.
@@ -116,9 +128,9 @@ module Optify
     end
 
     # Convert this object to a JSON string.
-    #: (*untyped) -> String
-    def to_json(*args)
-      to_h.to_json(args)
+    #: (?JSON::State?) -> String
+    def to_json(state = nil)
+      to_h.to_json(state)
     end
 
     # Convert this object to a Hash recursively.
@@ -134,21 +146,19 @@ module Optify
         # Remove the @ prefix to get the method name
         method_name = var_name.to_s[1..] #: as !nil
         value = instance_variable_get(var_name)
-        result[method_name.to_sym] = _convert_value_to_hash(value)
+        result[method_name.to_sym] = self.class.send(:_convert_value_for_to_h, value)
       end
 
       result
     end
 
-    private
-
     #: (untyped) -> untyped
-    def _convert_value_to_hash(value)
+    def self._convert_value_for_to_h(value)
       case value
       when Array
-        value.map { |v| _convert_value_to_hash(v) }
+        value.map { |v| _convert_value_for_to_h(v) }
       when Hash
-        value.transform_values { |v| _convert_value_to_hash(v) }
+        value.transform_values { |v| _convert_value_for_to_h(v) }
       when nil
         nil
       else
@@ -159,5 +169,7 @@ module Optify
         end
       end
     end
+
+    private_class_method :_convert_value_for_to_h
   end
 end

data/rbi/optify_from_hash.rbi

@@ -9,15 +9,14 @@ module Optify
 
     # Create a new instance of the class from a hash.
     #
-    # This is a class method that so that it can set members with private setters.
     # @param hash The hash to create the instance from.
     # @return The new instance.
     sig { params(hash: T::Hash[T.untyped, T.untyped]).returns(T.attached_class) }
     def self.from_hash(hash); end
 
     # Convert this object to a JSON string.
-    sig { params(args: T.untyped).returns(String) }
-    def to_json(*args); end
+    sig { params(state: T.nilable(JSON::State)).returns(String) }
+    def to_json(state = nil); end
 
     # Convert this object to a Hash recursively.
     # This is mostly the reverse operation of `from_hash`,

data/sig/optify_from_hash.rbs

@@ -6,13 +6,12 @@ end
 class Optify::FromHashable
   # Create a new instance of the class from a hash.
   #
-  # This is a class method that so that it can set members with private setters.
   # @param hash The hash to create the instance from.
   # @return The new instance.
   def self.from_hash: (::Hash[untyped, untyped] hash) -> instance
 
   # Convert this object to a JSON string.
-  def to_json: (*untyped args) -> String
+  def to_json: (?JSON::State? state) -> String
 
   # Convert this object to a Hash recursively.
   # This is mostly the reverse operation of `from_hash`,

metadata

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