api-regulator 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d041ae7a972c291795b539d3543fbda9da721c10f505966af5eca71c00fac4
-  data.tar.gz: 592189f17e96f0c676adb9d393698ae32617a6f9558b5a255911b97ea422b6b9
+  metadata.gz: 812fb74cb8ccd8e73304ba80e95fb06c1d7bf0c91e78337c0b13cb3cd39ff189
+  data.tar.gz: e761379ba9cd5b8eb2452a6508d9e6d261f63b9fe68f33e4cab133993a74a742
 SHA512:
-  metadata.gz: 29f9365bde56835debcffe256e6496d0cf3e8a9abe09aebeb88493141e893b38943cdfe83116cfd1bb7f1e95b73e59281849977b76834731cbf5d6ab022154ff
-  data.tar.gz: 2c3bcd87b072eb9cb5877d15224a1782c9a90e16700050cb9d594367c741a2d8d27da992ca0c99d9f48e6ea959390e93ca44d6fa1b0099aafb861f97cf68cc74
+  metadata.gz: 8703cb89b3bd4d291c75ded89e4cfe5bb4c9a82d8312822a2011062484548beb8f54b624b968b8a860a8a3ec1ab01f235d914d3cd96f96515eaeaea28c6cc599
+  data.tar.gz: f51e863849f482218c4fa4e0b918e6973c63745cbee5be20356ad7eac6edb750d17aff5a918c0389bc5b4bb81e2a3efa229551a4ce0062b0d73e55058349d5ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-regulator (0.1.9)
+    api-regulator (0.1.10)
       activemodel (~> 8.0)
       activesupport (~> 8.0)
 

data/lib/api_regulator/validator.rb

@@ -29,9 +29,8 @@ module ApiRegulator
         attribute full_key, param.type if param.type
         self.defined_attributes += [full_key]
 
-        # Add validations for scalar attributes
         param.options.each do |option, value|
-          validates full_key, option => value
+          validates full_key, option => value, allow_blank: !param.required?
         end
 
         # Add type-specific validations
@@ -40,6 +39,7 @@ module ApiRegulator
         validate -> { validate_string(full_key) } if param.type == :string
       end
 
+
       def define_object_validations(param, full_key)
         # Build nested validator class
         nested_validator_class = build_nested_validator_class(param.children, param.name, self)
@@ -104,17 +104,20 @@ module ApiRegulator
     # Instance methods
     def validate_array_of_objects(attribute, item_validator_class, param)
       raw_value = @raw_attributes[attribute]
+
+      # Ensure the presence check works only on the array itself, not its contents
       if raw_value.blank?
         errors.add(attribute, "can't be blank") if param.options[:presence]
         return
       end
+
       unless raw_value.is_a?(Array)
         errors.add(attribute, "must be an array")
         return
       end
 
       raw_value.each_with_index do |value, index|
-        unless value.is_a?(Hash) || raw_value.is_a?(ActionController::Parameters)
+        unless value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
           errors.add("#{attribute}[#{index}]", "must be a hash")
           next
         end
@@ -136,27 +139,45 @@ module ApiRegulator
         errors.add(attribute, "can't be blank") if param.options[:presence]
         return
       end
+
       unless raw_value.is_a?(Array)
         errors.add(attribute, "must be an array")
         return
       end
 
+      inclusion_list = param.options[:inclusion]&.dig(:in)
+
       raw_value.each_with_index do |value, index|
+        # Skip type and inclusion validation if nil is allowed and value is nil
+        if value.nil? && (inclusion_list&.include?(nil) || param.options[:allow_nil_items])
+          next
+        end
+
+        # Type validation for non-nil values
         case param.item_type
         when :string
           unless value.is_a?(String)
             errors.add("#{attribute}[#{index}]", "must be a string")
+            next
           end
         when :integer
           unless value.is_a?(Integer)
             errors.add("#{attribute}[#{index}]", "must be an integer")
+            next
           end
         when :boolean
           unless [true, false].include?(value)
             errors.add("#{attribute}[#{index}]", "must be a boolean")
+            next
           end
         else
           errors.add("#{attribute}[#{index}]", "has an unsupported type")
+          next
+        end
+
+        # Inclusion validation for non-nil values
+        if inclusion_list && !inclusion_list.include?(value)
+          errors.add("#{attribute}[#{index}]", "is not included in the list")
         end
       end
     end
@@ -164,6 +185,9 @@ module ApiRegulator
     def validate_nested_object(attribute, nested_validator_class, param)
       raw_value = @raw_attributes[attribute]
 
+      # Skip validation if optional and not present
+      return if raw_value.nil? && param.options[:optional]
+
       if raw_value.nil?
         errors.add(attribute, "can't be blank") if param.options[:presence]
         return

data/lib/api_regulator/version.rb

@@ -1,3 +1,3 @@
 module ApiRegulator
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-regulator
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Geoff Massanek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport