diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-28 16:31:40 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-28 16:31:40 -0700 |
commit | a729f4050766f97750dd006217a175229b09da34 (patch) | |
tree | fbc46b6ec62e660d18892ac947051dbb255badc7 /actionpack/lib/action_dispatch | |
parent | b27a3aff35bf2a7515d4236afe191a7c63481a23 (diff) | |
download | rails-a729f4050766f97750dd006217a175229b09da34.tar.gz rails-a729f4050766f97750dd006217a175229b09da34.tar.bz2 rails-a729f4050766f97750dd006217a175229b09da34.zip |
change to case / when on types
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 5027425d6b..72edf6725c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -247,16 +247,15 @@ module ActionDispatch @scope[:module] ) - if controller.is_a? Regexp + case controller + when Regexp hash[:controller] = controller + when String, Symbol + hash[:controller] = check_controller!(controller).to_s else - if controller - hash[:controller] = check_controller!(controller).to_s - else - unless segment_keys.include?(:controller) - message = "Missing :controller key on routes definition, please check your routes." - raise ArgumentError, message - end + unless segment_keys.include?(:controller) + message = "Missing :controller key on routes definition, please check your routes." + raise ArgumentError, message end end |