responders 0.5.4 → 0.5.5

data/lib/responders/flash_responder.rb

@@ -64,6 +64,8 @@ module Responders
   #
   #     respond_with(@user, :notice => "Hooray! Welcome!", :alert => "Woot! You failed.")
   #
+  # * :flash_now - Sets the flash message using flash.now. Accepts true, :on_failure or :on_sucess.
+  #
   # == Configure status keys
   #
   # As said previously, FlashResponder by default use :notice and :alert
@@ -87,8 +89,8 @@ module Responders
     end
 
     def to_html
-      super
       set_flash_message! if set_flash_message?
+      super
     end
 
   protected
@@ -112,10 +114,14 @@ module Responders
     def set_flash(key, value)
       return if value.blank?
       flash = controller.flash
-      flash = flash.now if @flash_now
+      flash = flash.now if set_flash_now?
       flash[key] ||= value
     end
 
+    def set_flash_now?
+      (@flash_now == true) || (has_errors? ? @flash_now == :on_failure : @flash_now == :on_success)
+    end
+
     def set_flash_message? #:nodoc:
       !get? && @flash != false
     end

data/lib/responders/version.rb

@@ -1,3 +1,3 @@
 module Responders
-  VERSION = "0.5.4".freeze
+  VERSION = "0.5.5".freeze
 end

data/test/flash_responder_test.rb

@@ -114,6 +114,18 @@ class FlashResponderTest < ActionController::TestCase
     assert_equal "Resource created with success", @now[:success]
   end
 
+  def test_sets_flash_message_can_be_set_to_now_only_on_success
+    @now = {}
+    @controller.flash.expects(:now).returns(@now)
+    post :create, :flash_now => :on_success
+    assert_equal "Resource created with success", @now[:success]
+  end
+
+  def test_sets_flash_message_can_be_set_to_now_only_on_failure
+    @controller.flash.expects(:now).never
+    post :create, :flash_now => :on_failure
+  end
+
   def test_sets_message_based_on_notice_key
     Responders::FlashResponder.flash_keys = [ :notice, :alert ]
     post :another

data/test/test_helper.rb

@@ -16,7 +16,6 @@ require 'mocha'
 
 # Configure Rails
 ENV["RAILS_ENV"] = "test"
-RAILS_ROOT = "anywhere"
 
 require 'active_support'
 require 'action_controller'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 +01:00
+date: 2010-03-26 00:00:00 +01:00
 default_executable: 
 dependencies: []