helper_methods 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f01c10ecb456e684d0eb7f3f93d364c8cddce4
-  data.tar.gz: 2e679a8275f2ab6b9ad3a6d063d4c0ebc3888453
+  metadata.gz: e0ee6329a068146220ee5900ac1e03fa7ec36f27
+  data.tar.gz: 5e32c9df7985a78d53b7690a1fbd89dc23af0a85
 SHA512:
-  metadata.gz: 1f14ae87bee92d04ce44d945ce01dab51b93e12ba78c0c4a3d11bf011742e7db54a47b7918c2703faa5e492e328e032bbb65f32ffd490317ee85c66060abc84d
-  data.tar.gz: c425b153fcc1bb117ad52297cdf418f09670cb2d8ddec44b68add95f0e40474a5259ae4711a1016d25d6e732a457f3e0598ee98a085e287c01e3ced8ec1f890b
+  metadata.gz: 16853644b3f4d62f2b0289791f38b59dcaa0d41ae15176703558c64dcfd63bc4f663abd3fe6d8aa7ddb0f91ef86f3f10b173002f9f5bc0b59dbb05dc8842c8a5
+  data.tar.gz: 8f33fff02fe4ad877f3771fc7a85d29a89ba7364f311a08dcd3bd4d4806c07d1eac6078bd84765af06ec3e70e9998aa81bff5527c8f059a662e5f7ae52c1d7d5

data/lib/helper_methods/flash_messages.rb

@@ -1,8 +1,8 @@
 module HelperMethods
 
-  def error_messages_for(resource, style = 'danger')
+  def error_messages_for(resource:, style: 'danger')
     if resource.errors.any?
-      content_tag :div, class: "alert alert-#{style} alert-dismissable" do
+      content_tag :div, class: "alert alert-#{styles[style]} alert-dismissible" do
         content_tag :ol do
           resource.errors.collect do |key, value|
             content_tag :li, value
@@ -13,17 +13,28 @@ module HelperMethods
   end
 
   def flash_messages
-    if flash.any?
-      content_tag :div, class: "alert alert-success alert-dismissable" do
-        content_tag :ul do
-          flash.collect do |key, value|
-            unless [true, false, nil].include?(value)
-              content_tag :li, value
-            end
-          end.join.html_safe
-        end
-      end
+    flash.collect do |key, value|
+      content_tag :div, class: "alert alert-#{styles[key]} alert-dismissable", role: "alert" do
+        [close_button, value].join.html_safe
+      end unless [true, false, nil].include?(value)
+    end.join.html_safe
+  end
+
+  def close_button
+    content_tag :button, type: 'button', class: 'close', data: { dismiss: 'alert' } do
+      content_tag(:span, '×', aria: { hidden: 'true' }) + content_tag(:span, 'Close', class: 'sr-only')
     end
   end
 
+  def styles
+    {
+      'notice' => 'success',
+      'alert' => 'warning',
+      'success' => 'success',
+      'info' => 'info',
+      'warning' => 'warning',
+      'danger' => 'danger'
+    }
+  end
+
 end

data/lib/helper_methods/version.rb

@@ -1,3 +1,3 @@
 module HelperMethods
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helper_methods
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Francisco Martins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec