gritter 1.0.1 → 1.0.2

data/README.md

@@ -1,6 +1,6 @@
 # gritter
 
-    version 1.0.1
+    version 1.0.2
     Robin Brouwer
     Daniël Zwijnenburg
     45north
@@ -17,7 +17,7 @@ Also check out that branch, because the newer version of gritter inside this gem
 
 You can use this gem by putting the following inside your Gemfile:
 
-    gem "gritter", "1.0.1"
+    gem "gritter", "1.0.2"
 
 Now generate the locale for gritter:
 
@@ -35,6 +35,10 @@ And that's it!
 
 ## Changes
 
+Version 1.0.2 changes (03/09/2012):
+    
+    - Merged pull request #22 (namespaced controllers gflash fix).
+
 Version 1.0.1 changes (23/01/2012):
     
     - Fixed gflash(:js => true) in Ruby 1.9.2 and 1.9.3.
@@ -233,7 +237,20 @@ 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 }
 
-When you don't pass a `:value` it uses the locale. Same goes for when you pass `true` to `:value`.
+When you don't pass a `:value` it uses the locale. Same goes for when you pass `true` to `:value`. When you give `:value` a String, that String will be used to display the message. Here's another example:
+
+    def create
+      @user = User.new(params[:user])
+      if @user.save
+        gflash :success => { :value => "Account has been created!", :time => 5000 },
+               :notice => { :value => "You have received an e-mail notification.", :sticky => true }
+        redirect_to :root
+      else
+        gflash :error => { :value => "Something went wrong.", :time => 4000 },
+               :warning => { :value => "Some fields weren't filled in correctly.", :time => 7000 }
+        render :new
+      end
+    end
 
 You can also use gflash directly inside the `redirect_to` method.
 
@@ -251,6 +268,27 @@ You can also use gflash directly inside the `redirect_to` method.
 
 And that's how you add gflash to your Rails application!
 
+## Copyright
+
+Copyright (C) 2010 Robin Brouwer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 ## Special Thanks
 

data/lib/gritter/gflash.rb

@@ -1,50 +1,51 @@
-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.t("gflash.#{params[:controller]}.#{params[:action]}.#{key}")
-    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.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
 end

data/lib/gritter/helpers.rb

@@ -1,89 +1,89 @@
-module Gritter
-  module Helpers
-    def add_gritter text, *args
-      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 = ["jQuery(function(){"]
-      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("});")
-      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] == 'progress' ? '.gif' : '.png'}") if %w(success warning error notice progress).include?(options[:image].to_s)
+      notification = ["jQuery(function(){"]
+      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("});")
+      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

data/lib/gritter/version.rb

@@ -1,3 +1,3 @@
 module Gritter
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,25 +1,35 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gritter
-version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - Robin Brouwer
-- Daniël Zwijnenburg
+- "Dani\xC3\xABl Zwijnenburg"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+
+date: 2012-09-03 00:00:00 +02:00
+default_executable: 
 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:
+
+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
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -45,28 +55,39 @@ files:
 - lib/gritter/helpers.rb
 - lib/gritter/railtie.rb
 - lib/gritter/version.rb
+has_rdoc: true
 homepage: http://www.45north.nl
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_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"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: nowarning
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Growl notifications for your Rails application.
 test_files: []
+