0
@@ -1,3 +1,8 @@
0
+*SVN*
0
+
0
+* Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] ||= 'New if not set' #2422 [Caio Chassot]
0
+
0
+
0
 *1.10.2* (October 26th, 2005)
0
 
0
 * Reset template variables after using render_to_string [skaes@web.de]

0
@@ -40,6 +40,10 @@ module ActionController #:nodoc:
0
         @flash.discard(k)
0
         v
0
       end
0
+      
0
+      def [](k)
0
+        @flash[k]
0
+      end
0
     end
0
     
0
     class FlashHash < Hash

0
@@ -9,6 +9,9 @@ class FlashTest < Test::Unit::TestCase
0
 
0
     def set_flash_now
0
       flash.now["that"] = "hello"
0
+      flash.now["foo"] ||= "bar"
0
+      flash.now["foo"] ||= "err"
0
+      @flashy = flash.now["that"]
0
       @flash_copy = {}.update flash
0
       render :inline => "hello"
0
     end
0
@@ -75,10 +78,13 @@ class FlashTest < Test::Unit::TestCase
0
     @request.action = "set_flash_now"
0
     response = process_request
0
     assert_equal "hello", response.template.assigns["flash_copy"]["that"]
0
+    assert_equal "bar"  , response.template.assigns["flash_copy"]["foo"]
0
+    assert_equal "hello", response.template.assigns["flashy"]
0
 
0
     @request.action = "attempt_to_use_flash_now"
0
     first_response = process_request
0
     assert_nil first_response.template.assigns["flash_copy"]["that"]
0
+    assert_nil first_response.template.assigns["flash_copy"]["foo"]
0
     assert_nil first_response.template.assigns["flashy"]
0
   end 
0