gritter 1.0.3 → 1.1.0

data/gritter.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.name        = "gritter"
   s.version     = Gritter::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Robin Brouwer", "Daniël Zwijnenburg"]
-  s.email       = ["robin@45north.nl"]
-  s.homepage    = "http://www.45north.nl"
+  s.authors     = ["Robin Brouwer"]
+  s.email       = ["robin@montblanc.nl"]
+  s.homepage    = "http://www.montblanc.nl"
   s.summary     = %q{Growl notifications for your Rails application.}
   s.description = %q{This Ruby on Rails gem allows you to easily add Growl-like notifications to your application using a jQuery plugin called 'gritter'.}
   

data/lib/generators/gritter/templates/gflash.en.yml

@@ -10,6 +10,14 @@ en:
       error: "Error"
       progress: "Progress"
     #
+    # Add default gflash messages:
+    # defaults:
+    #   success: "This is a notification"
+    #   error: "Something went wrong"
+    #   create:
+    #     success: "Successfully created!"
+    #     error: "Something went wrong. Please take a look at the form to see what went wrong."
+    #
     # Add gflash messages for controller actions:
     # products:
     #   create:

data/lib/gritter.rb

@@ -4,6 +4,15 @@ require 'gritter/engine'
 require 'fileutils'
 
 module Gritter
+  @rails_flash_fallback = false
+  
+  def self.rails_flash_fallback
+    @rails_flash_fallback
+  end
+  def self.rails_flash_fallback=(val)
+    @rails_flash_fallback = val
+  end
+  
   def self.initialize
     return if @initialized
     raise "ActionController is not available yet." unless defined?(ActionController)

data/lib/gritter/gflash.rb

@@ -1,51 +1,86 @@
-module Gritter
-  module Gflash
-    def redirect_to(options = {}, response_status_and_flash = {})
-      if response_status_and_flash.has_key?(:gflash)
-        gflash(response_status_and_flash[:gflash])
-        response_status_and_flash.delete(:gflash)
-      end
-      super(options, response_status_and_flash)
-    end
-    
-    def gflash *args
-      session[:gflash] ||= {}
-      options = args.extract_options!
-      
-      if args.present?
-        args.each do |key|
-          gflash_push(key, gflash_translation(key))
-        end
-      end
-      
-      options.each do |key, value|
-        if value.is_a?(Hash)
-          if value.has_key?(:value)
-            value[:value] = gflash_text(key, value[:value])
-          else
-            value[:value] = gflash_translation(key)
-          end
-        else
-          value = gflash_text(key, value)
-        end
-        gflash_push(key, value)
-      end
-    end
-  
-  private
-    
-    def gflash_text(key, value)
-      value == true ? gflash_translation(key) : value
-    end
-    
-    def gflash_push(key, value)
-      session[:gflash][key] ||= []
-      session[:gflash][key].push(value)
-    end
-    
-    def gflash_translation(key)
-      i18n_key = "gflash.#{params[:controller]}.#{params[:action]}.#{key}"
-      I18n.t(i18n_key.gsub(/\//, "."), :default => i18n_key.to_sym)
-    end
-  end
+module Gritter
+  module Gflash
+    def redirect_to(options = {}, response_status_and_flash = {})
+      if response_status_and_flash.has_key?(:gflash)
+        gflash(response_status_and_flash[:gflash])
+        response_status_and_flash.delete(:gflash)
+      end
+      super(options, response_status_and_flash)
+    end
+    
+    def gflash *args
+      session[:gflash] ||= {}
+      options = args.extract_options!
+      
+      if args.size == 1 && args.first.is_a?(Array)
+        args = args.first
+      end
+      
+      flash_now = args.include?(:now)
+      args.delete(:now) if flash_now
+      
+      if args.present?
+        args.each do |key|
+          gflash_push(key, gflash_translation(key, options[:locals]), flash_now)
+        end
+      end
+      
+      options.except(:locals).each do |key, value|
+        if value.is_a?(Hash)
+          if value.has_key?(:value)
+            value[:value] = gflash_text(key, value[:value], value[:locals])
+          else
+            value[:value] = gflash_translation(key, value[:locals])
+          end
+        else
+          value = gflash_text(key, value, options[:locals])
+        end
+        gflash_push(key, value, flash_now)
+      end
+    end
+  
+  private
+    
+    def gflash_text(key, value, options={})
+      value == true ? gflash_translation(key, options) : value
+    end
+    
+    def gflash_push(key, value, now=false)
+      session[:gflash][key] ||= []
+      session[:gflash][key].push(value)
+      
+      if Gritter.rails_flash_fallback
+        if now
+          flash.now[key] ||= []
+          flash.now[key].push(value.is_a?(Hash) ? value[:value] : value)
+        else
+          flash[key] ||= []
+          flash[key].push(value.is_a?(Hash) ? value[:value] : value)
+        end
+      end
+    end
+    
+    def gflash_translation(key, options)
+      options ||= {}
+      
+      i18n_default_key = "gflash.defaults.#{key}"
+      i18n_default_action_key = "gflash.defaults.#{params[:action]}.#{key}"
+      i18n_key = "gflash.#{params[:controller]}.#{params[:action]}.#{key}"
+      i18n_key.gsub!(/\//, ".")
+      
+      begin
+        options[:raise] = true
+        translation = I18n.t(i18n_key, options)
+      rescue I18n::MissingTranslationData
+        begin
+          translation = I18n.t(i18n_default_action_key, options)
+        rescue I18n::MissingTranslationData
+          options.delete(:raise)
+          translation = I18n.t(i18n_default_key, options)
+        end
+      end
+      
+      translation
+    end
+  end
 end

data/lib/gritter/helpers.rb

@@ -1,90 +1,92 @@
-module Gritter
-  module Helpers
-    def add_gritter text, *args
-      options = args.extract_options!
-      options[:title] = "Notification" if options[:title].blank?
-      options[:image] = asset_path("#{options[:image]}#{options[:image] == 'progress' ? '.gif' : '.png'}") if %w(success warning error notice progress).include?(options[:image].to_s)
-      notification = Array.new
-      notification.push("jQuery(function(){") if !options[:nodom_wrap].present?
-      notification.push("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?
-      notification.push("class_name:'#{options[:class_name]}',") if options[:class_name].present?
-      notification.push("before_open:function(e){#{options[:before_open]}},") if options[:before_open].present?
-      notification.push("after_open:function(e){#{options[:after_open]}},") if options[:after_open].present?
-      notification.push("before_close:function(e){#{options[:before_close]}},") if options[:before_close].present?
-      notification.push("after_close:function(e){#{options[:after_close]}},") if options[:after_close].present?
-      notification.push("title:'#{escape_javascript(options[:title])}',")
-      notification.push("text:'#{escape_javascript(text)}'")
-      notification.push("});")
-      notification.push("});") if !options[:nodom_wrap].present?
-      text.present? ? notification.join.html_safe : nil
-    end
-    
-    def remove_gritter *args
-      options = args.extract_options!
-      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("});")
-      removed.join.html_safe
-    end
-    
-    def extend_gritter *args
-      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)
-      options[:position] = "'#{options[:position].to_s.gsub("_", "-")}'" if options[:position]
-      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?
-      extended.push("position:#{options[:position]}") if options[:position].present?
-      extended.push("});")
-      extended.join.html_safe
-    end
-    
-    def gflash *args
-      if session[:gflash].present?
-        options = args.extract_options!
-        titles = gflash_titles(options)
-        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.join("\n") : js(flashes).html_safe
-      end
-    end
-    
-    def js *args
-      javascript_tag(args.join("\n"))
-    end
-    
-    private
-    
-    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) }
-      options.each do |key, value|
-        titles[key] = value if titles.has_key?(key)
-      end
-      titles
-    end
-    
-    def get_translation translation
-      I18n.t(translation, :scope => [:gflash, :titles])
-    end
-  end
-end
+module Gritter
+  module Helpers
+    def add_gritter text, *args
+      options = args.extract_options!
+      options[:title] = "Notification" if options[:title].blank?
+      options[:image] = asset_path("#{options[:image]}#{options[:image].to_s == 'progress' ? '.gif' : '.png'}") if %w(success warning error notice progress).include?(options[:image].to_s)
+      notification = Array.new
+      notification.push("jQuery(function(){") if options[:nodom_wrap].blank?
+      notification.push("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?
+      notification.push("class_name:'#{options[:class_name]}',") if options[:class_name].present?
+      notification.push("before_open:function(e){#{options[:before_open]}},") if options[:before_open].present?
+      notification.push("after_open:function(e){#{options[:after_open]}},") if options[:after_open].present?
+      notification.push("before_close:function(e){#{options[:before_close]}},") if options[:before_close].present?
+      notification.push("after_close:function(e){#{options[:after_close]}},") if options[:after_close].present?
+      notification.push("title:'#{escape_javascript(options[:title])}',")
+      notification.push("text:'#{escape_javascript(text)}'")
+      notification.push("});")
+      notification.push("});") if options[:nodom_wrap].blank?
+      text.present? ? notification.join.html_safe : nil
+    end
+    
+    def remove_gritter *args
+      options = args.extract_options!
+      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("});")
+      removed.join.html_safe
+    end
+    
+    def extend_gritter *args
+      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)
+      options[:position] = "'#{options[:position].to_s.gsub("_", "-")}'" if options[:position]
+      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?
+      extended.push("position:#{options[:position]}") if options[:position].present?
+      extended.push("});")
+      extended.join.html_safe
+    end
+    
+    def gflash *args
+      if session[:gflash].present?
+        options = args.extract_options!
+        nodom_wrap = options[:nodom_wrap]
+        options.delete(:nodom_wrap)
+        
+        titles = gflash_titles(options)
+        flashes = []
+        session[:gflash].each do |key, value|
+          value.each do |gflash_value|
+            gritter_options = { :image => key, :title => titles[key], :nodom_wrap => nodom_wrap }
+            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.join("\n") : js(flashes).html_safe
+      end
+    end
+    
+    def js *args
+      javascript_tag(args.join("\n"))
+    end
+    
+    private
+    
+    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) }
+      options.each do |key, value|
+        titles[key] = value if titles.has_key?(key)
+      end
+      titles
+    end
+    
+    def get_translation translation
+      I18n.t(translation, :scope => [:gflash, :titles])
+    end
+  end
+end

data/lib/gritter/version.rb

@@ -1,3 +1,3 @@
-module Gritter
-  VERSION = "1.0.3"
+module Gritter
+  VERSION = "1.1.0"
 end

data/{app → vendor}/assets/javascripts/gritter.js

@@ -374,7 +374,7 @@ window.Modernizr = function (a, b, c) {
     */
     _runSetup: function(){
     
-      for(opt in $.gritter.options){
+      for(var opt in $.gritter.options){
         this[opt] = $.gritter.options[opt];
       }
       this._is_setup = 1;

metadata

@@ -1,49 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gritter
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Robin Brouwer
-- "Dani\xC3\xABl Zwijnenburg"
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-26 00:00:00 +01:00
-default_executable: 
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies: []
-
-description: This Ruby on Rails gem allows you to easily add Growl-like notifications to your application using a jQuery plugin called 'gritter'.
-email: 
-- robin@45north.nl
+description: This Ruby on Rails gem allows you to easily add Growl-like notifications
+  to your application using a jQuery plugin called 'gritter'.
+email:
+- robin@montblanc.nl
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
-- app/assets/images/error.png
-- app/assets/images/gritter-close.png
-- app/assets/images/gritter.png
-- app/assets/images/ie-spacer.gif
-- app/assets/images/notice.png
-- app/assets/images/progress.gif
-- app/assets/images/success.png
-- app/assets/images/warning.png
-- app/assets/javascripts/gritter.js
-- app/assets/stylesheets/gritter.css.scss
 - gritter.gemspec
 - init.rb
 - lib/generators/gritter/USAGE
@@ -55,39 +33,37 @@ files:
 - lib/gritter/helpers.rb
 - lib/gritter/railtie.rb
 - lib/gritter/version.rb
-has_rdoc: true
-homepage: http://www.45north.nl
+- vendor/assets/images/error.png
+- vendor/assets/images/gritter-close.png
+- vendor/assets/images/gritter.png
+- vendor/assets/images/ie-spacer.gif
+- vendor/assets/images/notice.png
+- vendor/assets/images/progress.gif
+- vendor/assets/images/success.png
+- vendor/assets/images/warning.png
+- vendor/assets/javascripts/gritter.js
+- vendor/assets/stylesheets/gritter.css.scss
+homepage: http://www.montblanc.nl
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nowarning
-rubygems_version: 1.3.7
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Growl notifications for your Rails application.
 test_files: []
-