From 8e7a87d299483fce6af3be89e50deae43055a96f Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 21 May 2009 01:38:48 +0200
Subject: Make ActionController::Flash work with new_base

---
 .../lib/action_controller/base/chained/flash.rb    | 74 +++++++++++++++-------
 actionpack/lib/action_controller/new_base.rb       |  5 +-
 actionpack/lib/action_controller/new_base/base.rb  |  3 +
 actionpack/lib/action_controller/new_base/http.rb  |  2 +-
 .../lib/action_controller/new_base/session.rb      | 11 ++++
 5 files changed, 71 insertions(+), 24 deletions(-)
 create mode 100644 actionpack/lib/action_controller/new_base/session.rb

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/base/chained/flash.rb b/actionpack/lib/action_controller/base/chained/flash.rb
index 56ee9c67e2..6bd482d85a 100644
--- a/actionpack/lib/action_controller/base/chained/flash.rb
+++ b/actionpack/lib/action_controller/base/chained/flash.rb
@@ -26,9 +26,18 @@ module ActionController #:nodoc:
   #
   # See docs on the FlashHash class for more details about the flash.
   module Flash
-    def self.included(base)
-      base.class_eval do
-        include InstanceMethods
+    extend ActiveSupport::DependencyModule
+
+    # TODO : Remove the defined? check when new base is the main base
+    depends_on Session if defined?(ActionController::Http)
+    
+    included do
+      # TODO : Remove the defined? check when new base is the main base
+      if defined?(ActionController::Http)
+        include InstanceMethodsForNewBase
+      else
+        include InstanceMethodsForBase
+
         alias_method_chain :perform_action, :flash
         alias_method_chain :reset_session,  :flash
       end
@@ -135,29 +144,50 @@ module ActionController #:nodoc:
         end
     end
 
-    module InstanceMethods #:nodoc:
+    module InstanceMethodsForBase #:nodoc:
       protected
-        def perform_action_with_flash
-          perform_action_without_flash
-          remove_instance_variable(:@_flash) if defined? @_flash
-        end
 
-        def reset_session_with_flash
-          reset_session_without_flash
-          remove_instance_variable(:@_flash) if defined? @_flash
-        end
+      def perform_action_with_flash
+        perform_action_without_flash
+        remove_instance_variable(:@_flash) if defined?(@_flash)
+      end
 
-        # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
-        # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
-        # to put a new one.
-        def flash #:doc:
-          unless defined? @_flash
-            @_flash = session["flash"] ||= FlashHash.new
-            @_flash.sweep
-          end
+      def reset_session_with_flash
+        reset_session_without_flash
+        remove_instance_variable(:@_flash) if defined?(@_flash)
+      end
+    end
 
-          @_flash
-        end
+    module InstanceMethodsForNewBase #:nodoc:
+      protected
+
+      def reset_session
+        super
+        remove_flash_instance_variable
+      end
+
+      def process_action(method_name)
+        super
+        remove_flash_instance_variable
+      end
+      
+      def remove_flash_instance_variable
+        remove_instance_variable(:@_flash) if defined?(@_flash)
+      end
+    end
+
+    protected
+
+    # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
+    # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
+    # to put a new one.
+    def flash #:doc:
+      unless defined?(@_flash)
+        @_flash = session["flash"] ||= FlashHash.new
+        @_flash.sweep
+      end
+
+      @_flash
     end
   end
 end
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
index 3fc5d82d01..d2f6514ff9 100644
--- a/actionpack/lib/action_controller/new_base.rb
+++ b/actionpack/lib/action_controller/new_base.rb
@@ -10,7 +10,8 @@ module ActionController
   autoload :Rescue,               "action_controller/new_base/rescuable"
   autoload :Testing,              "action_controller/new_base/testing"
   autoload :UrlFor,               "action_controller/new_base/url_for"
-  
+  autoload :Session,              "action_controller/new_base/session"
+
   # Ported modules
   # require 'action_controller/routing'
   autoload :Caching,           'action_controller/caching'
@@ -23,6 +24,8 @@ module ActionController
   autoload :TestCase,          'action_controller/testing/test_case'
   autoload :UrlRewriter,       'action_controller/routing/generation/url_rewriter'
   autoload :UrlWriter,         'action_controller/routing/generation/url_rewriter'
+
+  autoload :Flash, 'action_controller/base/chained/flash'
   
   require 'action_controller/routing'
 end
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 3d8d46c9c2..eff7297973 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -14,6 +14,9 @@ module ActionController
     include ActionController::Layouts
     include ActionController::ConditionalGet
 
+    include ActionController::Session
+    include ActionController::Flash
+
     # Legacy modules
     include SessionManagement
     include ActionDispatch::StatusCodes
diff --git a/actionpack/lib/action_controller/new_base/http.rb b/actionpack/lib/action_controller/new_base/http.rb
index 17466a2d52..2525e221a6 100644
--- a/actionpack/lib/action_controller/new_base/http.rb
+++ b/actionpack/lib/action_controller/new_base/http.rb
@@ -37,7 +37,7 @@ module ActionController
     end
     
     delegate :headers, :to => "@_response"
-    
+
     def params
       @_params ||= @_request.parameters
     end
diff --git a/actionpack/lib/action_controller/new_base/session.rb b/actionpack/lib/action_controller/new_base/session.rb
new file mode 100644
index 0000000000..a8715555fb
--- /dev/null
+++ b/actionpack/lib/action_controller/new_base/session.rb
@@ -0,0 +1,11 @@
+module ActionController
+  module Session
+    def session
+      @_request.session
+    end
+
+    def reset_session
+      @_request.reset_session
+    end
+  end
+end
-- 
cgit v1.2.3