interactor-validation 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6efd174866dfa694eb729fd033ce69cf9a7a3d91df52662f9f387704d111aaa
-  data.tar.gz: 5f55753b346219e89237235aeb4976ff853110e2e11374569fc2a261d3b4faaf
+  metadata.gz: d6d255c1cdb4048fbd485a9bc8b95096d521e592e6babe4ea7961ec429312386
+  data.tar.gz: a9bc28cb3c10f5f2415da43c3a63b8c774436e13d27e2e6facaaa0cbcbeb19b9
 SHA512:
-  metadata.gz: 84b4ba82ce1c459eca38bc708be8fa96e0add5665d49e495cf4c36d6e0b0063e4a2eeb3ff57b22159266094523efac406b9d08ff006b10792f5a53a9dd5c6dfb
-  data.tar.gz: 8581c319bbd2adc9dc67bea77dc7da3a3bb9431bb16841bc7acae90115b1cde1fd44c158107d522d82640fa76a8dc696badea95d15a8d882d8a70803b790d67d
+  metadata.gz: f5e73c0e35a659668dd31783d5fbea0869f54efe3db2d1033320c66d90fe9fb7997a2fc7079b602608ac6aa1bec60467588ba4b6fdea6bdd3b890cd24ea55bf5
+  data.tar.gz: 7da53549b4bd1ef65065b9480dca243f1a78922045f096281025f7e35a034c8418ce88c90cac698fd6dd8816a9c434e23050b88a42701d96803e2bcf73d8f78a

data/lib/interactor/validation/validates.rb

@@ -6,6 +6,9 @@ module Interactor
     module Validates
       extend ActiveSupport::Concern
 
+      # Exception raised when validation should halt immediately
+      class HaltValidation < StandardError; end
+
       included do
         class_attribute :_param_validations, instance_writer: false, default: {}
         # Regex pattern cache for performance
@@ -105,8 +108,11 @@ module Interactor
           # Call the original add method
           __getobj__.add(attribute, message, **options)
 
-          # Set halt flag if requested
-          @interactor.instance_variable_set(:@halt_validation, true) if halt
+          # Set halt flag and raise exception if requested
+          return unless halt
+
+          @interactor.instance_variable_set(:@halt_validation, true)
+          raise HaltValidation
         end
       end
 
@@ -153,6 +159,8 @@ module Interactor
             rescue ActiveModel::ValidationError
               # ActiveModel's validate! raises this when there are errors
               # We handle errors differently, so just ignore this exception
+            rescue HaltValidation
+              # Validation halted - error already added, continue to fail context
             end
           end
 
@@ -191,6 +199,7 @@ module Interactor
       # Accumulates errors but does not fail the context
       # The validate! hook will fail the context if there are any errors
       # @return [void]
+      # rubocop:disable Metrics/PerceivedComplexity
       def validate_params!
         # Memoize config for performance
         @current_config = current_config
@@ -224,10 +233,13 @@ module Interactor
           # Don't fail here - let validate! hook handle failure
           # This allows validate! to run and add additional custom errors
         end
+      rescue HaltValidation
+        # Validation halted - error already added, stop processing
       ensure
         @current_config = nil # Clear memoization
         # Don't reset @halt_validation here - let validate! handle it
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       # Get the current configuration (instance config overrides global config)
       # @return [Configuration] the active configuration
@@ -481,16 +493,15 @@ module Interactor
         if current_config.error_mode == :code
           # Code mode: use custom message or generate code
           code_message = custom_message || error_code_for(error_type, **interpolations)
-          errors.add(attribute_path, code_message)
+          errors.add(attribute_path, code_message, halt: halt)
         elsif custom_message
           # Default mode: use ActiveModel's error messages with custom message
-          errors.add(attribute_path, custom_message)
+          errors.add(attribute_path, custom_message, halt: halt)
         else
-          errors.add(attribute_path, error_type, **interpolations)
+          errors.add(attribute_path, error_type, halt: halt, **interpolations)
         end
 
-        # Set halt flag if requested
-        @halt_validation = true if halt
+        # Note: halt flag is set by ErrorsWrapper.add() if halt: true
       end
       # rubocop:enable Metrics/ParameterLists
 
@@ -689,16 +700,15 @@ module Interactor
         if current_config.error_mode == :code
           # Code mode: use custom message or generate code
           code_message = custom_message || error_code_for(error_type, **interpolations)
-          errors.add(param_name, code_message)
+          errors.add(param_name, code_message, halt: halt)
         elsif custom_message
           # Default mode: use ActiveModel's error messages
-          errors.add(param_name, custom_message)
+          errors.add(param_name, custom_message, halt: halt)
         else
-          errors.add(param_name, error_type, **interpolations)
+          errors.add(param_name, error_type, halt: halt, **interpolations)
         end
 
-        # Set halt flag if requested
-        @halt_validation = true if halt
+        # 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.5"
+    VERSION = "0.3.7"
   end
 end

metadata

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