Changeset 2747

Timestamp:

10/26/05 13:14:10 (3 years ago)

Author:

david

Message:

Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] = 'New if not set' (closes #2422) [Caio Chassot]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/flash.rb (modified) (1 diff)
• trunk/actionpack/test/controller/flash_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] ||= 'New if not set' #2422 [Caio Chassot]
+
+
-*1.10.2* (October 26th, 2005)
-

trunk/actionpack/lib/action_controller/flash.rb

@@ -40 +40 @@
-        @flash.discard(k)
-        v
+      end
+      
+      def [](k)
+        @flash[k]
-      end
-    end

trunk/actionpack/test/controller/flash_test.rb

@@ -10 +10 @@
-    def set_flash_now
-      flash.now["that"] = "hello"
+      flash.now["foo"] ||= "bar"
+      flash.now["foo"] ||= "err"
+      @flashy = flash.now["that"]
-      @flash_copy = {}.update flash
-      render :inline => "hello"
@@ -76 +79 @@
-    response = process_request
-    assert_equal "hello", response.template.assigns["flash_copy"]["that"]
+    assert_equal "bar"  , response.template.assigns["flash_copy"]["foo"]
+    assert_equal "hello", response.template.assigns["flashy"]
-
-    @request.action = "attempt_to_use_flash_now"
-    first_response = process_request
-    assert_nil first_response.template.assigns["flash_copy"]["that"]
+    assert_nil first_response.template.assigns["flash_copy"]["foo"]
-    assert_nil first_response.template.assigns["flashy"]
-  end