2 files changed, 23 insertions, 18 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index 2b5d3d85bf..f56f09c5b3 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -288,18 +288,23 @@ module Mime
       @@html_types.include?(to_sym) || @string =~ /html/
     end
 
+
     private
-      def method_missing(method, *args)
-        if method.to_s.ends_with? '?'
-          method[0..-2].downcase.to_sym == to_sym
-        else
-          super
-        end
-      end
 
-      def respond_to_missing?(method, include_private = false) #:nodoc:
-        method.to_s.ends_with? '?'
+    def to_ary; end
+    def to_a; end
+
+    def method_missing(method, *args)
+      if method.to_s.ends_with? '?'
+        method[0..-2].downcase.to_sym == to_sym
+      else
+        super
       end
+    end
+
+    def respond_to_missing?(method, include_private = false) #:nodoc:
+      method.to_s.ends_with? '?'
+    end
   end
 end
 
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 8aa02ec482..9a7e8a5a9c 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -8,14 +8,16 @@ module ActionDispatch
 
       class << self
         def extract_domain(host, tld_length = @@tld_length)
-          return nil unless named_host?(host)
-          host.split('.').last(1 + tld_length).join('.')
+          host.split('.').last(1 + tld_length).join('.') if named_host?(host)
         end
 
         def extract_subdomains(host, tld_length = @@tld_length)
-          return [] unless named_host?(host)
-          parts = host.split('.')
-          parts[0..-(tld_length+2)]
+          if named_host?(host)
+            parts = host.split('.')
+            parts[0..-(tld_length + 2)]
+          else
+            []
+          end
         end
 
         def extract_subdomain(host, tld_length = @@tld_length)
@@ -23,15 +25,13 @@ module ActionDispatch
         end
 
         def url_for(options = {})
-          path = ""
-          path << options.delete(:script_name).to_s.chomp("/")
+          path  = options.delete(:script_name).to_s.chomp("/")
           path << options.delete(:path).to_s
 
           params = options[:params] || {}
-          params.reject! {|k,v| v.to_param.nil? }
+          params.reject! { |_,v| v.to_param.nil? }
 
           result = build_host_url(options)
-
           result << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
           result << "?#{params.to_query}" unless params.empty?
           result << "##{Journey::Router::Utils.escape_fragment(options[:anchor].to_param.to_s)}" if options[:anchor]