TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

extract controller and action parsing to a method

Browse Source
This commit is contained in:
Aaron Patterson 2014-05-28 16:23:17 -07:00
parent bc916a7e58
commit 8d309832df
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@ -240,25 +240,12 @@ def default_controller_and_action
hash = {}
return hash if to.respond_to? :call
controller = default_controller
action = default_action
case to
when Symbol
action = to.to_s
when /#/
controller, action = to.split('#')
when String
controller = to
end
if @scope[:module] && !controller.is_a?(Regexp)
if controller =~ %r{\A/}
controller = controller[1..-1]
else
controller = [@scope[:module], controller].compact.join("/")
end
end
controller, action = get_controller_and_action(
default_controller,
default_action,
to,
@scope[:module]
)
if controller.is_a? Regexp
hash[:controller] = controller
@ -277,6 +264,26 @@ def default_controller_and_action
hash
end
def get_controller_and_action(controller, action, to, modyoule)
case to
when Symbol
action = to.to_s
when /#/
controller, action = to.split('#')
when String
controller = to
end
if modyoule && !controller.is_a?(Regexp)
if controller =~ %r{\A/}
controller = controller[1..-1]
else
controller = [modyoule, controller].compact.join("/")
end
end
[controller, action]
end
def check_action!(action)
unless action || segment_keys.include?(:action)
message = "Missing :action key on routes definition, please check your routes."