bootstrap_flash_messages 0.0.4 → 0.0.5

data/README.md

@@ -1,6 +1,6 @@
 # bootstrap_flash_messages
 
-    version 0.0.4
+    version 0.0.5
     Robin Brouwer
     45north
 
@@ -22,6 +22,11 @@ And that's it!
 
 ## Changes
 
+Version 0.0.5 changes (24/09/2012):
+    
+    - Added HTML escape option for flash_messages helper (:html).
+    - Also added option to convert new-lines to br-tags (:convert_newlines).
+
 Version 0.0.4 changes (03/09/2012):
     
     - Namespaced Controllers can be accessed by nesting your locales.
@@ -122,6 +127,14 @@ Want a heading? Add `:heading`. The headings inside flash.en.yml are used for th
 
     <%= flash_messages(:close, :block, :heading) %>
 
+Need to display HTML inside the flash messages? Use the `:html` option.
+
+    <%= flash_messages(:html) %>
+
+It's also possible to convert new-lines (\n) into br-tags using the `:convert_newlines` option. This option also unescapes all other HTML, so use it with care.
+
+    <%= flash_messages(:convert_newlines) %>
+
 And that's it! Have fun. :)
 
 ## Interpolation

data/lib/bootstrap_flash_messages/flash_messages.rb

@@ -1,44 +1,44 @@
-module BootstrapFlashMessages
-  module FlashMessages
-    def redirect_to(options = {}, response_status_and_flash = {})
-      messages = response_status_and_flash[:flash]
-      if messages && (messages.is_a?(Symbol) || messages.is_a?(Array))
-        flashes = {}
-        locals = response_status_and_flash[:locals]
-        if messages.is_a?(Array)
-          messages.each do |key|
-            flashes[key] = flash_messages(key, locals)
-          end
-        else
-          flashes[messages] = flash_messages(messages, locals)
-        end
-        response_status_and_flash.delete(:locals)
-        response_status_and_flash[:flash] = flashes
-      end
-      super(options, response_status_and_flash)
-    end
-
-  private
-
-    def flash!(*args)
-      options = args.extract_options!
-      args.each do |key|
-        flash[key] = flash_messages(key, options[:locals])
-      end
-    end
-
-    def flash_now!(*args)
-      options = args.extract_options!
-      args.each do |key|
-        flash.now[key] = flash_messages(key, options[:locals])
-      end
-    end
-
-    def flash_messages(key, *args)
-      i18n_key = "flash_messages.#{params[:controller]}.#{params[:action]}.#{key}"
-      options = args.extract_options!
-      options[:default] = i18n_key.to_sym
-      I18n.t(i18n_key.gsub(/\//, "."), options)
-    end
-  end
-end
+module BootstrapFlashMessages
+  module FlashMessages
+    def redirect_to(options = {}, response_status_and_flash = {})
+      messages = response_status_and_flash[:flash]
+      if messages && (messages.is_a?(Symbol) || messages.is_a?(Array))
+        flashes = {}
+        locals = response_status_and_flash[:locals]
+        if messages.is_a?(Array)
+          messages.each do |key|
+            flashes[key] = flash_messages(key, locals)
+          end
+        else
+          flashes[messages] = flash_messages(messages, locals)
+        end
+        response_status_and_flash.delete(:locals)
+        response_status_and_flash[:flash] = flashes
+      end
+      super(options, response_status_and_flash)
+    end
+
+  private
+
+    def flash!(*args)
+      options = args.extract_options!
+      args.each do |key|
+        flash[key] = flash_messages(key, options[:locals])
+      end
+    end
+
+    def flash_now!(*args)
+      options = args.extract_options!
+      args.each do |key|
+        flash.now[key] = flash_messages(key, options[:locals])
+      end
+    end
+
+    def flash_messages(key, *args)
+      i18n_key = "flash_messages.#{params[:controller]}.#{params[:action]}.#{key}"
+      options = args.extract_options!
+      options[:default] = i18n_key.to_sym
+      I18n.t(i18n_key.gsub(/\//, "."), options).html_safe
+    end
+  end
+end

data/lib/bootstrap_flash_messages/helpers.rb

@@ -5,6 +5,8 @@ module BootstrapFlashMessages
         block = args.include?(:block)
         show_heading = args.include?(:heading)
         show_close = args.include?(:close)
+        unescape_html = args.include?(:html)
+        convert_newlines = args.include?(:convert_newlines)
         
         messages = []
         flash.each do |key, value|
@@ -18,8 +20,10 @@ module BootstrapFlashMessages
             close = link_to(raw("×"), "#", :class => "close", :data => { :dismiss => "alert" })
           end
           
+          value.gsub!("\n", "<br/>") if convert_newlines
+          
           messages << content_tag(:div, :class => "alert alert-#{key} #{"alert-block" if block}") do
-            close + heading + " " + value
+            close + heading + " " + (unescape_html || convert_newlines ? raw(value) : value)
           end
         end
         raw(messages.join)

data/lib/bootstrap_flash_messages/version.rb

@@ -1,3 +1,3 @@
 module BootstrapFlashMessages
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bootstrap_flash_messages
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Robin Brouwer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-03 00:00:00 +02:00
+date: 2012-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: []