aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support.rb2
-rw-r--r--activesupport/lib/active_support/actionable_error.rb16
-rw-r--r--activesupport/test/actionable_error_test.rb6
3 files changed, 7 insertions, 17 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 40a9181493..9e242ddeaa 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -33,8 +33,8 @@ require "active_support/core_ext/date_and_time/compatibility"
module ActiveSupport
extend ActiveSupport::Autoload
- autoload :ActionableError
autoload :Concern
+ autoload :ActionableError
autoload :CurrentAttributes
autoload :Dependencies
autoload :DescendantsTracker
diff --git a/activesupport/lib/active_support/actionable_error.rb b/activesupport/lib/active_support/actionable_error.rb
index 8adf40cc3d..7db14cd178 100644
--- a/activesupport/lib/active_support/actionable_error.rb
+++ b/activesupport/lib/active_support/actionable_error.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require "active_support/concern"
-
module ActiveSupport
# Actionable errors let's you define actions to resolve an error.
#
@@ -11,14 +9,10 @@ module ActiveSupport
module ActionableError
extend Concern
- NonActionable = Class.new(StandardError)
-
- NoActions = Hash.new do |_, name| # :nodoc:
- raise NonActionable, "Cannot find action \"#{name}\""
- end
+ class NonActionable < StandardError; end
included do
- class_attribute :_actions, default: NoActions.dup
+ class_attribute :_actions, default: {}
end
def self.actions(error) # :nodoc:
@@ -26,12 +20,14 @@ module ActiveSupport
when ActionableError, -> it { Class === it && it < ActionableError }
error._actions
else
- NoActions
+ {}
end
end
def self.dispatch(error, name) # :nodoc:
- actions(error.is_a?(String) ? error.constantize : error)[name].call
+ actions(error).fetch(name).call
+ rescue KeyError
+ raise NonActionable, "Cannot find action \"#{name}\""
end
module ClassMethods
diff --git a/activesupport/test/actionable_error_test.rb b/activesupport/test/actionable_error_test.rb
index fb2abf2bcf..63046b937c 100644
--- a/activesupport/test/actionable_error_test.rb
+++ b/activesupport/test/actionable_error_test.rb
@@ -37,12 +37,6 @@ class ActionableErrorTest < ActiveSupport::TestCase
end
end
- test "dispatches actions from error class as string and name" do
- assert_changes "DispatchableError.flip2", from: false, to: true do
- ActiveSupport::ActionableError.dispatch DispatchableError.name, "Flip 2"
- end
- end
-
test "cannot dispatch missing actions" do
err = assert_raises ActiveSupport::ActionableError::NonActionable do
ActiveSupport::ActionableError.dispatch NonActionableError, "action"