structure 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69015a521f4a1a35438cd69d0d195e8f0fa276156d64371c8a6437030b14caf0
-  data.tar.gz: d4e5c263a7c92ae2bfbdbe5213b933c55ea1a8f0c9a8d6583302f8c032bb69a9
+  metadata.gz: 5f6aed363a91e514906a1c005fe2af6ec3583fa8742f997055def47e1f085c0c
+  data.tar.gz: 574b02c68a6a84f98384d9ba60c8b2d88b95c2cb3db49aa2eccb61e3e1dfc9ab
 SHA512:
-  metadata.gz: 1e8ace0197fb9b9cd4811cc1eb7774fe98eff67df140400b567a0a636b9bdabcf2e7858586a7b13f96fbc95e101e2eef74518d9940b1f7c4dab168fec119fb3e
-  data.tar.gz: 9d7fa653f6b4aeb60b10bfca4a940677bee89c6803a8e50d893e9dc0ce687306691bbb6f92f4af0a59c89245c3583e8b6d64f477d27b44b71f0f1b7fc359bb26
+  metadata.gz: 0a73835caa30f00145df491efd1bbcedbb2a7ada0cd0b2328cc8c0d9004bd51607328883630529165e9863a9852df40e17414854133a1d1d0144f690e49a50ef
+  data.tar.gz: ecb9bc59302300646d8dad3ea1345aecf236aec833e35cf1c83cedbfe5de5369c87965f3877d93e952cbf3536ff603fea2564032a07dba3db77c9872a4d46318

data/lib/structure/builder.rb

@@ -60,8 +60,8 @@ module Structure
       @mappings.keys
     end
 
-    def coercions
-      @types.transform_values { |type| Types.coerce(type) }
+    def coercions(context_class = nil)
+      @types.transform_values { |type| Types.coerce(type, context_class) }
     end
 
     def predicate_methods

data/lib/structure/types.rb

@@ -11,7 +11,7 @@ module Structure
 
       # Main factory method for creating type coercers
       #
-      # @param type [Class, Symbol, Array] Type specification
+      # @param type [Class, Symbol, Array, String] Type specification
       # @return [Proc, Object] Coercion proc or the type itself if no coercion available
       #
       # @example Boolean type
@@ -25,15 +25,20 @@ module Structure
       #
       # @example Array types
       #   coerce([String]) # => proc that coerces array elements to String
-      def coerce(type)
+      #
+      # @example String class name (lazy resolved)
+      #   coerce("MyClass") # => proc that resolves and coerces to MyClass
+      def coerce(type, context_class = nil)
         case type
         when :boolean
           boolean
         when :self
           self_referential
+        when String
+          string_class(type, context_class)
         when Array
           if type.length == 1
-            array(type.first)
+            array(type.first, context_class)
           else
             type
           end
@@ -48,6 +53,25 @@ module Structure
         end
       end
 
+      def resolve_class(class_name, context_class)
+        if context_class && defined?(context_class.name)
+          namespace = context_class.name.to_s.split("::")[0...-1]
+          if namespace.any?
+            begin
+              namespace.reduce(Object) { |mod, name| mod.const_get(name) }.const_get(class_name)
+            rescue NameError
+              Object.const_get(class_name)
+            end
+          else
+            Object.const_get(class_name)
+          end
+        else
+          Object.const_get(class_name)
+        end
+      rescue NameError => e
+        raise NameError, "Unable to resolve class '#{class_name}': #{e.message}"
+      end
+
       private
 
       def boolean
@@ -66,7 +90,19 @@ module Structure
         ->(val) { type.parse(val) }
       end
 
-      def array(element_type)
+      def string_class(class_name, context_class)
+        resolved_class = nil
+        proc do |value|
+          resolved_class ||= Structure::Types.resolve_class(class_name, context_class)
+          if resolved_class.respond_to?(:parse)
+            resolved_class.parse(value) # steep:ignore
+          else
+            value
+          end
+        end
+      end
+
+      def array(element_type, context_class = nil)
         if element_type == :self
           proc do |value|
             unless value.respond_to?(:map)
@@ -75,8 +111,23 @@ module Structure
 
             value.map { |element| parse(element) }
           end
+        elsif element_type.is_a?(String)
+          proc do |value|
+            unless value.respond_to?(:map)
+              raise TypeError, "can't convert #{value.class} into Array"
+            end
+
+            resolved_class = Structure::Types.resolve_class(element_type, context_class)
+            value.map do |element|
+              if resolved_class.respond_to?(:parse)
+                resolved_class.parse(element)
+              else
+                element
+              end
+            end
+          end
         else
-          element_coercer = coerce(element_type)
+          element_coercer = coerce(element_type, context_class)
           lambda do |value|
             unless value.respond_to?(:map)
               raise TypeError, "can't convert #{value.class} into Array"

data/lib/structure/version.rb

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

data/lib/structure.rb

@@ -37,13 +37,13 @@ module Structure
 
       # capture locals for method generation
       mappings = builder.mappings
-      coercions = builder.coercions
+      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) }
+        klass.define_method(pred) { !!public_send(attr) }
       end
 
       # recursive to_h

data/sig/structure/builder.rbs

@@ -14,7 +14,7 @@ module Structure
     def mappings: () -> Hash[Symbol, String]
     def types: () -> Hash[Symbol, untyped]
     def defaults: () -> Hash[Symbol, untyped]
-    def coercions: () -> Hash[Symbol, Proc]
+    def coercions: (?untyped? context_class) -> Hash[Symbol, Proc]
     def predicate_methods: () -> Hash[Symbol, Symbol]
     def after_parse_callback: () -> (Proc | nil)
   end

data/sig/structure/types.rbs

@@ -4,11 +4,13 @@ module Structure
 
     self.@boolean: Proc
 
-    def self.coerce: (untyped type) -> untyped
+    def self.coerce: (untyped type, ?untyped? context_class) -> untyped
+    def self.resolve_class: (String class_name, untyped? context_class) -> untyped
 
     private def self.boolean: () -> Proc
     private def self.self_referential: () -> Proc
-    private def self.array: (untyped type) -> Proc
+    private def self.string_class: (String class_name, untyped? context_class) -> Proc
+    private def self.array: (untyped element_type, ?untyped? context_class) -> Proc
     private def self.parseable: (untyped type) -> Proc
     private def self.kernel: (Class type) -> Proc
     private def self.parse: (untyped val) -> untyped

metadata

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