responders 0.4.1 → 0.4.2

data/lib/responders/flash_responder.rb

@@ -87,27 +87,28 @@ module Responders
 
     def to_html
       super
+      set_flash_message! if set_flash_message?
+    end
 
-      if set_i18n_flash?
-        if has_errors?
-          controller.flash[:alert] ||= @alert if @alert
-          status = Responders::FlashResponder.flash_keys.last
-        else
-          controller.flash[:notice] ||= @notice if @notice
-          status = Responders::FlashResponder.flash_keys.first
-        end
-
-        return if controller.flash[status].present?
+  protected
 
-        options = mount_i18n_options(status)
-        message = ::I18n.t options[:default].shift, options
-        controller.flash[status] = message unless message.blank?
+    def set_flash_message!
+      if has_errors?
+        controller.flash[:alert] ||= @alert if @alert
+        status = Responders::FlashResponder.flash_keys.last
+      else
+        controller.flash[:notice] ||= @notice if @notice
+        status = Responders::FlashResponder.flash_keys.first
       end
-    end
 
-  protected
+      return if controller.flash[status].present?
+
+      options = mount_i18n_options(status)
+      message = ::I18n.t options[:default].shift, options
+      controller.flash[status] = message unless message.blank?
+    end
 
-    def set_i18n_flash? #:nodoc:
+    def set_flash_message? #:nodoc:
       !get? && @flash != false
     end
 

data/lib/responders/http_cache_responder.rb

@@ -15,23 +15,23 @@ module Responders
     end
 
     def to_format
-      if do_http_cache?
-        timestamp = resources.flatten.map do |resource|
-          (resource.updated_at || Time.now).utc if resource.respond_to?(:updated_at)
-        end.compact.max
-
-        controller.response.last_modified = timestamp if timestamp
-        if request.fresh?(controller.response)
-          head :not_modified
-          return
-        end
-      end
-
+      return if do_http_cache? && do_http_cache!
       super
     end
 
   protected
 
+    def do_http_cache!
+      timestamp = resources.flatten.map do |resource|
+        (resource.updated_at || Time.now).utc if resource.respond_to?(:updated_at)
+      end.compact.max
+
+      controller.response.last_modified = timestamp if timestamp
+
+      head :not_modified if fresh = request.fresh?(controller.response)
+      fresh
+    end
+
     def do_http_cache?
       get? && @http_cache != false && !new_record? && controller.response.last_modified.nil?
     end

data/lib/responders/version.rb

@@ -1,3 +1,3 @@
 module Responders
-  VERSION = "0.4.1".freeze
+  VERSION = "0.4.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: responders
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 +01:00
+date: 2010-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: []