From 5966b801ced62bdfcf1c8189bc068911db90ac13 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Mon, 1 Feb 2016 22:11:52 +0100 Subject: Simplify filter normalization. Assume the filter is a string, if it wasn't a hash and isn't nil. Remove needless else and rely on Ruby's default nil return. Add spaces within hash braces. --- actionpack/lib/action_dispatch/routing/inspector.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_dispatch/routing') diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb index 1ca2a3b683..115ec98ea9 100644 --- a/actionpack/lib/action_dispatch/routing/inspector.rb +++ b/actionpack/lib/action_dispatch/routing/inspector.rb @@ -83,11 +83,9 @@ module ActionDispatch def normalize_filter(filter) if filter.is_a?(Hash) && filter[:controller] - {controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/} - elsif filter.is_a?(String) - {controller: /#{filter}/, action: /#{filter}/} - else - nil + { controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/ } + elsif filter + { controller: /#{filter}/, action: /#{filter}/ } end end -- cgit v1.2.3