structure 3.1.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e04b84b8e6a19728bf6212bdfd08895187bbe59ebf56b47288697962ed31b2
-  data.tar.gz: '028e8df792d344faa2850f82504d223a6691c195203c51acd53581ee9e97064c'
+  metadata.gz: 69bf1e759bbf993b28fb70235866a6c36774b92a57ee47764458d24bb062a55b
+  data.tar.gz: 3e9a55913e14fb630ece6c4fff62df1d8bfff69d61efd1034a406cf404423f96
 SHA512:
-  metadata.gz: 4e6fbbd3104fc0ed9001d66395606ab436a907cf3b1ab09f692c458b99e999e648e7b558dd0b2e8e4fb298d2c1c25decf51bef0ad5889bc9ff14f6d821c62ede
-  data.tar.gz: 74752c31b2898fea6c7d5c94e568f7fa9ca2724e116aa62e9d9c30f0da77d3f6f7de7b73540a8837834536bc2aa9b87f9d5b596ddd0bfd2089222e3fbec07334
+  metadata.gz: c8b75ee56372f7af3ffd9398474ce25bcffed641314a77293a735cc5e5269f68ee7ba645ed44456eea5c84d1c2b551d0181be35519a61b553466ceda85287f8a
+  data.tar.gz: 3f736db422a6abe5dae0b59d37194d8f2242c2970a506f40efe04b379f00b7cbc14dd2a3437023d0a33bd0d80376f6418c1421659d446c546d56ccbb1352abf5

data/lib/structure/builder.rb

@@ -65,7 +65,7 @@ module Structure
 
     def predicate_methods
       @types.filter_map do |name, type_lambda|
-        if type_lambda == Types.boolean && !name.to_s.end_with?("?")
+        if Types.boolean?(type_lambda) && !name.to_s.end_with?("?")
           predicate_name = "#{name}?"
           [predicate_name.to_sym, name]
         end

data/lib/structure/types.rb

@@ -10,8 +10,8 @@ module Structure
     BOOLEAN_TRUTHY = [true, 1, "1", "t", "T", "true", "TRUE", "on", "ON"].freeze
     private_constant :BOOLEAN_TRUTHY
 
-    def boolean
-      @boolean ||= ->(val) { BOOLEAN_TRUTHY.include?(val) }
+    def boolean?(type)
+      type == boolean
     end
 
     # Main factory method for creating type coercers
@@ -34,14 +34,8 @@ module Structure
       case type
       when :boolean
         boolean
-      when Class, Module
-        if type.name && Kernel.respond_to?(type.name)
-          kernel(type)
-        elsif type.respond_to?(:parse)
-          parseable(type)
-        else
-          type
-        end
+      when :self
+        self_referential
       when Array
         if type.length == 1
           array(type.first)
@@ -49,12 +43,27 @@ module Structure
           type
         end
       else
-        type
+        # Handle Class, Module, and any other types
+        if type.respond_to?(:parse)
+          parseable(type)
+        elsif type.respond_to?(:name) && type.name && Kernel.respond_to?(type.name)
+          kernel(type)
+        else
+          type
+        end
       end
     end
 
     private
 
+    def boolean
+      @boolean ||= ->(val) { BOOLEAN_TRUTHY.include?(val) }
+    end
+
+    def self_referential
+      proc { |val| parse(val) }
+    end
+
     def kernel(type)
       ->(val) { Kernel.send(type.name, val) }
     end
@@ -64,8 +73,12 @@ module Structure
     end
 
     def array(element_type)
-      element_coercer = coerce(element_type)
-      ->(array) { array.map { |element| element_coercer.call(element) } }
+      if element_type == :self
+        proc { |array| array.map { |element| parse(element) } }
+      else
+        element_coercer = coerce(element_type)
+        ->(array) { array.map { |element| element_coercer.call(element) } }
+      end
     end
   end
 end

data/lib/structure/version.rb

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

data/lib/structure.rb

@@ -39,6 +39,25 @@ module Structure
       attributes = builder.attributes
       after_parse_callback = builder.after_parse_callback
 
+      # Override to_h to recursively convert nested objects with to_h
+      data_class.define_method(:to_h) do
+        result = {}
+        self.class.members.each do |member|
+          value = send(member)
+          result[member] = case value
+          when Array
+            value.map { |item| item.respond_to?(:to_h) && item ? item.to_h : item }
+          when Hash
+            value
+          when ->(v) { v.respond_to?(:to_h) && v }
+            value.to_h
+          else
+            value
+          end
+        end
+        result
+      end
+
       data_class.define_singleton_method(:parse) do |data = {}, **kwargs|
         # Merge kwargs into data - kwargs take priority as overrides
         # Convert kwargs symbol keys to strings to match source_key lookups
@@ -58,7 +77,13 @@ module Structure
 
           # Apply type coercion or transformation
           if types[attr] && !value.nil?
-            value = types[attr].call(value)
+            type_or_proc = types[attr]
+            # Use instance_exec for non-lambda procs (self-referential types)
+            value = if type_or_proc.is_a?(Proc) && !type_or_proc.lambda?
+              instance_exec(value, &type_or_proc)
+            else
+              type_or_proc.call(value)
+            end
           end
 
           final_kwargs[attr] = value

metadata

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