structure 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c4c9274f8938bdb75aee48a480ea324b9167ea1bb6d27aff8f831908e4083bb
-  data.tar.gz: 9daeadaf79271deb8ea3469195081a6e7e3a318572bd4e1aa7997b2436223589
+  metadata.gz: 49afeef61e56c6e3f65ad2eff0855af54552ee4dbcab2282a8d0194e30156362
+  data.tar.gz: 1b7889d683dd5a129d35446773729212ea0f1348958688e4520f98fab8d90e8f
 SHA512:
-  metadata.gz: 29ebca3cdff8e8750284b8f1c88b9fd5201ed93b387b2aa8c81872669fce7e52d8496b14d3546fa35b878df87a10e2539aa96789d9a9f0a9589a2c0f5bcf0867
-  data.tar.gz: b176b7dad3f24d4bf54cf80d69dd115ccba5d75396e9d69ee319b09fee77460cf4f69348ade08a45bc6e07f836b8dc06b644c96548bf4e4efcb0ac8b29255fe5
+  metadata.gz: 1c6ab2be186a6a1eec57cc1bdad3627cccbcd91c20ff803a69d789cd694568c128853431ccb14b7694980700ef95675555919e5e944bf5df54c13c11497c2a19
+  data.tar.gz: 6d942ea5cc6bb8d012c8c7245480f7bb66857fb30ec20d8afd948183c7c29220baa9129abca1f17037c4db62c159e6860fe0a82c6c837639741c5c9ccec43c7a

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/types.rb

@@ -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.2"
 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) }
@@ -62,55 +65,59 @@ module Structure
         h
       end
 
-      # parse accepts JSON-ish hashes + kwargs override
-      klass.define_singleton_method(:parse) do |data = {}, **kwargs|
-        return data if data.is_a?(self)
+      # 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)
 
-        unless data.respond_to?(:merge!)
-          raise TypeError, "can't convert #{data.class} into #{self}"
-        end
+          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 = {}
-
-        # 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)
-
-        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
+          # @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)
 
-          coercion = coercions[attr]
-          if coercion && !value.nil?
-            # self-referential types need class context to call parse
+          attributes.each do |attr|
+            source = mappings[attr] || attr.to_s
             value =
-              if coercion.is_a?(Proc) && !coercion.lambda?
-                instance_exec(value, &coercion) # steep:ignore
-              else
-                coercion.call(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
+
+            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
 
-          final[attr] = value
+          obj = new(**final)
+          after&.call(obj) if after
+          obj
         end
-
-        obj = new(**final)
-        after&.call(obj)
-        obj
-      end
+      RUBY
 
       klass
     end

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.2
 platform: ruby
 authors:
 - Hakan Ensari