aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-14 10:44:49 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-14 10:44:49 -0700
commitb592c5b607e4879c0b603bf636cf6d11e9f4b8d2 (patch)
tree8bdc00f903c4648b9ec3a40c64419b1dc9c7a7f6 /actionpack/lib/action_dispatch/routing/mapper.rb
parentaaaa67902ee1d129a6907e4ebd726f383ad7002b (diff)
downloadrails-b592c5b607e4879c0b603bf636cf6d11e9f4b8d2.tar.gz
rails-b592c5b607e4879c0b603bf636cf6d11e9f4b8d2.tar.bz2
rails-b592c5b607e4879c0b603bf636cf6d11e9f4b8d2.zip
pass the path ast down
now we don't need to add it to a hash and delete it from the hash later just to pass it around
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 98c17c6dbb..40b10d33e9 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -134,7 +134,6 @@ module ActionDispatch
@defaults = formats[:defaults].merge(@defaults).merge(normalize_defaults(options))
@conditions[:required_defaults] = (split_options[:required_defaults] || []).map(&:first)
- @conditions[:parsed_path_info] = ast
unless via == [:all]
@conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase }
end
@@ -1605,7 +1604,7 @@ module ActionDispatch
mapping = Mapping.build(@scope, @set, ast, controller, default_action, to, via, formatted, options_constraints, options)
app, conditions, requirements, defaults = mapping.to_route
- @set.add_route(app, conditions, requirements, defaults, as, anchor)
+ @set.add_route(app, conditions, ast, requirements, defaults, as, anchor)
end
def root(path, options={})