Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RouteSet: optimize routes generation when globbing is used #6144

Merged
merged 1 commit into from May 3, 2012
Merged

RouteSet: optimize routes generation when globbing is used #6144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions actionpack/lib/action_dispatch/routing/route_set.rb
View file
Open in desktop
Expand Up @@ -202,7 +202,7 @@ def #{selector}(*args)

# Clause check about when we need to generate an optimized helper.
def optimize_helper?(route) #:nodoc:
route.ast.grep(Journey::Nodes::Star).empty? && route.requirements.except(:controller, :action).empty?
route.requirements.except(:controller, :action).empty?
end

# Generates the interpolation to be used in the optimized helper.
Expand All @@ -214,7 +214,10 @@ def optimized_helper(route)
end

route.required_parts.each_with_index do |part, i|
string_route.gsub!(part.inspect, "\#{Journey::Router::Utils.escape_fragment(args[#{i}].to_param)}")
# 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)}")
end

string_route
Expand Down