diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-23 19:57:38 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-24 09:19:20 -0200 |
| commit | 5b9f983c65dcca590d5ff309cea4def61209790d (patch) | |
| tree | f5435e1116d004a45c46a4aa64f06f19fa5148e8 | |
| parent | b69fd477e522654f8ae8c1d4ae3a1ee1ce965752 (diff) | |
| download | rails-5b9f983c65dcca590d5ff309cea4def61209790d.tar.gz rails-5b9f983c65dcca590d5ff309cea4def61209790d.tar.bz2 rails-5b9f983c65dcca590d5ff309cea4def61209790d.zip | |
Simplify constraints condition in scope when checking for Hash
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 05cbcf709e..df4c95d909 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -641,19 +641,16 @@ module ActionDispatch # resources :posts # end def scope(*args) - options = args.extract_options! - options = options.dup - - options[:path] = args.flatten.join('/') if args.any? + options = args.extract_options!.dup recover = {} + options[:path] = args.flatten.join('/') if args.any? options[:constraints] ||= {} - unless options[:constraints].is_a?(Hash) - block, options[:constraints] = options[:constraints], {} - end if options[:constraints].is_a?(Hash) (options[:defaults] ||= {}).reverse_merge!(defaults_from_constraints(options[:constraints])) + else + block, options[:constraints] = options[:constraints], {} end scope_options.each do |option| |