Changeset 6316

Timestamp:

03/04/07 20:32:38 (2 years ago)

Author:

david

Message:

Added Request#url that returns the complete URL used for the request [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (7 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added Request#url that returns the complete URL used for the request [DHH]
-
-* Extract dynamic scaffolding into a plugin.  #7700 [Josh Peek]

trunk/actionpack/lib/action_controller/request.rb

@@ -9 +9 @@
-    # such as { 'RAILS_ENV' => 'production' }.
-    attr_reader :env
-
-    # Returns both GET and POST parameters in a single hash.
-    def parameters
-      @parameters ||= request_parameters.update(query_parameters).update(path_parameters).with_indifferent_access
-    end
-
-    # Returns the HTTP request method as a lowercase symbol (:get, for example). Note, HEAD is returned as :get
@@ -127 +122 @@
-    end
-
+    # Returns the lowercase name of the HTTP server software.
+    def server_software
+      (@env['SERVER_SOFTWARE'] && /^([a-zA-Z]+)/ =~ @env['SERVER_SOFTWARE']) ? $1.downcase : nil
+    end
+
+
+    # Returns the complete URL used for this request
+    def url
+      request.protocol + request.host_with_port + request.request_uri
+    end
+
+    # Return 'https://' if this is an SSL request and 'http://' otherwise.
+    def protocol
+      ssl? ? 'https://' : 'http://'
+    end
+
+    # Is this an SSL request?
+    def ssl?
+      @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
+    end
+
+    # Returns the host for this request, such as example.com.
+    def host
+    end
+
+    # Returns a host:port string for this request, such as example.com or
+    # example.com:8080.
+    def host_with_port
+      host + port_string
+    end
+
+    # Returns the port number of this request as an integer.
+    def port
+      @port_as_int ||= @env['SERVER_PORT'].to_i
+    end
+
+    # Returns the standard port number for this request's protocol
+    def standard_port
+      case protocol
+        when 'https://' then 443
+        else 80
+      end
+    end
+
+    # Returns a port suffix like ":8080" if the port number of this request
+    # is not the default HTTP port 80 or HTTPS port 443.
+    def port_string
+      (port == standard_port) ? '' : ":#{port}"
+    end
+
-    # Returns the domain part of a host, such as rubyonrails.org in "www.rubyonrails.org". You can specify
-    # a different <tt>tld_length</tt>, such as 2 to catch rubyonrails.co.uk in "www.rubyonrails.co.uk".
@@ -142 +187 @@
-      parts = host.split('.')
-      parts[0..-(tld_length+2)]
-    end
-
-    # Receive the raw post data.
-    # This is useful for services such as REST, XMLRPC and SOAP
-    # which communicate over HTTP POST but don't use the traditional parameter format.
-    def raw_post
-      @env['RAW_POST_DATA']
-    end
-
@@ -169 +207 @@
-    end
-
-    # Return 'https://' if this is an SSL request and 'http://' otherwise.
-    def protocol
-      ssl? ? 'https://' : 'http://'
-    end
-
-    # Is this an SSL request?
-    def ssl?
-      @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
-    end
-
-    # Returns the interpreted path to requested resource after all the installation directory of this application was taken into account
-    def path
@@ -203 +231 @@
-    end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    end
-
@@ -247 +263 @@
-    end
-
-    # Returns the lowercase name of the HTTP server software.
-    def server_software
-      (@env['SERVER_SOFTWARE'] && /^([a-zA-Z]+)/ =~ @env['SERVER_SOFTWARE']) ? $1.downcase : nil
-    end
-
-    #--
@@ -261 +273 @@
-    end
-
-    # Returns the host for this request, such as example.com.
-    def host
-    end
-
-    def cookies #:nodoc:
-    end