structure 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e04b84b8e6a19728bf6212bdfd08895187bbe59ebf56b47288697962ed31b2
-  data.tar.gz: '028e8df792d344faa2850f82504d223a6691c195203c51acd53581ee9e97064c'
+  metadata.gz: c798ddd0dce500c2053077d3964ffe907c1f13fa0b1b9f9394c18a1cc9829b31
+  data.tar.gz: 2c82c99faa38aeb774415121d793ff2205a628aecab194fe60a36746efcb983f
 SHA512:
-  metadata.gz: 4e6fbbd3104fc0ed9001d66395606ab436a907cf3b1ab09f692c458b99e999e648e7b558dd0b2e8e4fb298d2c1c25decf51bef0ad5889bc9ff14f6d821c62ede
-  data.tar.gz: 74752c31b2898fea6c7d5c94e568f7fa9ca2724e116aa62e9d9c30f0da77d3f6f7de7b73540a8837834536bc2aa9b87f9d5b596ddd0bfd2089222e3fbec07334
+  metadata.gz: f3ec870b530f010c1356ee2ecadb6ca6e2880e29b4f15b80e395812aad8d342737a547811c442c737c50ff1b4b6dc98a2496ae2aa7df6e657d76198bb964b82a
+  data.tar.gz: 30bafd22ee1ed82b7e5e5d702617200a31689fccad006df1e884d66d99b43c8b85ad9ae99004ca2b9a271f8b721a86c200553a289adc24496abf691b6f63573f

data/lib/structure/types.rb

@@ -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,23 @@ 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 self_referential
+      proc { |val| parse(val) }
+    end
+
     def kernel(type)
       ->(val) { Kernel.send(type.name, val) }
     end
@@ -64,8 +69,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.2.0"
 end

data/lib/structure.rb

@@ -58,7 +58,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.2.0
 platform: ruby
 authors:
 - Hakan Ensari