gritter 0.6.2 → 0.6.3

data/README.md

@@ -1,6 +1,6 @@
 # gritter
 
-    version 0.6.2
+    version 0.6.3
     Robin Brouwer
     Daniël Zwijnenburg
     45north
@@ -23,14 +23,14 @@ This is a Rails 3 gem. When you're using Rails 2 you should use version 0.3 (thi
 
 ## Rails 3.1 installation
 
-Gritter now also supports Rails 3.1, thanks to [finist](https://github.com/finist]). 
-Adding the JavaScript en CSS files is accomplished in a different way, because of the new 'assets' folder inside /app.
+Gritter now also supports Rails 3.1, thanks to [finist](https://github.com/finist). 
+Adding the JavaScript and CSS files is accomplished in a different way, because of the new 'assets' folder inside /app.
 
-Add the following to /app/assets/javascripts/application.js:
+Add the following to `/app/assets/javascripts/application.js`:
 
     //= require gritter
 
-And the following to /app/assets/stylesheets/application.css:
+And the following to `/app/assets/stylesheets/application.css`:
 
     *= require gritter
 
@@ -67,6 +67,11 @@ You should really check out the gflash helper. It's really handy!
 
 ## Changes
 
+Version 0.6.3 changes:
+
+    - Calling gflash multiple times won't override older messages.
+    - You can set the time, sticky and class_name per gflash message.
+
 Version 0.6.2 changes:
 
     - Reduced the size of all images;
@@ -237,6 +242,12 @@ Just remember that you can only set which gflash message you want shown inside t
 The gflash helper inside the views will show the notification and change the title when you pass extra arguments. 
 It will not change the message.
 
+Since 0.6.3 you can change the default time, sticky and class_name options for each gflash message.
+This is done inside the Controller and works like this:
+
+    gflash :success => { :value => true, :time => 2000, :class_name => "my_class", :sticky => true }
+    gflash :error => { :value => "Custom error", :time => 3000, :class_name => "my_error_class", :sticky => false }
+
 
 ## Special Thanks
 

data/lib/gritter/gflash.rb

@@ -4,8 +4,25 @@ module Gritter
       session[:gflash] ||= {}
       options = args.extract_options!
       options.each do |key, value|
-        session[:gflash][key] = value == true ? I18n.t("gflash.#{params[:controller]}.#{params[:action]}.#{key}") : value
+        if value.is_a?(Hash)
+          gflash_value = value
+          gflash_value[:value] = gflash_text(key, gflash_value[:value]) if gflash_value.has_key?(:value)
+        else
+          gflash_value = gflash_text(key, value)
+        end
+        
+        if session[:gflash].has_key?(key)
+          session[:gflash][key].push(gflash_value)
+        else
+          session[:gflash][key] = [gflash_value]
+        end
       end
     end
+  
+  private
+    
+    def gflash_text(key, value)
+      value == true ? I18n.t("gflash.#{params[:controller]}.#{params[:action]}.#{key}") : value
+    end
   end
 end

data/lib/gritter/helpers.rb

@@ -16,7 +16,7 @@ module Gritter
       options = args.extract_options!
       options[:title] = "Notification" if options[:title].blank?
       options[:image] = ::Rails.version < "3.1" ? "/images/gritter/#{options[:image]}.png" : asset_path("#{options[:image]}.png") if %w(success warning error notice progress).include?(options[:image].to_s)
-      notification = ["$.gritter.add({"]
+      notification = ["jQuery.gritter.add({"]
       notification.push("image:'#{options[:image]}',") if options[:image].present?
       notification.push("sticky:#{options[:sticky]},") if options[:sticky].present?
       notification.push("time:#{options[:time]},") if options[:time].present?
@@ -33,7 +33,7 @@ module Gritter
     
     def remove_gritter *args
       options = args.extract_options!
-      removed = ["$.gritter.removeAll({"]
+      removed = ["jQuery.gritter.removeAll({"]
       removed.push("before_close:function(e){#{options[:before_close]}},") if options[:before_close].present?
       removed.push("after_close:function(e){#{options[:after_close]}},") if options[:after_close].present?
       removed.push("});")
@@ -44,7 +44,7 @@ module Gritter
       options = args.extract_options!
       options[:fade_in_speed] = "'#{options[:fade_in_speed]}'" if options[:fade_in_speed].is_a?(String)
       options[:fade_out_speed] = "'#{options[:fade_out_speed]}'" if options[:fade_out_speed].is_a?(String)
-      extended = ["$.extend($.gritter.options,{"]
+      extended = ["jQuery.extend($.gritter.options,{"]
       extended.push("fade_in_speed:#{options[:fade_in_speed]},") if options[:fade_in_speed].present?
       extended.push("fade_out_speed:#{options[:fade_out_speed]},") if options[:fade_out_speed].present?
       extended.push("time:#{options[:time]}") if options[:time].present?
@@ -56,7 +56,20 @@ module Gritter
       if session[:gflash].present?
         options = args.extract_options!
         titles = gflash_titles(options)
-        flashes = session[:gflash].map { |key, value| add_gritter(value, :image => key, :title => titles[key]) }
+        flashes = []
+        session[:gflash].each do |key, value|
+          value.each do |gflash_value|
+            gritter_options = { :image => key, :title => titles[key] }
+            if gflash_value.is_a?(Hash)
+              text = gflash_value.has_key?(:value) ? (gflash_value[:value] and gflash_value.delete(:value)) : nil
+              gritter_options.merge!(gflash_value)
+            else
+              text = gflash_value
+            end
+            
+            flashes.push(add_gritter(text, gritter_options))
+          end
+        end
         session[:gflash] = nil
         options[:js] ? flashes : js(flashes).html_safe
       end
@@ -68,6 +81,10 @@ module Gritter
     
     private
     
+    def gflash_text(value)
+      value == true ? I18n.t("gflash.#{params[:controller]}.#{params[:action]}.#{key}") : value
+    end
+    
     def gflash_titles *args
       options = args.extract_options!
       titles = { :success => get_translation(:success), :warning => get_translation(:warning), :error => get_translation(:error), :notice => get_translation(:notice), :progress => get_translation(:progress) }
@@ -81,4 +98,4 @@ module Gritter
       I18n.t(translation, :scope => [:gflash, :titles])
     end
   end
-end
+end

data/lib/gritter/version.rb

@@ -1,3 +1,3 @@
 module Gritter
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gritter
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Robin Brouwer
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 +02:00
+date: 2011-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -73,23 +74,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nowarning
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Growl notifications for your Rails application.