kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

stop evaling a string every time

Browse source
This commit is contained in:
Aaron Patterson 2013-01-25 10:37:42 -08:00
parent 27bccf02ee
commit 8e5b4372d0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -169,7 +169,7 @@ module ActionDispatch
def call(t, args)
if args.size == arg_size && !args.last.is_a?(Hash) && optimize_routes_generation?(t)
@options.merge!(t.url_options) if t.respond_to?(:url_options)
@options[:path] = eval("\"#{optimized_helper}\"")
@options[:path] = optimized_helper(args)
ActionDispatch::Http::URL.url_for(@options)
else
super
@ -178,8 +178,8 @@ module ActionDispatch
private
def optimized_helper
string_route = @route.ast.to_s
def optimized_helper(args)
string_route = @route.ast.to_s.dup
while string_route.gsub!(/\([^\)]*\)/, "")
true
@ -189,7 +189,7 @@ module ActionDispatch
# Replace each route parameter
# e.g. :id for regular parameter or *path for globbing
# with ruby string interpolation code
string_route.gsub!(/(\*|:)#{part}/, "\#{Journey::Router::Utils.escape_fragment(args[#{i}].to_param)}")
string_route.gsub!(/(\*|:)#{part}/, Journey::Router::Utils.escape_fragment(args[i].to_param))
end
string_route