Permalink
Browse files

skip dealing with params if none are provided

This lets us avoid

1. A slow call to Hash#slice
2. An is_a? test
3. Extra hash allocations (from slice)
4. String allocations

etc.
  • Loading branch information...
1 parent 73a7b52 commit dbb0bd8f3a43df9881033136421be4ad219b19b5 @tenderlove tenderlove committed May 10, 2014
Showing with 11 additions and 4 deletions.
  1. +11 −4 actionpack/lib/action_dispatch/http/url.rb
@@ -33,10 +33,8 @@ def url_for(options)
path = options[:script_name].to_s.chomp("/")
path << options[:path].to_s
- params = options[:params].is_a?(Hash) ? options[:params] : options.slice(:params)
- params.reject! { |_,v| v.to_param.nil? }
-
result = build_host_url(options)
+
if options[:trailing_slash]
if path.include?('?')
result << path.sub(/\?/, '/\&')
@@ -46,7 +44,16 @@ def url_for(options)
else
result << path
end
- result << "?#{params.to_query}" unless params.empty?
+
+ if options.key? :params
+ params = options[:params].is_a?(Hash) ?
+ options[:params] :
+ { params: options[:params] }
+
+ params.reject! { |_,v| v.to_param.nil? }
+ result << "?#{params.to_query}" unless params.empty?
+ end
+
result << "##{Journey::Router::Utils.escape_fragment(options[:anchor].to_param.to_s)}" if options[:anchor]
result
end

0 comments on commit dbb0bd8

Please sign in to comment.