validated_object 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '039b75227869c70e8767ab8e48b5f355d9e048f7b6a18cacec6ca679259f0097'
-  data.tar.gz: 7b16daca0ce8d9cb81af01ce6d6a984cadbc7ef36ee2b7a72b1ac67aed854415
+  metadata.gz: 8938191d6ee1e84b60f0c659674952d9fbb56c7ea01bc2672194c8aee3120bf4
+  data.tar.gz: 2dd18069152f37b629030d10e0d46408bdec7369c36ed4407cbaa36baf2ff297
 SHA512:
-  metadata.gz: b7766bafdcb4e6d23890584bffac5c1ce7744d5166d29061a3247b2b377f52195f80531028c041db8a98f80a2b675411528804058e7fc7b008327de96c14e2e6
-  data.tar.gz: 007c20d017c7ceaf708d69f05f8c1fc19c1c262313550670f8ce1469df2641e4c78799cac90301e6cea94acfa9d7ad8489d6fba034a440b9e08ece2a0e37abb3
+  metadata.gz: beb309f24b778cf42ea63d503669a68ff71d0bc2432fb961ce32bfb1f84b32bf9a7fe8acf1a62dc00f84aaf5cbaa95954720d4a22faf5e9b4dda439d6ef425a3
+  data.tar.gz: 5e8b97e5ff1e46279b0e81da5b7e7a110732c7c68507638e822f39fff3059f7da02d619a33ba1fb403bdfe21d8c9b5f4b4ce77f7fac9adf4048f6d2199ba7561

data/README.md

@@ -154,7 +154,7 @@ the data.
 
 ### Use in code generation
 
-My [Schema.org structured data gem](https://github.com/public-law/schema-dot-org) uses ValidatedObjects to recursively create well formed HTML / JSON-LD. 
+The [Schema.org structured data gem](https://github.com/public-law/schema-dot-org) uses ValidatedObjects to recursively create well formed HTML / JSON-LD. 
 
 ## Installation
 

data/lib/validated_object/simplified_api.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
-# Enable a simplified API for the common case of
-# read-only ValidatedObjects.
 module ValidatedObject
+  # Enable a simplified API for the common case of
+  # read-only ValidatedObjects.
   module SimplifiedApi
     extend ActiveSupport::Concern
 
@@ -19,7 +21,6 @@ module ValidatedObject
         validates(*args, **kwargs, &block)
       end
 
-      # Alias for validated_attr for compatibility with test usage.
       def validates_attr(attribute, *options, **kwargs)
         attr_reader attribute
 
@@ -27,16 +28,23 @@ module ValidatedObject
           type_val = kwargs.delete(:type)
           element_type = kwargs.delete(:element_type)
 
+          # Handle Union types - pass them through directly
+          if type_val.is_a?(ValidatedObject::Base::Union)
+            opts = { type: { with: type_val } }
+            validates attribute, opts.merge(kwargs)
           # Parse Array[ElementType] syntax
-          if type_val.is_a?(Array) && type_val.length == 1 && type_val[0].is_a?(Class)
+          elsif type_val.is_a?(Array) && type_val.length == 1 && type_val[0].is_a?(Class)
             # This handles Array[Comment] syntax
             element_type = type_val[0]
             type_val = Array
+            opts = { type: { with: type_val } }
+            opts[:type][:element_type] = element_type if element_type
+            validates attribute, opts.merge(kwargs)
+          else
+            opts = { type: { with: type_val } }
+            opts[:type][:element_type] = element_type if element_type
+            validates attribute, opts.merge(kwargs)
           end
-
-          opts = { type: { with: type_val } }
-          opts[:type][:element_type] = element_type if element_type
-          validates attribute, opts.merge(kwargs)
         else
           validates attribute, *options, **kwargs
         end

data/lib/validated_object/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ValidatedObject
-  VERSION = '2.3.3'
+  VERSION = '2.3.4'
 end

data/lib/validated_object.rb

@@ -54,6 +54,21 @@ module ValidatedObject
     class Boolean
     end
 
+    # A private class definition for union types.
+    # Stores multiple allowed types for validation.
+    # Created via ValidatedObject::Base.union(*types)
+    #
+    # @example
+    #   validates :id, type: union(String, Integer)
+    #   validates :data, type: union(Hash, [Hash])
+    class Union
+      attr_reader :types
+
+      def initialize(*types)
+        @types = types
+      end
+    end
+
     # Instantiate and validate a new object.
     # @example
     #   maru = Dog.new(birthday: Date.today, name: 'Maru')
@@ -99,6 +114,14 @@ module ValidatedObject
         validation_options = options
         expected_class = validation_options[:with]
 
+        # Support union types
+        if expected_class.is_a?(Union)
+          return if validate_union_type(record, attribute, value, expected_class, validation_options)
+
+          save_union_error(record, attribute, value, expected_class, validation_options)
+          return
+        end
+
         # Support type: Array, element_type: ElementType
         if expected_class == Array && validation_options[:element_type]
           return save_error(record, attribute, value, validation_options) unless value.is_a?(Array)
@@ -134,6 +157,50 @@ module ValidatedObject
         record.errors.add attribute,
                           validation_options[:message] || "is a #{value.class}, not a #{validation_options[:with]}"
       end
+
+      def validate_union_type(_record, _attribute, value, union, _validation_options)
+        union.types.any? do |type_spec|
+          if type_spec.is_a?(Array) && type_spec.length == 1
+            # Handle [ElementType] syntax within union
+            validate_array_element_type(value, type_spec[0])
+          elsif type_spec.is_a?(Class) || type_spec == Boolean
+            # Handle class types (String, Integer, etc.) and pseudo-boolean
+            pseudo_boolean?(type_spec, value) || expected_class?(type_spec, value)
+          else
+            # Handle literal values (symbols, strings, numbers, etc.)
+            value == type_spec
+          end
+        end
+      end
+
+      def validate_array_element_type(value, element_type)
+        return false unless value.is_a?(Array)
+
+        value.all? { |el| el.is_a?(element_type) }
+      end
+
+      def save_union_error(record, attribute, value, union, validation_options)
+        return if validation_options[:message]
+
+        type_names = union.types.map do |type_spec|
+          if type_spec.is_a?(Array) && type_spec.length == 1
+            "Array of #{type_spec[0]}"
+          elsif type_spec.is_a?(Class) || type_spec == Boolean
+            type_spec.to_s
+          else
+            # For literal values like :active, show them as-is
+            type_spec.inspect
+          end
+        end
+
+        message = if type_names.length == 1
+                    "is a #{value.class}, not one of #{type_names.first}"
+                  else
+                    "is a #{value.class}, not one of #{type_names.join(', ')}"
+                  end
+
+        record.errors.add attribute, message
+      end
     end
 
     # Register the TypeValidator with ActiveModel so `type:` validation option works
@@ -146,6 +213,16 @@ module ValidatedObject
       validates(*args, **kwargs, &block)
     end
 
+    # Create a union type specification for validation
+    # @param types [Array] The types that are allowed
+    # @return [Union] A union type specification
+    # @example
+    #   validates :id, type: union(String, Integer)
+    #   validates :data, type: union(Hash, [Hash])
+    def self.union(*types)
+      Union.new(*types)
+    end
+
     private
 
     def set_instance_variables(from_hash:)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validated_object
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Robb Shecter