verse-schema 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63618ff4cf11b43ec35e8bb88adaffdf8d15ac3a49a461427fbdc3cd8908299a
-  data.tar.gz: 2ab22e1cd477e2b4f0e4cd070f50e2fd56e89b1c323795f4ca3cbfa1944e271d
+  metadata.gz: 6608dcff00a7bef2d8313866053ac7d37d82933d9b597052a222f0bcad693f91
+  data.tar.gz: dfcecf7d576b599b3c39d552cfbbf082ceda4707f0ec532d94d4a0db3dbfa620
 SHA512:
-  metadata.gz: d7c5cb3e34919f47de38726ea146aa1d3d3ffe77b26d999c18da1d5e441ca06fcba4d8827c42d3b515ea7c7abd73177e7627352e1c2714ef82c0e2e196b9d01a
-  data.tar.gz: 4b60874afb6bcf4b7721396b9fe799b38b1b21fe4fb31c9b8fd467b835ded25ff72f8df8a2ff7bb4cddd1dca322937aa8ad1f879bcc13e7d9e012cf027cc4f63
+  metadata.gz: d3bc6f97bf7b683d4e45ee578af5a1cd57375d56f54161a93ed3b725c2f783cbfedb2583fa9dc6470e68243bdaa3cda93f703dc82df4a63bd912d386695933bc
+  data.tar.gz: 49c7ae54ea24d5a4e7a8304e1361f70feb81f68a4993beddc153fabd1c88fa1d63e5eb5bd5bbcb41eea83bd863f7188bcfc73cdf31d98c9a0b08b32d749c0ecc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    verse-schema (1.1.0)
+    verse-schema (1.1.1)
       attr_chainable (~> 1.0)
 
 GEM

data/lib/tasks/readme_doc_extractor.rb

@@ -109,7 +109,7 @@ class ReadmeDocExtractor
     end
   end
 
-   # Extract code from an example
+  # Extract code from an example
   def extract_code_from_example(example)
     # Get the example block directly using instance_variable_get
     example_block = example.instance_variable_get(:@example_block)

data/lib/verse/schema/base.rb

@@ -14,7 +14,7 @@ module Verse
 
       # Initialize a new schema.
       def initialize(post_processors: nil)
-        @post_processors   = post_processors
+        @post_processors = post_processors
       end
 
       def rule(fields = nil, message = "rule failed", &block)

data/lib/verse/schema/coalescer.rb

@@ -10,7 +10,7 @@ module Verse
       DEFAULT_MAPPER = lambda do |type|
         if type.is_a?(Base)
           proc do |value, _opts, locals:, strict:|
-            type.validate(value, locals:,  strict:)
+            type.validate(value, locals:, strict:)
           end
         elsif type.is_a?(Class)
           proc do |value|

data/lib/verse/schema/collection.rb

@@ -57,10 +57,30 @@ module Verse
         @values.all? do |child_type|
           # ...is a subtype (`<=`) of *at least one* type allowed by the parent collection.
           parent_schema.values.any? do |parent_type|
-            # Use the existing `<=` operator defined on schema types (Scalar, Struct, etc.)
-            # This assumes the `<=` operator correctly handles class inheritance (e.g., Integer <= Object)
-            # and schema type compatibility.
-            child_type <= parent_type
+            # Special handling for when child_type is a primitive class (like Integer)
+            # and parent_type is a Scalar
+            if !child_type.is_a?(Base) && parent_type.is_a?(Scalar)
+              # Check if the primitive class is compatible with any of the Scalar's values
+              parent_type.values.any? do |scalar_value|
+                begin
+                  # Use standard Ruby `<=` for comparison
+                  child_type <= scalar_value
+                rescue TypeError
+                  # Handle cases where <= is not defined between types
+                  false
+                end
+              end
+            else
+              # Use the existing `<=` operator defined on schema types (Scalar, Struct, etc.)
+              # This assumes the `<=` operator correctly handles class inheritance (e.g., Integer <= Object)
+              # and schema type compatibility.
+              begin
+                child_type <= parent_type
+              rescue TypeError
+                # Handle cases where <= is not defined between types
+                false
+              end
+            end
           end
         end
       end
@@ -170,7 +190,6 @@ module Verse
 
         Result.new(output, error_builder.errors)
       end
-
     end
   end
 end

data/lib/verse/schema/dictionary.rb

@@ -14,7 +14,7 @@ module Verse
       def initialize(values:, post_processors: nil)
         super(post_processors:)
 
-        @values    = values
+        @values = values
       end
 
       def validate(input, error_builder: nil, locals: {}, strict: false)
@@ -155,7 +155,6 @@ module Verse
 
         Result.new(output, error_builder.errors)
       end
-
     end
   end
 end

data/lib/verse/schema/field.rb

@@ -8,7 +8,7 @@ module Verse
   module Schema
     # A field in a schema
     class Field
-      attr_reader :opts, :post_processors, :name, :type
+      attr_reader :opts, :post_processors, :name
 
       def initialize(name, type, opts, post_processors: nil, &block)
         @name = name
@@ -53,7 +53,7 @@ module Verse
         of_arg = @opts[:of] # For array and dictionary
         of_arg = [of_arg] unless of_arg.nil? || of_arg.is_a?(Array)
 
-        if type == Hash || type == Object
+        if [Hash, Object].include?(type)
           type = Schema.dictionary(*of_arg) if of_arg # dictionary
         elsif type == Array
           type = Schema.array(*of_arg) if of_arg
@@ -269,7 +269,7 @@ module Verse
           elsif c.is_a?(Class) && p.is_a?(Verse::Schema::Scalar)
             p.values.any? { |p_val| c <= p_val }
           elsif c.is_a?(Verse::Schema::Base) && p.is_a?(Verse::Schema::Base)
-             c <= p
+            c <= p
           elsif c.is_a?(Class) && p.is_a?(Class)
             c <= p
           else

data/lib/verse/schema/scalar.rb

@@ -64,19 +64,45 @@ module Verse
         end
       end
 
-      def <=(other)
-        other == self || inherit?(other)
+  def <=(other)
+    # 1. Identical check: Is it the exact same object?
+    return true if other == self
+
+    # 2. Check if inheriting from another Scalar:
+    #    Use the existing inherit? method which correctly handles Scalar-to-Scalar inheritance.
+    #    (inherit? implicitly checks `other.is_a?(Scalar)`)
+    return true if inherit?(other)
+
+    # 3. NEW: Check compatibility with non-Scalar types:
+    #    If 'other' is not a Scalar, check if any type *wrapped* by this Scalar
+    #    is a subtype of 'other'. This handles `Scalar<Integer> <= Integer`.
+    #    We rely on the `<=` operator of the wrapped types themselves.
+    @values.any? do |wrapped_type|
+      begin
+        # Use standard Ruby `<=` for comparison.
+        # This works for Class <= Class (e.g., Integer <= Integer, Integer <= Numeric)
+        # and potentially for SchemaType <= SchemaType if defined.
+        wrapped_type <= other
+      rescue TypeError
+        # Handle cases where <= is not defined between wrapped_type and other
+        false
       end
+    end
+  end
 
-      def <(other)
-        other != self && inherit?(other)
-      end
+  def <(other)
+    other != self && self <= other
+  end
 
-      # rubocop:disable Style/InverseMethods
-      def >(other)
-        !self.<=(other)
-      end
-      # rubocop:enable Style/InverseMethods
+  # rubocop:disable Style/InverseMethods
+  def >(other)
+    !(self <= other)
+  end
+
+  def >=(other)
+    other <= self
+  end
+  # rubocop:enable Style/InverseMethods
 
       # Aggregation of two schemas.
       def +(other)
@@ -149,7 +175,6 @@ module Verse
 
         Result.new(coalesced_value, error_builder.errors)
       end
-
     end
   end
 end

data/lib/verse/schema/struct.rb

@@ -221,49 +221,49 @@ module Verse
         fields << :extra_fields if extra_fields?
 
         # Special case for empty schema (yeah, I know, it happens in my production code...)
-        if fields.empty?
-          @dataclass = Class.new do
-            def self.from_raw(*)=new
-            def self.schema = dataclass_schema
-
-            class_eval(&block) if block
-          end
-        else
-          @dataclass = ::Struct.new(*fields, keyword_init: true) do
-            # Redefine new method
-            define_singleton_method(:from_raw, &method(:new))
-
-            define_singleton_method(:new) do |*args, **kwargs|
-              # Use the schema to generate the hash for our record
-              if args.size > 1
-                raise ArgumentError, "You cannot pass more than one argument"
-              end
-
-              if args.size == 1
-                if kwargs.any?
-                  raise ArgumentError, "You cannot pass both a hash and keyword arguments"
-                end
-
-                kwargs = args.first
-              end
-
-              dataclass_schema.new(kwargs)
-            end
-
-            define_singleton_method(:schema){ dataclass_schema }
-
-            class_eval(&block) if block
-          end
-        end
+        @dataclass = if fields.empty?
+                       Class.new do
+                         def self.from_raw(*)=new
+                         def self.schema = dataclass_schema
+
+                         class_eval(&block) if block
+                       end
+                     else
+                       ::Struct.new(*fields, keyword_init: true) do
+                         # Redefine new method
+                         define_singleton_method(:from_raw, &method(:new))
+
+                         define_singleton_method(:new) do |*args, **kwargs|
+                           # Use the schema to generate the hash for our record
+                           if args.size > 1
+                             raise ArgumentError, "You cannot pass more than one argument"
+                           end
+
+                           if args.size == 1
+                             if kwargs.any?
+                               raise ArgumentError, "You cannot pass both a hash and keyword arguments"
+                             end
+
+                             kwargs = args.first
+                           end
+
+                           dataclass_schema.new(kwargs)
+                         end
+
+                         define_singleton_method(:schema){ dataclass_schema }
+
+                         class_eval(&block) if block
+                       end
+                     end
       end
 
       def inspect
         fields_string = @fields.map do |field|
-          if field.type.is_a?(Array)
-            type_str = field.type.map(&:inspect).join("|")
-          else
-            type_str = field.type.inspect
-          end
+          type_str = if field.type.is_a?(Array)
+                       field.type.map(&:inspect).join("|")
+                     else
+                       field.type.inspect
+                     end
 
           optional_marker = field.optional? ? "?" : ""
           "#{field.name}#{optional_marker}: #{type_str}"
@@ -320,7 +320,6 @@ module Verse
 
         Result.new(output, error_builder.errors)
       end
-
     end
   end
 end

data/lib/verse/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Verse
   module Schema
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: verse-schema
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yacine Petitprez
 bindir: exe
 cert_chain: []
-date: 2025-04-23 00:00:00.000000000 Z
+date: 2025-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_chainable