responders 0.5.3 → 0.5.4

data/CHANGELOG.rdoc

@@ -1,6 +1,7 @@
 == 0.5
 
 * Added Railtie and better Rails 3 support
+* Added :flash_now as option
 
 == 0.4
 

data/lib/responders/flash_responder.rb

@@ -80,9 +80,10 @@ module Responders
 
     def initialize(controller, resources, options={})
       super
-      @flash  = options.delete(:flash)
-      @notice = options.delete(:notice)
-      @alert  = options.delete(:alert)
+      @flash     = options.delete(:flash)
+      @notice    = options.delete(:notice)
+      @alert     = options.delete(:alert)
+      @flash_now = options.delete(:flash_now)
     end
 
     def to_html
@@ -94,10 +95,10 @@ module Responders
 
     def set_flash_message!
       if has_errors?
-        controller.flash[:alert] ||= @alert if @alert
+        set_flash(:alert, @alert)
         status = Responders::FlashResponder.flash_keys.last
       else
-        controller.flash[:notice] ||= @notice if @notice
+        set_flash(:notice, @notice)
         status = Responders::FlashResponder.flash_keys.first
       end
 
@@ -105,7 +106,14 @@ module Responders
 
       options = mount_i18n_options(status)
       message = ::I18n.t options[:default].shift, options
-      controller.flash[status] = message unless message.blank?
+      set_flash(status, message)
+    end
+
+    def set_flash(key, value)
+      return if value.blank?
+      flash = controller.flash
+      flash = flash.now if @flash_now
+      flash[key] ||= value
     end
 
     def set_flash_message? #:nodoc:

data/lib/responders/version.rb

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

data/test/flash_responder_test.rb

@@ -18,7 +18,7 @@ class AddressesController < ApplicationController
   self.responder = FlashResponder
 
   def action
-    options = params.slice(:flash)
+    options = params.slice(:flash, :flash_now)
     flash[:success] = "Flash is set" if params[:set_flash]
     respond_with(@resource, options)
   end
@@ -107,6 +107,13 @@ class FlashResponderTest < ActionController::TestCase
     assert_equal "Resource with block created with success", flash[:success]
   end
 
+  def test_sets_flash_message_can_be_set_to_now
+    @now = {}
+    @controller.flash.expects(:now).returns(@now)
+    post :create, :flash_now => true
+    assert_equal "Resource created with success", @now[:success]
+  end
+
   def test_sets_message_based_on_notice_key
     Responders::FlashResponder.flash_keys = [ :notice, :alert ]
     post :another

data/test/test_helper.rb

@@ -20,8 +20,6 @@ RAILS_ROOT = "anywhere"
 
 require 'active_support'
 require 'action_controller'
-require 'action_dispatch/middleware/flash'
-
 require 'rails/railtie'
 
 class ApplicationController < ActionController::Base
@@ -36,12 +34,19 @@ I18n.reload!
 
 ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 
-ActionController::Routing::Routes.draw do |map|
+Responders::Router = ActionDispatch::Routing::RouteSet.new
+Responders::Router.draw do |map|
   map.connect 'admin/:action', :controller => "admin/addresses"
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action'
 end
 
+class ActiveSupport::TestCase
+  setup do
+    @router = Responders::Router
+  end
+end
+
 class Model < Struct.new(:updated_at)
   attr_writer :new_record
 

metadata

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