Refactor Rack::Mime.match? conditionals to make them a bit cleaner

rack · Feb 9, 2013 · 5823752 · 5823752
1 parent 0722c99
commit 5823752
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/lib/rack/mime.rb b/lib/rack/mime.rb
@@ -29,21 +29,7 @@ def match?(value, matcher)
       v1, v2 = value.split('/', 2)
       m1, m2 = matcher.split('/', 2)
 
-      if m1 == '*'
-        if m2.nil? || m2 == '*'
-          return true
-        elsif m2 == v2
-          return true
-        else
-          return false
-        end
-      end
-
-      return false if v1 != m1
-
-      return true if m2.nil? || m2 == '*'
-
-      m2 == v2
+      (m1 == '*' || v1 == m1) && (m2.nil? || m2 == '*' || m2 == v2)
     end
     module_function :match?