aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-14 11:03:49 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-14 11:03:49 -0700
commitb6146b0d967c34f104c7301ecc62b2d866bbb5c0 (patch)
treef4b6c233f03de4fb04a40db3f2ba2376431f6e5a /actionpack/lib/action_dispatch/routing/mapper.rb
parent4a591ce2f81d4ff56bad4b483fcc7ebbe9c0dd09 (diff)
downloadrails-b6146b0d967c34f104c7301ecc62b2d866bbb5c0.tar.gz
rails-b6146b0d967c34f104c7301ecc62b2d866bbb5c0.tar.bz2
rails-b6146b0d967c34f104c7301ecc62b2d866bbb5c0.zip
rm path_params method
We don't need a method for something like this. I want to pull this up the stack as well and move the module + :controller ArgumentError up the stack as well
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index aa3fcf335b..c4572916ac 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -106,7 +106,7 @@ module ActionDispatch
@default_controller = controller
@default_action = default_action
- path_params = path_params ast
+ path_params = ast.find_all(&:symbol?).map(&:to_sym)
options = add_wildcard_options(options, formatted, ast)
@@ -305,10 +305,6 @@ module ActionDispatch
end
end
- def path_params(ast)
- ast.grep(Journey::Nodes::Symbol).map { |n| n.name.to_sym }
- end
-
def dispatcher(raise_on_name_error)
@set.dispatcher raise_on_name_error
end