diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-28 15:38:11 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-28 15:38:11 -0700 |
commit | f0eff10c090a56ea28201341361439dfbc31485b (patch) | |
tree | ac72fc86db8711f1608bf665bf853512ad6c8e25 /actionpack/lib | |
parent | ddda5e70f79288f03a873cc8b4dbc6c086f4ad82 (diff) | |
download | rails-f0eff10c090a56ea28201341361439dfbc31485b.tar.gz rails-f0eff10c090a56ea28201341361439dfbc31485b.tar.bz2 rails-f0eff10c090a56ea28201341361439dfbc31485b.zip |
reduce blank? checks
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index e0b725c8f2..565609542a 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -260,14 +260,19 @@ module ActionDispatch end end - controller = controller.to_s unless controller.is_a?(Regexp) + hash = {} + action = action.to_s unless action.is_a?(Regexp) + if controller.is_a? Regexp + hash[:controller] = controller + else + check_controller! controller.to_s + hash[:controller] = controller.to_s if controller + end + check_action! action - check_controller! controller - hash = {} - hash[:controller] = controller unless controller.blank? hash[:action] = action unless action.blank? hash end |