From f55514125cae291791365effc856d237008f7cd2 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Tue, 17 Mar 2009 18:04:22 -0700 Subject: Working toward getting a basic AbstractController framework --- actionpack/lib/action_controller/abstract/base.rb | 12 +++++++++++- actionpack/lib/action_controller/abstract/exceptions.rb | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 actionpack/lib/action_controller/abstract/exceptions.rb (limited to 'actionpack/lib/action_controller/abstract') diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb index fa86d68c04..ade7719cc0 100644 --- a/actionpack/lib/action_controller/abstract/base.rb +++ b/actionpack/lib/action_controller/abstract/base.rb @@ -17,14 +17,24 @@ module AbstractController end def process(action_name) + unless respond_to_action?(action_name) + raise ActionNotFound, "The action '#{action_name}' could not be found" + end + @_action_name = action_name process_action self.response_obj[:body] = self.response_body self end + private + def process_action - send(action_name) + respond_to?(action_name) ? send(action_name) : send(:action_missing, action_name) + end + + def respond_to_action?(action_name) + respond_to?(action_name) || respond_to?(:action_missing, true) end end diff --git a/actionpack/lib/action_controller/abstract/exceptions.rb b/actionpack/lib/action_controller/abstract/exceptions.rb new file mode 100644 index 0000000000..ec4680629b --- /dev/null +++ b/actionpack/lib/action_controller/abstract/exceptions.rb @@ -0,0 +1,3 @@ +module AbstractController + class ActionNotFound < StandardError ; end +end \ No newline at end of file -- cgit v1.2.3