voltron-flash 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d659cb376f6d21612a62b40803e6abc7eaa21d6
-  data.tar.gz: f57c9abb3a446e306b8831d93d15fe54d80a9d01
+  metadata.gz: 1f706827eaa82fc21f386839dd9b20f280573622
+  data.tar.gz: 6422d9fb168c0ba1e56732f56a80044706e5a8ed
 SHA512:
-  metadata.gz: 8a00c035cf0b05afe2429df810205743912893d281aa4f2ad0514b2b321048d16063e159de4c045034a13c6dcf085af553afaa0e0e82fbd83c1593f00a5965a2
-  data.tar.gz: 67c166c9edf0aa815e6503cfe9b3a4579cf7896a18d1b8f953760217dbecfe81f2b534c03b979229877f40aa1a71f4c0f4781a764010a0b1bf244cf15bda54b7
+  metadata.gz: 315ef39aaf64f42a72ef8d53612aa6fbdb3e6cbbcc25837d22dd92c0dafea867811acd3ad3584ce96bc12d5335e96238542c83e75521724d1c41405bb6e2dac7
+  data.tar.gz: 841e0719e3ed007b2298d058def944bf50061547e8825ee33c225c5be638200f4cde6da5cf1ac2e9e4b6d9860ff25dd64cca94429179006c993b544f3fdbb618

data/lib/voltron/flash/version.rb

@@ -1,5 +1,5 @@
 module Voltron
   module Flash
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.3".freeze
   end
 end

data/lib/voltron/flash.rb

@@ -11,14 +11,22 @@ module Voltron
 
     def render(*args)
       include_flash_now
-      super *args
+      super
+    end
+
+    def redirect_to(options={}, response_status={})
+      include_flash_later
+      super
     end
 
     def flash!(**flashes)
       flashes.symbolize_keys.each do |type,messages|
         stored_flashes[type] ||= []
-        stored_flashes[type] << { ajax: flashes.delete(:ajax), messages: Array.wrap(messages) }
+        stored_flashes[type] += Array.wrap(messages)
       end
+
+      # Set the headers initially. If redirecting, they will be removed as the flash will instead be a part of `flash`
+      response.headers[Voltron.config.flash.header] = stored_flashes.to_json
     end
 
     private
@@ -30,31 +38,15 @@ module Voltron
       # Before rendering, include any flash messages in flash.now,
       # so they will be available when the page is rendered
       def include_flash_now
-        flash_hash(true).each { |type,messages| flash.now[type] = messages }
+        stored_flashes.each { |type,messages| flash.now[type] = messages }
       end
 
-      # If request is an ajax request, or we are redirecting, include flash messages
-      # in the appropriate outlet, either response headers or `flash` itself
+      # When redirecting, remove the flash from the headers (unless ajax request), append it all to the `flash` object
       def include_flash_later
-        if is_redirecting?
-          flash_hash.each { |type,messages| flash[type] = messages }
-        elsif request.xhr?
-          response.headers[Voltron.config.flash.header] = flash_hash.to_json
-        end
-      end
-
-      def is_redirecting?
-        self.status == 302 || self.status == 301
-      end
-
-      def flash_hash(rendering=false)
-        flashes = stored_flashes.map do |type,messages|
-          { type => messages.map do |f|
-              f[:messages] if !(f[:ajax] == false && request.xhr?) || (f[:ajax] == false && request.xhr? && rendering)
-            end.compact.flatten
-          }
+        unless request.xhr?
+          response.headers.except! Voltron.config.flash.header
+          stored_flashes.each { |type,messages| flash[type] = messages }
         end
-        flashes.reduce(Hash.new, :merge).reject { |k,v| v.blank? || k == :ajax }
       end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voltron-flash
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Eric Hainer