Setup server-side abort and error handler hooks for commands

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-slim-bullseye
+FROM ruby:3.0.3-slim-bullseye
 
 RUN apt-get -y update && \
 apt-get -y --no-install-recommends install \
@@ -8,7 +8,7 @@ libjemalloc2 \
 sqlite3 \
 tzdata
 
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
 RUN apt-get -y --no-install-recommends install nodejs && \
 npm install -g npm@latest yarn
 

lib/turbo_boost/commands/attribute_set.rb

@@ -24,12 +24,12 @@ def initialize(attributes = {}, prefix: nil)
       value = value.to_i if value.is_a?(String) && value.match?(/\A-?\d+\z/)
       value = value == "true" if value.is_a?(String) && value.match?(/\A(true|false)\z/i)
 
-      instance_variable_set "@#{name}", value
+      instance_variable_set :"@#{name}", value
 
       next if orig_respond_to_missing?(name, false)
 
       self.class.define_method(name) { instance_variable_get :"@#{name}" }
-      self.class.define_method("#{name}?") { public_send(name).present? }
+      self.class.define_method(:"#{name}?") { public_send(name).present? }
     end
   end
 

lib/turbo_boost/commands/command.rb

@@ -121,13 +121,13 @@ def render(options = {}, locals = {}, &block)
     options = options.symbolize_keys
 
     ivars = options[:assigns]&.each_with_object({}) do |(key, value), memo|
-      memo[key] = controller.instance_variable_get("@#{key}")
-      controller.instance_variable_set "@#{key}", value
+      memo[key] = controller.instance_variable_get(:"@#{key}")
+      controller.instance_variable_set :"@#{key}", value
     end
 
     controller.view_context.render(options.except(:assigns), locals, &block)
   ensure
-    ivars&.each { |key, value| controller.instance_variable_set "@#{key}", value }
+    ivars&.each { |key, value| controller.instance_variable_set :"@#{key}", value }
   end
 
   def turbo_stream

lib/turbo_boost/commands/command_callbacks.rb

@@ -11,8 +11,26 @@ module TurboBoost::Commands::CommandCallbacks
   NAME = :perform_command
 
   module ClassMethods
+    # Configure an abort handler
+    #
+    # @yield [TurboBoost::Commands::Command, StandardError] The block to execute if the command is aborted
+    # @yieldparam command [TurboBoost::Commands::Command] The command instance
+    # @yieldparam error [StandardError] The error that was raised in a `before_command` callback
+    def on_abort(&block)
+      @on_abort = block
+    end
+
+    # Configure an error handler
+    #
+    # @yield [TurboBoost::Commands::Command, StandardError] The block to execute if the command raises an error during execution
+    # @yieldparam command [TurboBoost::Commands::Command] The command instance
+    # @yieldparam error [StandardError] The error that was raised
+    def on_error(&block)
+      @on_error = block
+    end
+
     [:before, :after, :around].each do |type|
-      define_method "#{type}_command" do |*method_names, &blk|
+      define_method :"#{type}_command" do |*method_names, &blk|
         options = callback_options(method_names.extract_options!)
 
         # convert only to if
@@ -29,7 +47,7 @@ module ClassMethods
         method_names.each { |method_name| set_callback NAME, type, method_name, options }
       end
 
-      define_method "skip_#{type}_command" do |*method_names, &blk|
+      define_method :"skip_#{type}_command" do |*method_names, &blk|
         options = callback_options(method_names.extract_options!)
 
         # convert only to if
@@ -66,7 +84,7 @@ def callback_options(options)
                       callback.call
                       false # everything is ok
                     rescue => error
-                      command.send :aborted!, error
+                      command.public_send :aborted!, error
                       true # halt the callback chain
                     end
                   }
@@ -106,14 +124,24 @@ def succeeded?
 
   private
 
+  def abort_handler
+    self.class.instance_variable_get(:@on_abort) || ->(*_) {}
+  end
+
   def aborted!(error)
     changed @aborted = true
     notify_observers :aborted, error: error
+    abort_handler.call self, error
+  end
+
+  def error_handler
+    self.class.instance_variable_get(:@on_error) || ->(*_) {}
   end
 
   def errored!(error)
     changed @errored = true
     notify_observers :errored, error: error
+    error_handler.call self, error
   end
 
   def performed!

lib/turbo_boost/commands/runner.rb

@@ -182,9 +182,9 @@ def handle_command_event(*args)
     options = args.extract_options!
     case event
     when :aborted
-      prevent_controller_action error: error
+      prevent_controller_action error: options[:error]
       append_streams_to_response_body
-    when :errored then prevent_controller_action(**options)
+    when :errored then prevent_controller_action error: options[:error]
     when :performed then prevent_controller_action if should_prevent_controller_action?
     end
   end

lib/turbo_boost/commands/sanitizer.rb

@@ -7,7 +7,7 @@ class TurboBoost::Commands::Sanitizer
   attr_reader :scrubber
 
   def sanitize(value)
-    super value, scrubber: scrubber
+    super(value, scrubber: scrubber)
   end
 
   private

test/dummy/app/helpers/tailwind_helper.rb

@@ -17,7 +17,7 @@ module TailwindHelper
   def tailwind_defaults
     @tailwind_defaults ||= self.class.instance_variable_get(:@tailwind_defaults)
     @tailwind_defaults ||= begin
-      defaults = YAML.safe_load(File.read(Rails.root.join("app/views/components/_tailwind.yml.erb")))
+      defaults = YAML.safe_load_file(Rails.root.join("app/views/components/_tailwind.yml.erb"))
       self.class.instance_variable_set(:@tailwind_defaults, defaults) unless Rails.env.development?
       defaults
     end

test/dummy/db/structure.sql

@@ -5,4 +5,3 @@ CREATE TABLE sqlite_sequence(name,seq);
 INSERT INTO "schema_migrations" (version) VALUES
 ('20221230164522');
 
-

turbo_boost-commands.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,lib}/**/*", "MIT-LICENSE", "README.md"]
 
-  s.required_ruby_version = ">= 2.7.3"
+  s.required_ruby_version = ">= 2.7.5"
   s.add_dependency "rails", ">= 6.1"
   s.add_dependency "turbo-rails", ">= 1.1"
   s.add_dependency "turbo_boost-streams", ">= 0.0.8"