aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/route_set.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-05-21 14:27:09 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-05-21 14:27:30 -0700
commit4d1b3a13129eb7d5fdb1564706acbcd25a5ffa9b (patch)
tree2f991e9a772cf1fc52273918cd01a1853fafb6c6 /actionpack/lib/action_dispatch/routing/route_set.rb
parent931ee4186b877856b212b0085cd7bd7f6a4aea67 (diff)
downloadrails-4d1b3a13129eb7d5fdb1564706acbcd25a5ffa9b.tar.gz
rails-4d1b3a13129eb7d5fdb1564706acbcd25a5ffa9b.tar.bz2
rails-4d1b3a13129eb7d5fdb1564706acbcd25a5ffa9b.zip
reuse path formatter from the non-optimized path.
The optimized and non-optimized path share more code now without significant performance degretation
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 72c0aa61ee..31005b2daf 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -168,7 +168,6 @@ module ActionDispatch
@klass = Journey::Router::Utils
@required_parts = @route.required_parts
@arg_size = @required_parts.size
- @optimized_path = @route.optimized_path
end
def call(t, args)
@@ -191,11 +190,7 @@ module ActionDispatch
raise_generation_error(params, missing_keys)
end
- @optimized_path.map{ |segment| replace_segment(params, segment) }.join
- end
-
- def replace_segment(params, segment)
- Symbol === segment ? @klass.escape_segment(params[segment]) : segment
+ @route.format params
end
def optimize_routes_generation?(t)