From 628e51ff109334223094e30ad1365188bbd7f9c6 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 6 Aug 2016 18:51:43 +0200
Subject: applies new string literal convention in actionpack/lib

The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.
---
 actionpack/lib/action_dispatch/http/url.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'actionpack/lib/action_dispatch/http/url.rb')

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 7a1350a46d..2087ad02cd 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -1,4 +1,4 @@
-require 'active_support/core_ext/module/attribute_accessors'
+require "active_support/core_ext/module/attribute_accessors"
 
 module ActionDispatch
   module Http
@@ -42,7 +42,7 @@ module ActionDispatch
         #    # Second-level domain example
         #    extract_subdomain('dev.www.example.co.uk', 2) # => "dev.www"
         def extract_subdomain(host, tld_length)
-          extract_subdomains(host, tld_length).join('.')
+          extract_subdomains(host, tld_length).join(".")
         end
 
         def url_for(options)
@@ -59,7 +59,7 @@ module ActionDispatch
           port     = options[:port]
 
           unless host
-            raise ArgumentError, 'Missing host to link to! Please provide the :host parameter, set default_url_options[:host], or set :only_path to true'
+            raise ArgumentError, "Missing host to link to! Please provide the :host parameter, set default_url_options[:host], or set :only_path to true"
           end
 
           build_host_url(host, port, protocol, options, path_for(options))
@@ -92,17 +92,17 @@ module ActionDispatch
         end
 
         def extract_domain_from(host, tld_length)
-          host.split('.').last(1 + tld_length).join('.')
+          host.split(".").last(1 + tld_length).join(".")
         end
 
         def extract_subdomains_from(host, tld_length)
-          parts = host.split('.')
+          parts = host.split(".")
           parts[0..-(tld_length + 2)]
         end
 
         def add_trailing_slash(path)
           # includes querysting
-          if path.include?('?')
+          if path.include?("?")
             path.sub!(/\?/, '/\&')
           # does not have a .format
           elsif !path.include?(".")
@@ -162,7 +162,7 @@ module ActionDispatch
           if subdomain == true
             return _host if domain.nil?
 
-            host << extract_subdomains_from(_host, tld_length).join('.')
+            host << extract_subdomains_from(_host, tld_length).join(".")
           elsif subdomain
             host << subdomain.to_param
           end
@@ -214,7 +214,7 @@ module ActionDispatch
       #   req = Request.new 'HTTP_HOST' => 'example.com', 'HTTPS' => 'on'
       #   req.protocol # => "https://"
       def protocol
-        @protocol ||= ssl? ? 'https://' : 'http://'
+        @protocol ||= ssl? ? "https://" : "http://"
       end
 
       # Returns the \host and port for this request, such as "example.com:8080".
@@ -235,7 +235,7 @@ module ActionDispatch
         if forwarded = x_forwarded_host.presence
           forwarded.split(/,\s?/).last
         else
-          get_header('HTTP_HOST') || "#{server_name || server_addr}:#{get_header('SERVER_PORT')}"
+          get_header("HTTP_HOST") || "#{server_name || server_addr}:#{get_header('SERVER_PORT')}"
         end
       end
 
@@ -248,7 +248,7 @@ module ActionDispatch
       #   req = Request.new 'HTTP_HOST' => 'example.com:8080'
       #   req.host # => "example.com"
       def host
-        raw_host_with_port.sub(/:\d+$/, ''.freeze)
+        raw_host_with_port.sub(/:\d+$/, "".freeze)
       end
 
       # Returns a \host:\port string for this request, such as "example.com" or
@@ -302,7 +302,7 @@ module ActionDispatch
       #   req.standard_port # => 80
       def standard_port
         case protocol
-          when 'https://' then 443
+          when "https://" then 443
           else 80
         end
       end
@@ -351,7 +351,7 @@ module ActionDispatch
       #   req = Request.new 'HTTP_HOST' => 'example.com:8080'
       #   req.port_string # => ":8080"
       def port_string
-        standard_port? ? '' : ":#{port}"
+        standard_port? ? "" : ":#{port}"
       end
 
       # Returns the requested port, such as 8080, based on SERVER_PORT
@@ -366,7 +366,7 @@ module ActionDispatch
       #   req = Request.new 'SERVER_PORT' => '8080'
       #   req.server_port # => 8080
       def server_port
-        get_header('SERVER_PORT').to_i
+        get_header("SERVER_PORT").to_i
       end
 
       # Returns the \domain part of a \host, such as "rubyonrails.org" in "www.rubyonrails.org". You can specify
-- 
cgit v1.2.3