structure 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49afeef61e56c6e3f65ad2eff0855af54552ee4dbcab2282a8d0194e30156362
-  data.tar.gz: 1b7889d683dd5a129d35446773729212ea0f1348958688e4520f98fab8d90e8f
+  metadata.gz: 3ecf2906322a2c0abaa86ab756c7154139788867b214ee5b30a071adf5e044ff
+  data.tar.gz: c36c7b4dfc5656a74b056c72af11ab478fc97886a1638312dd389d252e1977b3
 SHA512:
-  metadata.gz: 1c6ab2be186a6a1eec57cc1bdad3627cccbcd91c20ff803a69d789cd694568c128853431ccb14b7694980700ef95675555919e5e944bf5df54c13c11497c2a19
-  data.tar.gz: 6d942ea5cc6bb8d012c8c7245480f7bb66857fb30ec20d8afd948183c7c29220baa9129abca1f17037c4db62c159e6860fe0a82c6c837639741c5c9ccec43c7a
+  metadata.gz: f6bcd31e925af5a25bb65b9ee1b2c4eff4654b7fbce6e7110d3c89195744b5ed7f3564a33dcf0b0cf19a373df315d955637388ccad8f6fa19aa394b21234e1d5
+  data.tar.gz: 3707eb84b1b0e702f4e13cf90b9048a3858ed71b07e399d969db4e4e36523fa4e9860c38fbe0d33a4b11336fb2b9f7389d136e80fa4ed280cd0301297102de56

data/lib/structure/rbs.rb

@@ -66,7 +66,7 @@ module Structure
           lines << ""
 
           needs_parse_data = types.any? do |_attr, type|
-            type == :self || type == [:self] || (type.is_a?(Array) && type.first == :array)
+            type == :self || type == [:self]
           end
 
           if needs_parse_data
@@ -111,13 +111,7 @@ module Structure
         when [:self]
           "Array[#{class_name} | parse_data]"
         when Array
-          if type.first == :array && type.last == :self
-            "Array[#{class_name} | parse_data]"
-          elsif type.first == :array
-            # For [:array, SomeType] format, use Array[untyped] since we coerce
-            "Array[untyped]"
-          elsif type.size == 1 && type.first == :self
-            # [:self] is handled above, this shouldn't happen
+          if type.size == 1 && type.first == :self
             "Array[#{class_name} | parse_data]"
           elsif type.size == 1
             # Regular array type like [String], [Integer], etc.
@@ -136,16 +130,20 @@ module Structure
       def map_type_to_rbs(type, class_name)
         case type
         when Class
-          type.name || "untyped"
+          if type == Array
+            "Array[untyped]"
+          elsif type == Hash
+            "Hash[untyped, untyped]"
+          else
+            type.name || "untyped"
+          end
+
         when :boolean
           "bool"
         when :self
           class_name || "untyped"
         when Array
-          if type.size == 2 && type.first == :array
-            element_type = map_type_to_rbs(type.last, class_name)
-            "Array[#{element_type}]"
-          elsif type.size == 1
+          if type.size == 1
             # Single element array means array of that type
             element_type = map_type_to_rbs(type.first, class_name)
             "Array[#{element_type}]"

data/lib/structure/types.rb

@@ -36,20 +36,20 @@ module Structure
           self_referential
         when String
           string_class(type, context_class)
-        when Array
-          if type.length == 1
-            array(type.first, context_class)
-          else
-            type
-          end
+        when ->(t) { t.is_a?(Array) && t.length == 1 }
+          array(type.first, context_class)
+        when Hash
+          raise ArgumentError, "Cannot specify #{type.inspect} as type"
+        when ->(t) { t.respond_to?(:parse) }
+          parseable(type)
+        when ->(t) { t.respond_to?(:name) && t.name && Kernel.respond_to?(t.name) }
+          kernel(type)
+        when ->(t) { t.respond_to?(:call) }
+          type
+        when nil
+          type
         else
-          if type.respond_to?(:parse)
-            parseable(type)
-          elsif type.respond_to?(:name) && type.name && Kernel.respond_to?(type.name)
-            kernel(type)
-          else
-            type
-          end
+          raise ArgumentError, "Cannot specify #{type.inspect} as type"
         end
       end
 

data/lib/structure/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Structure
-  VERSION = "3.6.2"
+  VERSION = "3.6.3"
 end

data/lib/structure.rb

@@ -65,59 +65,57 @@ module Structure
         h
       end
 
-      # parse accepts JSON-ish hashes + kwargs override - using string eval to avoid closure capture
-      klass.singleton_class.class_eval(<<~RUBY)
-        def parse(data = {}, **kwargs)
-          return data if data.is_a?(self)
+      # parse accepts JSON-ish hashes + kwargs override
+      klass.singleton_class.define_method(:parse) do |data = {}, **kwargs|
+        return data if data.is_a?(self)
 
-          unless data.respond_to?(:merge!)
-            raise TypeError, "can't convert \#{data.class} into \#{self}"
-          end
-
-          # @type var kwargs: Hash[Symbol, untyped]
-          string_kwargs = kwargs.transform_keys(&:to_s)
-          data.merge!(string_kwargs)
-          # @type self: singleton(Data) & _StructuredDataClass
-          # @type var final: Hash[Symbol, untyped]
-          final = {}
-
-          # @type var meta: untyped
-          meta = __structure_meta__
+        unless data.respond_to?(:merge!)
+          raise TypeError, "can't convert #{data.class} into #{self}"
+        end
 
-          attributes = meta.fetch(:attributes)
-          defaults = meta.fetch(:defaults)
-          mappings = meta.fetch(:mappings)
-          coercions = meta.fetch(:coercions)
-          after = meta.fetch(:after)
+        # @type var kwargs: Hash[Symbol, untyped]
+        string_kwargs = kwargs.transform_keys(&:to_s)
+        data.merge!(string_kwargs)
+        # @type self: singleton(Data) & _StructuredDataClass
+        # @type var final: Hash[Symbol, untyped]
+        final = {}
+
+        # @type var meta: untyped
+        meta = __structure_meta__
+
+        attributes = meta.fetch(:attributes)
+        defaults = meta.fetch(:defaults)
+        mappings = meta.fetch(:mappings)
+        coercions = meta.fetch(:coercions)
+        after = meta.fetch(:after)
+
+        attributes.each do |attr|
+          source = mappings[attr] || attr.to_s
+          value =
+            if data.key?(source)            then data[source]
+            elsif data.key?(source.to_sym)  then data[source.to_sym]
+            elsif defaults.key?(attr) then defaults[attr]
+            end
 
-          attributes.each do |attr|
-            source = mappings[attr] || attr.to_s
+          coercion = coercions[attr]
+          if coercion && !value.nil?
+            # Procs (not lambdas) need class context for self-referential parsing
+            # Lambdas and other callables use direct invocation
             value =
-              if data.key?(source)            then data[source]
-              elsif data.key?(source.to_sym)  then data[source.to_sym]
-              elsif defaults.key?(attr) then defaults[attr]
+              if coercion.is_a?(Proc) && !coercion.lambda?
+                instance_exec(value, &coercion) # steep:ignore
+              else
+                coercion.call(value)
               end
-
-            coercion = coercions[attr]
-            if coercion && !value.nil?
-              # Procs (not lambdas) need class context for self-referential parsing
-              # Lambdas and other callables use direct invocation
-              value =
-                if coercion.is_a?(Proc) && !coercion.lambda?
-                  instance_exec(value, &coercion) # steep:ignore
-                else
-                  coercion.call(value)
-                end
-            end
-
-            final[attr] = value
           end
 
-          obj = new(**final)
-          after&.call(obj) if after
-          obj
+          final[attr] = value
         end
-      RUBY
+
+        obj = new(**final)
+        after&.call(obj)
+        obj
+      end
 
       klass
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structure
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - Hakan Ensari