diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-10 23:58:41 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-10 23:58:47 -0300 |
| commit | ac7e1700f1fd08b50011c256bfa2e382517edb4a (patch) | |
| tree | 52131d255b2fe17352e8f2da04fdeb7284de9455 | |
| parent | a63fc94aa3689f1e781ac51411ec79a81c011d8a (diff) | |
| download | rails-ac7e1700f1fd08b50011c256bfa2e382517edb4a.tar.gz rails-ac7e1700f1fd08b50011c256bfa2e382517edb4a.tar.bz2 rails-ac7e1700f1fd08b50011c256bfa2e382517edb4a.zip | |
Further refactor build_conditions in route set
Return the conditions from the keep_if call, and ignore the value
argument since it's not being used.
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index d3f66f042c..32d267d1d6 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -409,21 +409,19 @@ module ActionDispatch def build_conditions(current_conditions, path_values) conditions = current_conditions.dup - verbs = conditions[:request_method] || [] - # Rack-Mount requires that :request_method be a regular expression. # :request_method represents the HTTP verb that matches this route. # # Here we munge values before they get sent on to rack-mount. + verbs = conditions[:request_method] || [] unless verbs.empty? conditions[:request_method] = %r[^#{verbs.join('|')}$] end - conditions.keep_if do |k,v| + + conditions.keep_if do |k, _| k == :action || k == :controller || @request_class.public_method_defined?(k) || path_values.include?(k) end - - conditions end private :build_conditions |