interactor-validation 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d255c1cdb4048fbd485a9bc8b95096d521e592e6babe4ea7961ec429312386
-  data.tar.gz: a9bc28cb3c10f5f2415da43c3a63b8c774436e13d27e2e6facaaa0cbcbeb19b9
+  metadata.gz: 337f8200b44c78cb5a2eeefa3d9dcd5c5c1ec864ef7f0e18d710309365b21e9f
+  data.tar.gz: 4c0b74a6a2cc0fbc9bd391665da07a454054c7ec29fef12d84dccd6945296ba3
 SHA512:
-  metadata.gz: f5e73c0e35a659668dd31783d5fbea0869f54efe3db2d1033320c66d90fe9fb7997a2fc7079b602608ac6aa1bec60467588ba4b6fdea6bdd3b890cd24ea55bf5
-  data.tar.gz: 7da53549b4bd1ef65065b9480dca243f1a78922045f096281025f7e35a034c8418ce88c90cac698fd6dd8816a9c434e23050b88a42701d96803e2bcf73d8f78a
+  metadata.gz: b3fc4532523214b0723c009ed73b2d75ad5213480ae920261da7263adf2b3929ecef608b1d6b8924461f0fc873cf11777a2f80ea32528a9c8228320025086440
+  data.tar.gz: f58f08c52ef1e58be7d8ddb566d14b8aff8b24c408f1976128decada786ce29570ac38d6df7a862e50f5681e64e3ed9eb73b65fb6909da80504f3b113f28c06b

data/README.md

@@ -213,19 +213,49 @@ validates :terms_accepted, boolean: true
 
 ### Nested Validation
 
-Validate nested hashes and arrays.
+Validate nested hashes and arrays with support for both optional and required parameters.
 
-**Hash Validation:**
+**Optional Nested Validation (parameter can be nil):**
+
+```ruby
+params :filters
+validates :filters do
+  attribute :type, presence: true
+  attribute :value
+end
+
+# When filters is nil or missing - succeeds
+result = SearchItems.call(filters: nil)
+result.success? # => true
+
+# When filters is present - validates nested attributes
+result = SearchItems.call(filters: { type: "category" })
+result.success? # => true
+
+# When filters is present but invalid - fails
+result = SearchItems.call(filters: { value: "test" })
+result.errors # => [{ attribute: "filters.type", type: :blank, message: "Filters.type can't be blank" }]
+```
+
+**Required Nested Validation (parameter must be present):**
 
 ```ruby
 params :user
-validates :user do
+validates :user, presence: true do
   attribute :name, presence: true
   attribute :email, format: { with: /@/ }
   attribute :age, numericality: { greater_than: 0 }
 end
 
-# Usage
+# When user is nil - fails with presence error
+result = CreateUser.call(user: nil)
+result.errors # => [{ attribute: :user, type: :blank, message: "User can't be blank" }]
+
+# When user is empty hash - fails with presence error (empty hashes are not .present?)
+result = CreateUser.call(user: {})
+result.errors # => [{ attribute: :user, type: :blank, message: "User can't be blank" }]
+
+# When user is present - validates nested attributes
 result = CreateUser.call(user: { name: "", email: "bad", age: -1 })
 result.errors # => [
               #      { attribute: "user.name", type: :blank, message: "User.name can't be blank" },
@@ -252,6 +282,18 @@ result.errors # => [
               #      { attribute: "items[1].name", type: :blank, message: "Items[1].name can't be blank" },
               #      { attribute: "items[1].price", type: :greater_than, message: "Items[1].price must be greater than 0" }
               #    ]
+
+# Optional array (can be nil)
+result = ProcessItems.call(items: nil)
+result.success? # => true
+
+# Required array (must be present)
+validates :items, presence: true do
+  attribute :name, presence: true
+end
+
+result = ProcessItems.call(items: nil)
+result.errors # => [{ attribute: :items, type: :blank, message: "Items can't be blank" }]
 ```
 
 ---
@@ -1059,14 +1101,45 @@ end
 ### Nested Validation Examples
 
 ```ruby
-# Hash validation
+# Optional hash validation (parameter can be nil)
+class SearchWithFilters
+  include Interactor
+  include Interactor::Validation
+
+  params :filters
+
+  validates :filters do
+    attribute :category, presence: true
+    attribute :min_price, numericality: { greater_than_or_equal_to: 0 }
+    attribute :max_price, numericality: { greater_than_or_equal_to: 0 }
+  end
+
+  def call
+    # filters is optional - if nil, skip filtering
+    results = filters ? apply_filters(Product.all) : Product.all
+    context.results = results
+  end
+end
+
+# When filters is nil - succeeds
+result = SearchWithFilters.call(filters: nil)
+result.success? # => true
+
+# When filters is present but invalid - fails
+result = SearchWithFilters.call(filters: { min_price: -10 })
+result.errors # => [
+              #      { attribute: "filters.category", type: :blank, message: "Filters.category can't be blank" },
+              #      { attribute: "filters.min_price", type: :greater_than_or_equal_to, message: "..." }
+              #    ]
+
+# Required hash validation (parameter must be present)
 class CreateUserWithProfile
   include Interactor
   include Interactor::Validation
 
   params :user
 
-  validates :user do
+  validates :user, presence: true do
     attribute :name, presence: true
     attribute :email, format: { with: /@/ }
     attribute :age, numericality: { greater_than: 0 }
@@ -1078,7 +1151,14 @@ class CreateUserWithProfile
   end
 end
 
-# Usage
+# When user is nil or empty - fails with presence error
+result = CreateUserWithProfile.call(user: nil)
+result.errors # => [{ attribute: :user, type: :blank, message: "User can't be blank" }]
+
+result = CreateUserWithProfile.call(user: {})
+result.errors # => [{ attribute: :user, type: :blank, message: "User can't be blank" }]
+
+# When user is present but invalid - validates nested attributes
 result = CreateUserWithProfile.call(
   user: {
     name: "",
@@ -1094,7 +1174,7 @@ result.errors # => [
               #      { attribute: "user.bio", type: :too_long, message: "User.bio is too long (maximum is 500 characters)" }
               #    ]
 
-# Array validation
+# Array validation (optional)
 class BulkCreateItems
   include Interactor
   include Interactor::Validation
@@ -1108,11 +1188,16 @@ class BulkCreateItems
   end
 
   def call
+    return if items.nil?  # Optional - handle nil gracefully
     items.each { |item| Item.create!(item) }
   end
 end
 
-# Usage
+# When items is nil - succeeds
+result = BulkCreateItems.call(items: nil)
+result.success? # => true
+
+# When items is present - validates each item
 result = BulkCreateItems.call(
   items: [
     { name: "Widget", price: 10, quantity: 5 },
@@ -1124,6 +1209,30 @@ result.errors # => [
               #      { attribute: "items[1].price", type: :greater_than, message: "Items[1].price must be greater than 0" },
               #      { attribute: "items[1].quantity", type: :greater_than_or_equal_to, message: "Items[1].quantity must be greater than or equal to 1" }
               #    ]
+
+# Required array validation
+class BulkCreateRequiredItems
+  include Interactor
+  include Interactor::Validation
+
+  params :items
+
+  validates :items, presence: true do
+    attribute :name, presence: true
+    attribute :price, numericality: { greater_than: 0 }
+  end
+
+  def call
+    items.each { |item| Item.create!(item) }
+  end
+end
+
+# When items is nil or empty - fails with presence error
+result = BulkCreateRequiredItems.call(items: nil)
+result.errors # => [{ attribute: :items, type: :blank, message: "Items can't be blank" }]
+
+result = BulkCreateRequiredItems.call(items: [])
+result.errors # => [{ attribute: :items, type: :blank, message: "Items can't be blank" }]
 ```
 
 ### ActiveModel Integration

data/lib/interactor/validation/validates.rb

@@ -46,8 +46,9 @@ module Interactor
               nested_rules = build_nested_rules(&)
               current_validations = _param_validations.dup
               existing_rules = current_validations[param_name] || {}
+              # Merge both the validation rules (like presence: true) AND the nested rules
               self._param_validations = current_validations.merge(
-                param_name => existing_rules.merge(_nested: nested_rules)
+                param_name => existing_rules.merge(rules).merge(_nested: nested_rules)
               )
               return
             end
@@ -260,14 +261,23 @@ module Interactor
       end
 
       # Validates a single parameter with the given rules
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def validate_param(param_name, value, rules)
         # Skip validation if explicitly marked
         return if rules[:_skip]
 
         # Handle nested validation (hash or array)
         if rules[:_nested]
-          validate_nested(param_name, value, rules[:_nested])
+          # Run presence validation first if it exists
+          # This allows optional vs required nested validation
+          validate_presence(param_name, value, rules)
+          return if @halt_validation || (@current_config.halt && errors.any?)
+
+          # Only run nested validation if value is present (not nil and not empty)
+          # If parent has no presence requirement, treat empty hash/array as "not provided"
+          # If parent has presence: true, empty hash/array already failed presence check above
+          should_validate_nested = value.present? || value == false
+          validate_nested(param_name, value, rules[:_nested]) if should_validate_nested
           return
         end
 
@@ -289,10 +299,13 @@ module Interactor
 
         validate_numericality(param_name, value, rules)
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       # Validates nested attributes in a hash or array
       def validate_nested(param_name, value, nested_rules)
+        # Return early if value is nil - presence validation handles this if required
+        return if value.nil?
+
         if value.is_a?(Array)
           validate_array_of_hashes(param_name, value, nested_rules)
         elsif value.is_a?(Hash)
@@ -501,7 +514,7 @@ module Interactor
           errors.add(attribute_path, error_type, halt: halt, **interpolations)
         end
 
-        # Note: halt flag is set by ErrorsWrapper.add() if halt: true
+        # NOTE: halt flag is set by ErrorsWrapper.add() if halt: true
       end
       # rubocop:enable Metrics/ParameterLists
 
@@ -708,7 +721,7 @@ module Interactor
           errors.add(param_name, error_type, halt: halt, **interpolations)
         end
 
-        # Note: halt flag is set by ErrorsWrapper.add() if halt: true
+        # NOTE: halt flag is set by ErrorsWrapper.add() if halt: true
       end
 
       # Generate error code for :code mode using constants

data/lib/interactor/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Interactor
   module Validation
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interactor-validation
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Wilson Anciro