flash_gordon 0.0.5 → 0.0.6

data/lib/flash_gordon.rb

@@ -1,20 +1,14 @@
 module FlashGordon
   mattr_accessor :zones
-  mattr_reader :default_zones
   @@zones = {}
 
   def self.setup
     yield self
   end
 
-  def self.set_default_zones
-    @@default_zones = Hash[@@zones]
-  end
-
   def self.init_zone
     zone_list = "warning danger info success error"
     zone_list.split(" ").each{|z| @@zones[z.to_sym] = []}
-    self.set_default_zones
     true
   end
 

data/lib/flash_gordon/flash.rb

@@ -3,36 +3,72 @@ module FlashGordon
     # Messages fall under different message zones, for now zones are hardcoded
     # eventually we can add custom ones via initializers
 
-    @messages = FlashGordon.zones
+    @main_messages = Hash[FlashGordon.zones]
 
     def self.append(message,zone=:warning, options={})
       # Added options for future use
-      if @messages[zone]
+      if @main_messages[zone]
         if message.class == Array
           message.each do |m|
-            @messages[zone] << m
+            @main_messages[zone] << m
           end
         else
-          @messages[zone] << message
+          @main_messages[zone] << message
         end
       else
-        raise "Zone does not exist, please use the following zones - #{@messages.map{|k| ":#{k[0]}"}.join(", ") } or add it to the initializer."
+        raise "Zone does not exist, please use the following zones - #{@main_messages.map{|k| ":#{k[0]}"}.join(", ") } or add it to the initializer."
       end
     end
 
-    def self.render(zone=:all, glue="<br/>")
+    def self.render(zone, glue)
+      messages = get_messages(zone,glue)
+    end
+
+    def self.reset
+      @main_messages = FlashGordon.reset_zones
+    end
+
+    def self.get_messages(zone, glue)
+      messages = Hash[@main_messages]
       if zone == :all
-        @messages.each_pair do |k,v|
-          @messages[k] = v.join(glue) unless v.empty?
+        messages.each_pair do |k,v|
+          if v.empty?
+            # Remove empty zone keys
+            messages.delete(k)
+          else
+            messages[k] = v.join(glue)
+          end
+        end
+        messages
+      elsif messages[zone]
+        messages.each_pair do |k,v|
+          if k == zone
+            case glue
+            when "br", ""
+              messages[k] = messages[k].join(glue)
+            else
+              messages[k] = messages[k].each_with_index.map{|m,i| ElementDecorator.decorate_message(m,glue,i)}.join("")
+            end
+          else
+            messages.delete(k)
+          end
         end
-        @messages
-      elsif @messages[zone]
-        @messages[zone].join(glue)
+        messages
       end
     end
+  end
 
-    def self.reset
-      @messages = FlashGordon.reset_zones
+  class ElementDecorator
+    def self.decorate_message(message, glue, index)
+      # Splits the elements into sticky elements and sticky classes
+      raw = glue.split(".")
+      # Unsticky the element if it has an id tag stuck to it
+      element = raw.map{|x| x["#"] ? x[0..x.index("#")-1] : x}[0]
+      # Next you isolate the sticky id and classes into its own array
+      ids = raw.map{|x| x[x.index("#")+1..-1].gsub("%",index.to_s) if x["#"]}.compact
+      classes = raw[1..-1].map{|x| x["#"] ? x[0..x.index("#")-1] : x}
+      # Lastly decorate the message with the intended tags with classes and ids
+      "<#{element}#{" class='"+classes.join(" ")+"'" unless classes.empty? }#{" id='"+ids.join(" ")+"'" unless ids.empty? }>#{message}</#{element}>"
     end
   end
 end

data/lib/flash_gordon/flash_helper.rb

@@ -1,17 +1,24 @@
 module FlashGordon
   module FlashHelper
-    def render_flash
-      FlashGordon::Flash.render.each_pair do |k,v|
-        unless v.empty?
-          unless flash.now[k]
-            flash.now[k] = v unless v.empty?
-          else
-            flash.now[k] << ("<br/>" + v) unless v.empty?
-          end
-        end
+  	@first_flash = true
+    def render_flash(zone=:all, glue="</br>", tag="div")
+    	# Assigns flash messages to flash object before rendering
+    	to_flash = assign_flash(FlashGordon::Flash.render(zone,glue),zone)
+      to_flash.map{|f| "<#{tag} class='alert alert-#{f[0]}'>#{f[1]}</#{tag}>"}.join.html_safe
+    end
+
+    def assign_flash(flashes, zone)
+    	to_flash = {}
+      flashes.each_pair do |k,v|
+      		# Checks if there is an existing value which is not from FlashGordon
+      		# if exists, it will append the new values with <br/> tags
+    		to_flash[k] = flash.now[k] if flash.now[k]
+    		if to_flash[k]
+    			to_flash[k] << ("<br/>" + v)
+    		else
+    			to_flash[k] = v
+    		end
       end
-      FlashGordon::Flash.reset
-      flash.map{|f| "<div class='alert alert-#{f[0]}'>#{f[1]}</div>"}.join.html_safe
     end
   end
 end

data/lib/flash_gordon/railtie.rb

@@ -1,10 +1,12 @@
 require 'flash_gordon/flash'
 require 'flash_gordon/flash_helper'
+require 'flash_gordon/reset_flashes'
 
 module FlashGordon
   class Railtie < Rails::Railtie
     initializer "flash_gordon.flash_helper" do |app|
       ActionView::Base.send :include, FlashHelper
+      ActionController::Base.send :include, ResetFlashes
     end
   end
 end

data/lib/flash_gordon/reset_flashes.rb

@@ -0,0 +1,11 @@
+module ResetFlashes
+	extend ActiveSupport::Concern
+
+	included do
+		append_before_filter :reset_zones
+	end
+
+	def reset_zones
+		FlashGordon::Flash.reset
+	end
+end

data/lib/flash_gordon/version.rb

@@ -1,3 +1,3 @@
 module FlashGordon
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -2,14 +2,14 @@
 name: flash_gordon
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ernest Sim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,6 +56,7 @@ files:
 - lib/flash_gordon/flash.rb
 - lib/flash_gordon/flash_helper.rb
 - lib/flash_gordon/railtie.rb
+- lib/flash_gordon/reset_flashes.rb
 - lib/flash_gordon/version.rb
 - lib/flash_gordon.rb
 - lib/tasks/flash_gordon_tasks.rake
@@ -106,7 +107,8 @@ files:
 - test/flash_gordon_test.rb
 - test/test_helper.rb
 homepage: https://github.com/methodnow/flash_gordon
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: