Changeset 7820

Timestamp:

10/09/07 23:07:36 (1 year ago)

Author:

nzkoz

Message:

Add :status to redirect_to allowing users to choose their own response code without manually setting headers. Closes #8297 [codahale, chasgrundy]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/response.rb (modified) (1 diff)
• trunk/actionpack/test/controller/redirect_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add :status to redirect_to allowing users to choose their own response code without manually setting headers. #8297 [codahale, chasgrundy]
-
-* Add link_to :back which uses your referrer with a fallback to a javascript link. #7366 [eventualbuddha, tarmo]

trunk/actionpack/lib/action_controller/base.rb

@@ -988 +988 @@
-      #   redirect_to :back
-      #
-
+
+
+
+
+
+
+
-      #
-      # When using <tt>redirect_to :back</tt>, if there is no referrer,
-      # RedirectBackError will be raised. You may specify some fallback
-      # behavior for this case by rescuing RedirectBackError.
-
+
+
+
+
+
+
+
+
+
+
-        case options
-          when %r{^\w+://.*}
-            raise DoubleRenderError if performed?
-
-
+ && logger.info?
+, interpret_status(status)
-            response.redirected_to = options
-            @performed_redirect = true
-
-          when String
-
+, :status=>status
-
-          when :back
-
+, :status=>status
-
-          when Hash
-
+, :status=>status
-            response.redirected_to = options
-
-          else
-
+, :status=>status
-        end
-      end

trunk/actionpack/lib/action_controller/response.rb

@@ -29 +29 @@
-    end
-
-permanently = false
-  = "302 Found" unless headers["Status"] == "301 Moved Permanently"
+response_status
+= response_status
-      self.headers["Location"] = to_url
-

trunk/actionpack/test/controller/redirect_test.rb

@@ -23 +23 @@
-  def simple_redirect
-    redirect_to :action => "hello_world"
+  end
+
+  def redirect_with_status 
+    redirect_to({:action => "hello_world", :status => 301})
+  end 
+
+  def redirect_with_status_hash
+    redirect_to({:action => "hello_world"}, {:status => 301})
+  end 
+
+  def url_redirect_with_status 
+    redirect_to("http://www.example.com", :status => :moved_permanently)
+  end 
+   
+  def url_redirect_with_status_hash 
+    redirect_to("http://www.example.com", {:status => 301})
+  end 
+
+  def relative_url_redirect_with_status 
+    redirect_to("/things/stuff", :status => :found)
+  end 
+   
+  def relative_url_redirect_with_status_hash
+    redirect_to("/things/stuff", {:status => 301})
+  end 
+   
+  def redirect_to_back_with_status 
+    redirect_to :back, :status => 307 
-  end
-
@@ -71 +99 @@
-    assert_response :redirect
-    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
+
+  def test_redirect_with_no_status
+    get :simple_redirect
+    assert_response 302
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
+
+  def test_redirect_with_status 
+    get :redirect_with_status 
+    assert_response 301 
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url 
+  end 
+
+  def test_redirect_with_status_hash 
+    get :redirect_with_status_hash
+    assert_response 301 
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url 
+  end
+   
+  def test_url_redirect_with_status 
+    get :url_redirect_with_status 
+    assert_response 301 
+    assert_equal "http://www.example.com", redirect_to_url 
+  end 
+
+  def test_url_redirect_with_status_hash
+    get :url_redirect_with_status_hash
+    assert_response 301 
+    assert_equal "http://www.example.com", redirect_to_url 
+  end 
+
+  
+  def test_relative_url_redirect_with_status 
+    get :relative_url_redirect_with_status 
+    assert_response 302
+    assert_equal "http://test.host/things/stuff", redirect_to_url 
+  end 
+   
+  def test_relative_url_redirect_with_status_hash
+    get :relative_url_redirect_with_status_hash
+    assert_response 301 
+    assert_equal "http://test.host/things/stuff", redirect_to_url 
+  end   
+   
+  def test_redirect_to_back_with_status 
+    @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from" 
+    get :redirect_to_back_with_status 
+    assert_response 307 
+    assert_equal "http://www.example.com/coming/from", redirect_to_url 
-  end
-