flash_rails_messages 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac8e089ebf1d9387ddd1c4b94d60e166d33a4911f48bc818551a7c2309b8370
-  data.tar.gz: ac6af14b093fae1c46e76671c6571d0a17ed9352cff64936c915e5e064c6fd14
+  metadata.gz: a2718f79c329e822f51f939ba80da9e201e0dd5f69759c151393f62cf46cada5
+  data.tar.gz: 2b8307ed629b532a9d6b1dd864a30fe2ee9825453c37bf4cbd871b55736533c2
 SHA512:
-  metadata.gz: 0342b06783f62263b3f4372810d4b642b8a872ea59784618edfe7e1d6f51f1cece8cefbf208594828854d7210f8d9fca7adb0dcf0e2c57a8aa3e39565bea831d
-  data.tar.gz: b78f1a5e51638e829c65200245732cd59791b21730dd8f35c3808597d3eb7c5814b25bac15a7df378423793d569eaaa21a5903a78b77ac16859740629ca76ae7
+  metadata.gz: e988fb5a8b2c4f2a58aaf29baa61d547b533e0a97b07579ecb6486851fcbf74ad8d6da6af24f93f273abd11c09cd2d2bec6555112b70e25e8b2cd9dd6e969c31
+  data.tar.gz: dc44669ea619c2cd527ed7f01b0c7c6e92c94ec1e5caa5064ae6bf6f325d358ed2c30e431dcf87bbc21b644bdf73abdea5f065e5f543ea96f11fdbc0628e7584

data/README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.com/alejandrodevs/flash_rails_messages.svg?branch=master)](https://travis-ci.org/alejandrodevs/flash_rails_messages) [![Coverage Status](https://coveralls.io/repos/github/alejandrodevs/flash_rails_messages/badge.svg?branch=master)](https://coveralls.io/github/alejandrodevs/flash_rails_messages?branch=master)
 
 This gem provides an easy and simple way to display flash rails messages.
-This works with [Bootstrap](http://getbootstrap.com/) and [Zurb Foundation 3](http://foundation.zurb.com/) frameworks.
+This works with [Bootstrap 4+](http://getbootstrap.com/) and [Zurb Foundation 6+](http://foundation.zurb.com/) frameworks.
 
 ## Installation
 
@@ -20,22 +20,22 @@ Or install it yourself as:
 
     $ gem install flash_rails_messages
 
-### Bootstrap
+### Bootstrap 4+
 
 To integrate **FlashRailsMessages** with [Bootstrap](http://getbootstrap.com/) run the next:
 
-```console
+```
 rails generate flash_rails_messages:install --bootstrap
 ```
 
 NOTE: Be sure that you added Bootstrap to your application.
 
 
-### Zurb Foundation 3
+### Zurb Foundation 6+
 
 To integrate **FlashRailsMessages** with [Zurb Foundation 3](http://foundation.zurb.com/) run the next:
 
-```console
+```
 rails generate flash_rails_messages:install --foundation
 ```
 
@@ -49,6 +49,18 @@ You just need to add the line below in your layout:
 <%= render_flash_messages %>
 ```
 
+### Dismissible alerts
+
+```erb
+<%= render_flash_messages dismissible: true %>
+```
+
+### Passing other options
+
+```erb
+<%= render_flash_messages dismissible: true, id: 'my-alert', class: 'custom-class' %>
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    flash_rails_messages (2.0.0)
+    flash_rails_messages (2.1.0)
       rails (>= 4.2)
 
 GEM

data/gemfiles/rails_6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    flash_rails_messages (2.0.0)
+    flash_rails_messages (2.1.0)
       rails (>= 4.2)
 
 GEM

data/lib/flash_rails_messages/base.rb

@@ -32,7 +32,8 @@ module FlashRailsMessages
     end
 
     def alert_options(type)
-      options.except(:dismissible)
+      default_alert_options
+        .merge(options.except(:dismissible))
         .merge(class: alert_classes(type))
     end
 
@@ -45,6 +46,10 @@ module FlashRailsMessages
       ].compact.join(' ').strip
     end
 
+    def default_alert_options
+      {}
+    end
+
     def default_alert_classes
       'alert'
     end

data/lib/flash_rails_messages/version.rb

@@ -1,3 +1,3 @@
 module FlashRailsMessages
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/generators/flash_rails_messages/templates/config/initializers/flash_rails_messages_bootstrap.rb

@@ -3,11 +3,14 @@ module FlashRailsMessages
     # BOOTSTRAP FRAMEWORK
     # =========================================
 
-    def alert_element(type, message)
-      content_tag :div, class: alert_classes(type), role: 'alert' do
-        close_element + message.html_safe
-      end
-    end
+    # def alert_element(type, message)
+      # content_tag :div, alert_options(type) do
+        # content = ActiveSupport::SafeBuffer.new
+        # content += close_element if options.fetch(:dismissible, false)
+        # content += message.html_safe
+        # content
+      # end
+    # end
 
     def close_element
       content_tag :button, type: 'button', class: 'close', 'data-dismiss': 'alert' do
@@ -16,9 +19,9 @@ module FlashRailsMessages
       end
     end
 
-    def default_alert_classes
-      'alert'
-    end
+    # def default_alert_classes
+      # 'alert'
+    # end
 
     def alert_type_classes
       {
@@ -30,7 +33,9 @@ module FlashRailsMessages
     end
 
     def custom_alert_classes
-      'alert-dismissible'
+      if options.fetch(:dismissible, false)
+        'alert-dismissible'
+      end
     end
   end
 end

data/lib/generators/flash_rails_messages/templates/config/initializers/flash_rails_messages_foundation.rb

@@ -3,33 +3,41 @@ module FlashRailsMessages
     # ZURB FOUNDATION FRAMEWORK
     # =========================================
 
-    def alert_element(type, message)
-      content_tag :div, class: alert_classes(type), 'data-alert': '' do
-        close_element + message.html_safe
+    # def alert_element(type, message)
+      # content_tag :div, alert_options(type) do
+        # content = ActiveSupport::SafeBuffer.new
+        # content += close_element if options.fetch(:dismissible, false)
+        # content += message.html_safe
+        # content
+      # end
+    # end
+
+    def close_element
+      content_tag :button, type: 'button', class: 'close-button', 'data-close': '' do
+        content_tag(:span, '×'.html_safe, 'aria-hidden': 'true')
       end
     end
 
-    #def close_element
-      #content_tag :a, class: 'close', href: '#' do
-        #'×'.html_safe
-      #end
-    #end
+    def default_alert_options
+      options.fetch(:dismissible, false) ?
+        { 'data-closable': '' } : {}
+    end
 
     def default_alert_classes
-      'alert-box'
+      'callout'
     end
 
     def alert_type_classes
       {
         success: 'success',
-        notice: 'info',
+        notice: 'success',
         alert: 'alert',
         error: 'alert',
       }
     end
 
-    #def custom_alert_classes
-      #Add custom alert classes as a string
-    #end
+    # def custom_alert_classes
+      # Add custom alert classes as a string
+    # end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_rails_messages
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Alejandro Gutiérrez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake