structure 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c4c9274f8938bdb75aee48a480ea324b9167ea1bb6d27aff8f831908e4083bb
-  data.tar.gz: 9daeadaf79271deb8ea3469195081a6e7e3a318572bd4e1aa7997b2436223589
+  metadata.gz: 3ecf2906322a2c0abaa86ab756c7154139788867b214ee5b30a071adf5e044ff
+  data.tar.gz: c36c7b4dfc5656a74b056c72af11ab478fc97886a1638312dd389d252e1977b3
 SHA512:
-  metadata.gz: 29ebca3cdff8e8750284b8f1c88b9fd5201ed93b387b2aa8c81872669fce7e52d8496b14d3546fa35b878df87a10e2539aa96789d9a9f0a9589a2c0f5bcf0867
-  data.tar.gz: b176b7dad3f24d4bf54cf80d69dd115ccba5d75396e9d69ee319b09fee77460cf4f69348ade08a45bc6e07f836b8dc06b644c96548bf4e4efcb0ac8b29255fe5
+  metadata.gz: f6bcd31e925af5a25bb65b9ee1b2c4eff4654b7fbce6e7110d3c89195744b5ed7f3564a33dcf0b0cf19a373df315d955637388ccad8f6fa19aa394b21234e1d5
+  data.tar.gz: 3707eb84b1b0e702f4e13cf90b9048a3858ed71b07e399d969db4e4e36523fa4e9860c38fbe0d33a4b11336fb2b9f7389d136e80fa4ed280cd0301297102de56

data/lib/structure/builder.rb

@@ -69,7 +69,7 @@ module Structure
         if type == :boolean
           ["#{name}?".to_sym, name] unless name.to_s.end_with?("?")
         end
-      end.compact.to_h
+      end.to_h
     end
   end
 end

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
 
@@ -75,7 +75,7 @@ module Structure
       private
 
       def boolean
-        @boolean ||= ->(val) { BOOLEAN_TRUTHY.include?(val) }
+        ->(val) { BOOLEAN_TRUTHY.include?(val) }
       end
 
       def self_referential
@@ -92,8 +92,15 @@ module Structure
 
       def string_class(class_name, context_class)
         resolved_class = nil
+        mutex = Mutex.new
+
         proc do |value|
-          resolved_class ||= Structure::Types.resolve_class(class_name, context_class)
+          unless resolved_class
+            mutex.synchronize do
+              resolved_class ||= Structure::Types.resolve_class(class_name, context_class)
+            end
+          end
+
           if resolved_class.respond_to?(:parse)
             resolved_class.parse(value) # steep:ignore
           else

data/lib/structure/version.rb

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

data/lib/structure.rb

@@ -26,21 +26,24 @@ module Structure
       # @type var klass: untyped
       klass = Data.define(*builder.attributes)
 
-      # capture metadata and attach to class
+      # capture all metadata and attach to class - no closure capture needed
+      mappings = builder.mappings
+      coercions = builder.coercions(klass)
+      predicates = builder.predicate_methods
+      after = builder.after_parse_callback
+
       meta = {
         attributes: builder.attributes.freeze,
         types: builder.types.freeze,
         defaults: builder.defaults.freeze,
+        mappings: mappings.freeze,
+        coercions: coercions.freeze,
+        predicates: predicates.freeze,
+        after: after,
       }.freeze
       klass.instance_variable_set(:@__structure_meta__, meta)
       klass.singleton_class.attr_reader(:__structure_meta__)
 
-      # capture locals for method generation
-      mappings = builder.mappings
-      coercions = builder.coercions(klass)
-      predicates = builder.predicate_methods
-      after = builder.after_parse_callback
-
       # Define predicate methods
       predicates.each do |pred, attr|
         klass.define_method(pred) { !!public_send(attr) }
@@ -63,7 +66,7 @@ module Structure
       end
 
       # parse accepts JSON-ish hashes + kwargs override
-      klass.define_singleton_method(:parse) do |data = {}, **kwargs|
+      klass.singleton_class.define_method(:parse) do |data = {}, **kwargs|
         return data if data.is_a?(self)
 
         unless data.respond_to?(:merge!)
@@ -77,13 +80,14 @@ module Structure
         # @type var final: Hash[Symbol, untyped]
         final = {}
 
-        # TODO: `__structure_meta__` exists but seems not to return the types it defines, so going untyped for now
-        #
         # @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
@@ -95,7 +99,8 @@ module Structure
 
           coercion = coercions[attr]
           if coercion && !value.nil?
-            # self-referential types need class context to call parse
+            # 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

data/sig/structure.rbs

@@ -3,9 +3,12 @@ module Structure
     def __structure_meta__: () -> {
       attributes: Array[Symbol],
       types: Hash[Symbol, untyped],
-      defaults: Hash[Symbol, untyped]
+      defaults: Hash[Symbol, untyped],
+      mappings: Hash[Symbol, String],
+      coercions: Hash[Symbol, untyped],
+      predicates: Hash[Symbol, Symbol],
+      after: untyped
     }
-    def parse: (?Hash[String | Symbol, untyped] data, **untyped kwargs) -> instance
   end
 
   def self.new: () ?{ (Structure::Builder) [self: Structure::Builder] -> void } -> untyped

metadata

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