Changeset 462

Timestamp:

01/20/05 14:13:34 (4 years ago)

Author:

david

Message:

Fixed that all redirect and render calls now return true, so you can use the pattern of "do and return". Added that renders and redirects called in before_filters will have the same effect as returning false: stopping the chain. Added that only one render or redirect can happen per action. The first call wins and subsequent calls are ignored.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (5 diffs)
• trunk/actionpack/lib/action_controller/filters.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/filters_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Fixed that a default fragment store wan't being set to MemoryStore as intended.
+
+* Fixed that all redirect and render calls now return true, so you can use the pattern of "do and return". Example:
+
+    def show
+      redirect_to(:action => "login") and return unless @person.authenticated?
+      render_text "I won't happen unless the person is authenticated"
+    end
+
+* Added that renders and redirects called in before_filters will have the same effect as returning false: stopping the chain. Example:
+
+    class WeblogController
+      before_filter { |c| c.send(:redirect_to_url("http://www.farfaraway.com")}) }
+      
+      def hello
+        render_text "I will never be called"
+      end
+    end
+
+
+* Added that only one render or redirect can happen per action. The first call wins and subsequent calls are ignored. Example:
+
+    def do_something
+      redirect_to :action => "elsewhere"
+      render_action "overthere"
+    end
+  
+  Only the redirect happens. The rendering call is simply ignored.
+
+
-*1.3.1* (January 18th, 2005)
-

trunk/actionpack/lib/action_controller/base.rb

@@ -163 +163 @@
-  # For more examples of redirecting options, have a look at the unit test in test/controller/url_test.rb. It's very readable and will give
-  # you an excellent understanding of the different options and what they do.
+  #
+  # == Calling multiple redirects or renders
+  #
+  # The rule for handling calls of multiple redirects and renders is that the first call wins. So in the following example:
+  #
+  #   def do_something
+  #     redirect_to :action => "elsewhere"
+  #     render_action "overthere"
+  #   end
+  #
+  # Only the redirect happens. The rendering call is simply ignored.
-  #
-  # == Environments
@@ -386 +397 @@
-      # Use block for response body if provided (useful for deferred rendering or streaming output).
-      def render_text(text = nil, status = nil, &block) #:doc:
+        return if performed?
-        add_variables_to_assigns
-        @response.headers["Status"] = status || DEFAULT_RENDER_STATUS_CODE
-        @response.body = block_given? ? block : text
-        @performed_render = true
-        return false
-      end
-      
@@ -542 +553 @@
-      # second parameter and the browser will get "301 Moved Permanently" instead of "302 Found".
-      def redirect_to_url(url, permanently = false) #:doc:
+        return if performed?
-        logger.info("Redirected to #{url}") unless logger.nil?
-        @response.redirect(url, permanently)
-        @performed_redirect = true
-        return false
-      end
-
@@ -595 +606 @@
-        if action_methods.include?(action_name) || action_methods.include?('method_missing')
-          send(action_name)
-@performed_render || @performed_redirect
+performed?
-        elsif template_exists? && template_public?
-          render
@@ -601 +612 @@
-          raise UnknownAction, "No action responded to #{action_name}", caller
-        end
+      end
+      
+      def performed?
+        @performed_render || @performed_redirect
-      end
-

trunk/actionpack/lib/action_controller/filters.rb

@@ -13 +13 @@
-    # Filters have access to the request, response, and all the instance variables set by other filters in the chain
-    # or by the action (in the case of after filters). Additionally, it's possible for a pre-processing <tt>before_filter</tt>
-. This is especially useful for
-filters like authentication where you're not interested in allowing the action to be performed if the proper
-
+ or performing a redirect or render. 
+This is especially useful for filters like authentication where you're not interested in allowing the action to be
+performed if the proper 
-    #
-    # == Filter inheritance
@@ -291 +291 @@
-
-      def perform_action_with_filters
-
+ || performed?
-        perform_action_without_filters
-        after_action

trunk/actionpack/test/controller/filters_test.rb

@@ -13 +13 @@
-        @ran_filter ||= []
-        @ran_filter << "ensure_login"
+      end
+  end
+
+  class RenderingController < ActionController::Base
+    before_filter :render_something_else
+
+    def show
+      @ran_action = true
+      render_text "ran action"
+    end
+
+    private
+      def render_something_else
+        render_text "something else"
-      end
-  end
@@ -265 +279 @@
-                 MixedFilterController.execution_log
-  end
+  
+  def test_rendering_breaks_filtering_chain
+    response = test_process(RenderingController)
+    assert_equal "something else", response.body
+    assert !response.template.assigns["ran_action"]
+  end
-
-  private