lib/voltron/flash.rb in voltron-flash-0.1.1 vs lib/voltron/flash.rb in voltron-flash-0.1.2

@@ -15,11 +15,11 @@
     end
 
     def flash!(**flashes)
       flashes.symbolize_keys.each do |type,messages|
         stored_flashes[type] ||= []
-        stored_flashes[type] += Array.wrap(messages)
+        stored_flashes[type] << { ajax: flashes.delete(:ajax), messages: Array.wrap(messages) }
       end
     end
 
     private
 
@@ -28,26 +28,34 @@
       end
 
       # Before rendering, include any flash messages in flash.now,
       # so they will be available when the page is rendered
       def include_flash_now
-        if !request.xhr?
-          stored_flashes.each { |type,messages| flash.now[type] = messages }
-        end
+        flash_hash(true).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
       def include_flash_later
-        if request.xhr?
-          response.headers[Voltron.config.flash.header] = stored_flashes.to_json
-        elsif is_redirecting?
-          stored_flashes.each { |type,messages| flash[type] = messages }
+        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
+          }
+        end
+        flashes.reduce(Hash.new, :merge).reject { |k,v| v.blank? || k == :ajax }
       end
 
   end
 end
 
\ No newline at end of file