voltron-flash 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5def506009a6ae42bb7bbeb189e5262a8257bef7
-  data.tar.gz: cb185dcedd211c8bfa1088cdc425d16e74f51861
+  metadata.gz: 0d659cb376f6d21612a62b40803e6abc7eaa21d6
+  data.tar.gz: f57c9abb3a446e306b8831d93d15fe54d80a9d01
 SHA512:
-  metadata.gz: deb79607add7c0ba5a82a8557e78e1caf0bf55e33ecb6fbaa7c1fec41794b1714e03ba516aae13fd462778db1e6dced36bd5842382d069ebcf953e47bc85303b
-  data.tar.gz: 73cacb5b7da4d052e92487995d11f8e94a384b4de2293ba6ae7996599e308856d3b0d688b973e72668c98f8276ced8109ce6c21dde15f280c168709831d92e0d
+  metadata.gz: 8a00c035cf0b05afe2429df810205743912893d281aa4f2ad0514b2b321048d16063e159de4c045034a13c6dcf085af553afaa0e0e82fbd83c1593f00a5965a2
+  data.tar.gz: 67c166c9edf0aa815e6503cfe9b3a4579cf7896a18d1b8f953760217dbecfe81f2b534c03b979229877f40aa1a71f4c0f4781a764010a0b1bf244cf15bda54b7

data/app/assets/javascripts/voltron-flash.js

@@ -1,6 +1,8 @@
 //= require voltron
 
 Voltron.addModule('Flash', function(){
+  var _initialized = false;
+
   var _defaults = {
     class: '',
     bind: 'body',
@@ -18,9 +20,12 @@ Voltron.addModule('Flash', function(){
 
   return {
     initialize: function(){
-      Voltron('Dispatch/addEventWatcher', 'click');
-      this.on('click:close-alert', 'click:close-notice', 'click:close-warning', this.clear);
-      this.addListener();
+      if(!_initialized){
+        _initialized = true;
+        Voltron('Dispatch/addEventWatcher', 'click');
+        this.on('click:close-alert', 'click:close-notice', 'click:close-warning', this.clear);
+        this.addListener();
+      }
     },
 
     setConfig: function(options){

data/app/views/voltron/flash.html.erb

@@ -1,16 +1,13 @@
 <% if flash.count > 0 %>
 <div id="flashes" class="<%= container_class %>">
 <% if Voltron.config.flash.group %>
-
   <% flash.each do |type,messages| %>
   <div class="flash <%= type %>">
     <p class="flash-message"><%= Array.wrap(messages).join("<br />").html_safe %></p>
     <button class="flash-close" type="button" id="close-<%= type %>" data-dispatch="click"></button>
   </div>
   <% end %>
-
 <% else %>
-
   <% flash.each do |type,messages| %>
     <% Array.wrap(messages).each do |message| %>
     <div class="flash <%= type %>">
@@ -19,7 +16,6 @@
     </div>
     <% end %>
   <% end %>
-
 <% end %>
 </div>
 <% end %>

data/lib/generators/templates/app/views/voltron/flash.html.erb

@@ -1,16 +1,13 @@
 <% if flash.count > 0 %>
 <div id="flashes" class="<%= container_class %>">
 <% if Voltron.config.flash.group %>
-
   <% flash.each do |type,messages| %>
   <div class="flash <%= type %>">
     <p class="flash-message"><%= Array.wrap(messages).join("<br />").html_safe %></p>
     <button class="flash-close" type="button" id="close-<%= type %>" data-dispatch="click"></button>
   </div>
   <% end %>
-
 <% else %>
-
   <% flash.each do |type,messages| %>
     <% Array.wrap(messages).each do |message| %>
     <div class="flash <%= type %>">
@@ -19,7 +16,6 @@
     </div>
     <% end %>
   <% end %>
-
 <% end %>
 </div>
 <% end %>

data/lib/voltron/flash.rb

@@ -17,7 +17,7 @@ module Voltron
     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
 
@@ -30,18 +30,16 @@ 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
-        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
 
@@ -49,6 +47,16 @@ module Voltron
         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
 

data/lib/voltron/flash/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voltron-flash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Hainer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Voltron library to more easily deal with flash messages