gritter 0.6.1 → 0.6.2

data/README.md

@@ -1,9 +1,9 @@
 # gritter
 
-	version 0.6.0
-	Robin Brouwer
-	Daniël Zwijnenburg
-	45north
+    version 0.6.2
+    Robin Brouwer
+    Daniël Zwijnenburg
+    45north
 
 This Ruby on Rails gem allows you to easily add Growl-like notifications to your application using a jQuery plugin called 'gritter'.
 
@@ -11,38 +11,55 @@ This Ruby on Rails gem allows you to easily add Growl-like notifications to your
 
 You can use this gem by putting the following inside your Gemfile:
 
-	gem "gritter"
+    gem "gritter", "0.6.2"
 
 You can also install this as a plugin with the following command:
 
-	rails plugin install git://github.com/RobinBrouwer/gritter.git
+    rails plugin install git://github.com/RobinBrouwer/gritter.git
 
 This is a Rails 3 gem. When you're using Rails 2 you should use version 0.3 (this is a plugin):
 
-	script/plugin install git://github.com/RobinBrouwer/gritter.git -r 'tag v0.3'
+    script/plugin install git://github.com/RobinBrouwer/gritter.git -r 'tag v0.3'
+
+## 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.
+
+Add the following to /app/assets/javascripts/application.js:
+
+    //= require gritter
+
+And the following to /app/assets/stylesheets/application.css:
+
+    *= require gritter
+
+And that's it! It now works with Rails 3.1. No need to add `include_gritter` to your layout.
+
+## Rails 3.0 installation
 
 Start your server and you'll see that three folders are added to your /javascripts, /stylesheets and /images folders.
-Now you can use gritter inside your Rails application.
+Now you can use gritter inside your Rails 3.0 application.
 
 Now add the following to your head-tag inside the layout:
 
-	<%= include_gritter %>
+    <%= include_gritter %>
 
 If you also want to add jQuery together with gritter (from googleapis.com) you can use the following helper:
 
-	<%= include_gritter_and_jquery %>
+    <%= include_gritter_and_jquery %>
 
 You can pass extra arguments to these functions to set the default options for gritter.
 
-	:fade_in_speed => "medium"            # => Allows you to set the fade-in-speed. Can be String or Integer (in ms).
-	:fade_out_speed => 1000               # => Allows you to set the fade-out-speed. Can be String or Integer (in ms).
-	:time => 8000                         # => Allows you to set the time the notification stays. Must be an Integer (in ms).
+    :fade_in_speed => "medium"            # => Allows you to set the fade-in-speed. Can be String or Integer (in ms).
+    :fade_out_speed => 1000               # => Allows you to set the fade-out-speed. Can be String or Integer (in ms).
+    :time => 8000                         # => Allows you to set the time the notification stays. Must be an Integer (in ms).
 
 The :fade_in_speed and :fade_out_speed options accept the following Strings:
-	
-	"slow"
-	"medium"
-	"fast"
+  
+    "slow"
+    "medium"
+    "fast"
 
 Now you can use gritter inside your Rails application.
 You should really check out the gflash helper. It's really handy!
@@ -50,31 +67,36 @@ You should really check out the gflash helper. It's really handy!
 
 ## Changes
 
+Version 0.6.2 changes:
+
+    - Reduced the size of all images;
+    - Also works with Rails 3.1.
+
 Version 0.6 changes:
 
-	- Added locales support for gflash (see README);
-	- README changes.
+    - Added locales support for gflash (see README);
+    - README changes.
 
 Version 0.5 changes:
 
-	- Works with Ruby 1.9 now (the Array.to_s was causing problems);
-	- Refactored a lot of code to make everything a bit more logical;
-	- The js helper doesn't add a semicolon (;) after the script anymore;
-	- The js helper accepts several scripts as options;
-	- Changed the way linebreaks (\n) are created;
-	- Added an 'e' variable for all the callbacks;
-	- Added String support for :fade_out_speed;
-	- Changed the README.
+    - Works with Ruby 1.9 now (the Array.to_s was causing problems);
+    - Refactored a lot of code to make everything a bit more logical;
+    - The js helper doesn't add a semicolon (;) after the script anymore;
+    - The js helper accepts several scripts as options;
+    - Changed the way linebreaks (\n) are created;
+    - Added an 'e' variable for all the callbacks;
+    - Added String support for :fade_out_speed;
+    - Changed the README.
 
 
 ## Usage
 
 There are several helpers you can use with gritter. All of them print out Javascript code without script-tags.
 
-	add_gritter
-	remove_gritter
-	extend_gritter
-	
+    add_gritter
+    remove_gritter
+    extend_gritter
+  
 To add the script-tags we added another function called `js`. It allows you to easily add script-tags around your javascript.
 It can be used in combination with gritter, but also other Javascript you want to run.
 
@@ -86,41 +108,41 @@ Since version 0.3 we also added a `gflash` helper. This helper supports locales
 The `add_gritter` helper allows you to add a gritter notification to your application. 
 It outputs Javascript directly into your template. It works like this inside a `js.erb` file:
 
-	<%= add_gritter("This is a notification just for you!") %>
+    <%= add_gritter("This is a notification just for you!") %>
 
 The `add_gritter` helper allows you to easily set the text for the notification. 
 When you want to change the title, just pass the `:title` argument to the helper:
 
-	<%= add_gritter("This is a notification just for you!", :title => "Please pay attention!") %>
+    <%= add_gritter("This is a notification just for you!", :title => "Please pay attention!") %>
 
 There are many more arguments you can pass to the helper:
 
-	:title => "This is a title"            # => Allows you to set the title for the notification.
-	:image => "/images/rails.png"          # => Allows you to add an image to the notification.
-	:sticky => true                        # => Allows you to make the notification sticky.
-	:time => 4000                          # => Allows you to set the time when the notification disappears (in ms).
-	:class_name => "gritter"               # => Allows you to set a different classname.
-	:before_open => "alert('Opening!');"   # => Execute javascript before opening.
-	:after_open => "alert('Opened!');"     # => Execute javascript after opening.
-	:before_close => "alert('Closing!');"  # => Execute javascript before closing.
-	:after_close => "alert('Closed!');"    # => Execute javascript after closing.
+    :title => "This is a title"            # => Allows you to set the title for the notification.
+    :image => "/images/rails.png"          # => Allows you to add an image to the notification.
+    :sticky => true                        # => Allows you to make the notification sticky.
+    :time => 4000                          # => Allows you to set the time when the notification disappears (in ms).
+    :class_name => "gritter"               # => Allows you to set a different classname.
+    :before_open => "alert('Opening!');"   # => Execute javascript before opening.
+    :after_open => "alert('Opened!');"     # => Execute javascript after opening.
+    :before_close => "alert('Closing!');"  # => Execute javascript before closing.
+    :after_close => "alert('Closed!');"    # => Execute javascript after closing.
 
 The `:image` argument also allows you to easily set five different images:
 
-	:success
-	:warning
-	:notice
-	:error
-	:progress
+    :success
+    :warning
+    :notice
+    :error
+    :progress
 
 It works like this in combination with flash[:notice] and the `js` helper:
 
-	<%= js add_gritter(flash[:notice], :image => :notice, :title => "Pay attention!", :sticky => true) %>
+    <%= js add_gritter(flash[:notice], :image => :notice, :title => "Pay attention!", :sticky => true) %>
 
 The js helper is almost the same as the javascript_tag helper. The difference is that you can pass several scripts at once.
 You don't need to pass these scripts as an Array. The helper also adds a linebreak (\n) after each script.
 
-	<%= js add_gritter("See my notification"), add_gritter("Another one") %>
+    <%= js add_gritter("See my notification"), add_gritter("Another one") %>
 
 It puts all the scripts inside a single script-tag.
 
@@ -132,12 +154,12 @@ It's great for all kinds of notifications, including the flash notifications you
 
 The `remove_gritter` helper removes all gritter notifications from the screen. You can use it inside a `js.erb` file:
 
-	<%= remove_gritter %>
+    <%= remove_gritter %>
 
 You can pass two extra arguments to this helper.
 
-	:before_close => "alert('Closing!');"  # => Execute javascript before closing.
-	:after_close => "alert('Closed!');"    # => Execute javascript after closing.
+    :before_close => "alert('Closing!');"  # => Execute javascript before closing.
+    :after_close => "alert('Closed!');"    # => Execute javascript after closing.
 
 You can also use the `js` helper to add script-tags around this helper.
 
@@ -155,60 +177,60 @@ You can also use the `js` helper to add script-tags around this helper.
 The `gflash` helper is a different kind of `flash[:notice]` message. It uses the `add_gritter` helper and the default images used in this plugin.
 It uses a session to remember the flash messages. Add the following inside your controller action:
 
-	def create
-		gflash :success => "The product has been created successfully!"
-	end
+    def create
+      gflash :success => "The product has been created successfully!"
+    end
 
 Now you can add the following to your layout view inside the body-tag:
 
-	<%= gflash %>
-	
+    <%= gflash %>
+  
 The flash-message will be shown with 'success.png' as the image and 'Success' as the title.
 To change the title you can add the following to the `gflash` helper inside the layout:
 
-	<%= gflash :success => "It has been successful!" %>
-	
+    <%= gflash :success => "It has been successful!" %>
+  
 Now the default title will be overwritten. You can use the following gflash options:
 
-	:success
-	:warning
-	:notice
-	:error
-	:progress
+    :success
+    :warning
+    :notice
+    :error
+    :progress
 
 Each uses the corresponding image and title. You can also add multiple gritter notifications at once:
 
-	def create
-		gflash :success => "The product has been created successfully!", :notice => "This product doesn't have a category."
-	end
+    def create
+      gflash :success => "The product has been created successfully!", :notice => "This product doesn't have a category."
+    end
 
 Besides passing the exact text inside the controller, gflash also supports locales (both for messages and titles). 
 When you start your server a new locale file will be added to /config/locales called `gflash.en.yml`.
 Here you can set the locales for all your gflash messages and the titles. It works like this:
 
-	en:
-	  gflash:
-	    titles:
-	      notice: "Custom notice title"
-	      success: "Success"
-	      warning: "Warning"
-	      error: "Error"
-	      progress: "Progress"
-	    products: # => Controller name
-	      create: # => Action name
-	        notice: "Custom notice message"
+    en:
+      gflash:
+        titles:
+          notice: "Custom notice title"
+          success: "Success"
+          warning: "Warning"
+          error: "Error"
+          progress: "Progress"
+        products: # => Controller name
+          create: # => Action name
+            notice: "Custom notice message"
 
 Now you can do the following inside your Controller:
 
-   def create
-		gflash :notice => true
-	end
+    def create
+      gflash :notice => true
+    end
 
 The locales for the `:notice` title and message will now be used. You can still pass a `String` to overwrite a locale.
 
 You can also use gflash inside `js.erb` files:
 
-	<%= gflash :js => true %>
+    <%= gflash :js => true %>
 
 And that's how you add gflash to your Rails application.
 Just remember that you can only set which gflash message you want shown inside the controller.

data/app/assets/javascripts/gritter.js

@@ -0,0 +1,19 @@
+(function($){$.gritter={};$.gritter.options={fade_in_speed:'medium',fade_out_speed:1000,time:6000}
+$.gritter.add=function(params){try{return Gritter.add(params||{});}catch(e){var err='Gritter Error: '+e;(typeof(console)!='undefined'&&console.error)?console.error(err,params):alert(err);}}
+$.gritter.remove=function(id,params){Gritter.removeSpecific(id,params||{});}
+$.gritter.removeAll=function(params){Gritter.stop(params||{});}
+var Gritter={fade_in_speed:'',fade_out_speed:'',time:'',_custom_timer:0,_item_count:0,_is_setup:0,_tpl_close:'<div class="gritter-close"></div>',_tpl_item:'<div id="gritter-item-[[number]]" class="gritter-item-wrapper [[item_class]]" style="display:none"><div class="gritter-top"></div><div class="gritter-item">[[image]]<div class="[[class_name]]"><span class="gritter-title">[[username]]</span><p>[[text]]</p></div><div style="clear:both"></div></div><div class="gritter-bottom"></div></div>',_tpl_wrap:'<div id="gritter-notice-wrapper"></div>',add:function(params){if(!params.title||!params.text){throw'You need to fill out the first 2 params: "title" and "text"';}
+if(!this._is_setup){this._runSetup();}
+var user=params.title,text=params.text,image=params.image||'',sticky=params.sticky||false,item_class=params.class_name||'',time_alive=params.time||'';this._verifyWrapper();this._item_count++;var number=this._item_count,tmp=this._tpl_item;$(['before_open','after_open','before_close','after_close']).each(function(i,val){Gritter['_'+val+'_'+number]=($.isFunction(params[val]))?params[val]:function(){}});this._custom_timer=0;if(time_alive){this._custom_timer=time_alive;}
+var image_str=(image!='')?'<img src="'+image+'" class="gritter-image" />':'',class_name=(image!='')?'gritter-with-image':'gritter-without-image';tmp=this._str_replace(['[[username]]','[[text]]','[[image]]','[[number]]','[[class_name]]','[[item_class]]'],[user,text,image_str,this._item_count,class_name,item_class],tmp);this['_before_open_'+number]();$('#gritter-notice-wrapper').append(tmp);var item=$('#gritter-item-'+this._item_count);item.fadeIn(this.fade_in_speed,function(){Gritter['_after_open_'+number]($(this));});if(!sticky){this._setFadeTimer(item,number);}
+$(item).bind('mouseenter mouseleave',function(event){if(event.type=='mouseenter'){if(!sticky){Gritter._restoreItemIfFading($(this),number);}}
+else{if(!sticky){Gritter._setFadeTimer($(this),number);}}
+Gritter._hoverState($(this),event.type);});return number;},_countRemoveWrapper:function(unique_id,e){e.remove();this['_after_close_'+unique_id](e);if($('.gritter-item-wrapper').length==0){$('#gritter-notice-wrapper').remove();}},_fade:function(e,unique_id,params,unbind_events){var params=params||{},fade=(typeof(params.fade)!='undefined')?params.fade:true;fade_out_speed=params.speed||this.fade_out_speed;this['_before_close_'+unique_id](e);if(unbind_events){e.unbind('mouseenter mouseleave');}
+if(fade){e.animate({opacity:0},fade_out_speed,function(){e.animate({height:0},300,function(){Gritter._countRemoveWrapper(unique_id,e);})})}
+else{this._countRemoveWrapper(unique_id,e);}},_hoverState:function(e,type){if(type=='mouseenter'){e.addClass('hover');var find_img=e.find('img');(find_img.length)?find_img.before(this._tpl_close):e.find('span').before(this._tpl_close);e.find('.gritter-close').click(function(){var unique_id=e.attr('id').split('-')[2];Gritter.removeSpecific(unique_id,{},e,true);});}
+else{e.removeClass('hover');e.find('.gritter-close').remove();}},removeSpecific:function(unique_id,params,e,unbind_events){if(!e){var e=$('#gritter-item-'+unique_id);}
+this._fade(e,unique_id,params||{},unbind_events);},_restoreItemIfFading:function(e,unique_id){clearTimeout(this['_int_id_'+unique_id]);e.stop().css({opacity:''});},_runSetup:function(){for(opt in $.gritter.options){this[opt]=$.gritter.options[opt];}
+this._is_setup=1;},_setFadeTimer:function(e,unique_id){var timer_str=(this._custom_timer)?this._custom_timer:this.time;this['_int_id_'+unique_id]=setTimeout(function(){Gritter._fade(e,unique_id);},timer_str);},stop:function(params){var before_close=($.isFunction(params.before_close))?params.before_close:function(){};var after_close=($.isFunction(params.after_close))?params.after_close:function(){};var wrap=$('#gritter-notice-wrapper');before_close(wrap);wrap.fadeOut(function(){$(this).remove();after_close();});},_str_replace:function(search,replace,subject,count){var i=0,j=0,temp='',repl='',sl=0,fl=0,f=[].concat(search),r=[].concat(replace),s=subject,ra=r instanceof Array,sa=s instanceof Array;s=[].concat(s);if(count){this.window[count]=0;}
+for(i=0,sl=s.length;i<sl;i++){if(s[i]===''){continue;}
+for(j=0,fl=f.length;j<fl;j++){temp=s[i]+'';repl=ra?(r[j]!==undefined?r[j]:''):r[0];s[i]=(temp).split(f[j]).join(repl);if(count&&s[i]!==temp){this.window[count]+=(temp.length-s[i].length)/f[j].length;}}}
+return sa?s:s[0];},_verifyWrapper:function(){if($('#gritter-notice-wrapper').length==0){$('body').append(this._tpl_wrap);}}}})(jQuery);

data/app/assets/stylesheets/gritter.css.erb

@@ -0,0 +1,94 @@
+/* ie6 trash */
+* html #gritter-notice-wrapper {
+  position:absolute; 
+}
+* html .gritter-top {
+  margin-bottom:-10px;
+}
+* html .gritter-item {
+  padding-bottom:0;
+}
+* html .gritter-bottom {
+  margin-bottom:0;
+}
+* html .gritter-close {
+  background:url(<%= asset_path('gritter-close-ie6.gif')%>);
+  width:22px;
+  height:22px;
+  top:7px;
+  left:7px;
+}
+
+/* the norm */
+#gritter-notice-wrapper {
+  position:fixed;
+  text-align:left;
+  top:20px;
+  right:20px;
+  width:301px;
+  z-index:9999;
+}
+.gritter-item-wrapper {
+  position:relative;
+  margin:0 0 10px 0;
+  /* background:url('.'); /* ie7/8 fix */ 
+}
+.gritter-top {
+  background:url(<%= asset_path('gritter.png')%>) no-repeat left -30px;
+  height:10px;
+}
+.hover .gritter-top {
+  background-position:right -30px;
+}
+.gritter-bottom {
+  background:url(<%= asset_path('gritter.png')%>) no-repeat left bottom;
+  height:8px;
+  margin:0;
+}
+.hover .gritter-bottom {
+  background-position: bottom right;
+}
+.gritter-item {
+  display:block;
+  background:url(<%= asset_path('gritter.png')%>) no-repeat left -40px;
+  color:#eee;
+  padding:2px 11px 8px 11px;
+  font-size: 11px;
+  font-family:verdana;
+}
+.hover .gritter-item {
+  background-position:right -40px;
+}
+.gritter-item p {
+  padding:0;
+  margin:0;
+}
+.gritter-close {
+  position:absolute;
+  top:5px;
+  left:3px;
+  background:url(<%= asset_path('gritter.png')%>) no-repeat left top;
+  cursor:pointer;
+  width:30px;
+  height:30px;
+}
+.gritter-title {
+  font-size:14px;
+  font-weight:bold;
+  padding:0 0 7px 0;
+  display:block;
+  text-shadow:1px 1px #000; /* Not supported by IE :( */
+}
+.gritter-image {
+  width:48px;
+  height:48px;
+  float:left;
+}
+.gritter-with-image,
+.gritter-without-image {
+  padding:0 0 5px 0;
+}
+.gritter-with-image {
+  width:220px;
+  float:right;
+}

data/lib/gritter.rb

@@ -1,5 +1,7 @@
 require 'gritter/helpers'
 require 'gritter/gflash'
+require 'gritter/engine'
+require 'fileutils'
 
 module Gritter
   def self.initialize
@@ -7,20 +9,27 @@ module Gritter
     raise "ActionController is not available yet." unless defined?(ActionController)
     ActionController::Base.send(:helper, Gritter::Helpers)
     ActionController::Base.send(:include, Gritter::Gflash)
-    Gritter.install_gritter
+    Gritter.install_locales
+    Gritter.install_gritter if ::Rails.version < "3.1"
     @initialized = true
   end
   
+  def self.install_locales
+    orig_lang = File.join(File.dirname(__FILE__), 'gritter', 'assets', 'gflash.en.yml')
+    dest_lang = File.join(Rails.root, 'config', 'locales', 'gflash.en.yml')
+    unless File.exists?(dest_lang)
+      puts "Copying language file to #{dest_lang}..."
+      FileUtils.cp_r orig_lang, dest_lang
+    end
+  end
+  
   def self.install_gritter
-    require 'fileutils'
     orig_javascripts = File.join(File.dirname(__FILE__), 'gritter', 'assets', 'javascripts')
     orig_stylesheets = File.join(File.dirname(__FILE__), 'gritter', 'assets', 'stylesheets')
     orig_images = File.join(File.dirname(__FILE__), 'gritter', 'assets', 'images')
-    orig_lang = File.join(File.dirname(__FILE__), 'gritter', 'assets', 'gflash.en.yml')
     dest_javascripts = File.join(Rails.root, 'public', 'javascripts', 'gritter')
     dest_stylesheets = File.join(Rails.root, 'public', 'stylesheets', 'gritter')
     dest_images = File.join(Rails.root, 'public', 'images', 'gritter')
-    dest_lang = File.join(Rails.root, 'config', 'locales', 'gflash.en.yml')
     
     gritter = File.join(dest_javascripts, 'jquery.gritter.min.js')
 
@@ -38,8 +47,6 @@ module Gritter
         FileUtils.cp_r "#{orig_stylesheets}/.", dest_stylesheets
         puts "Copying gritter to #{dest_images}..."
         FileUtils.cp_r "#{orig_images}/.", dest_images
-        puts "Copying language file to #{dest_lang}..."
-        FileUtils.cp_r orig_lang, dest_lang
         puts "Successfully installed gritter."
       rescue
         puts "ERROR: Problem installing gritter. Please copy the files manually."
@@ -50,4 +57,4 @@ end
 
 if defined?(Rails::Railtie)
   require 'gritter/railtie'
-end
+end

data/lib/gritter/assets/stylesheets/jquery.gritter.css

@@ -1,94 +1,94 @@
 /* ie6 trash */
 * html #gritter-notice-wrapper {
-	position:absolute; 
+  position:absolute; 
 }
 * html .gritter-top {
-	margin-bottom:-10px;
+  margin-bottom:-10px;
 }
 * html .gritter-item {
-	padding-bottom:0;
+  padding-bottom:0;
 }
 * html .gritter-bottom {
-	margin-bottom:0;
+  margin-bottom:0;
 }
 * html .gritter-close {
-	background:url(../../images/gritter/gritter-close-ie6.gif);
-	width:22px;
-	height:22px;
-	top:7px;
-	left:7px;
+  background:url(/images/gritter/gritter-close-ie6.gif);
+  width:22px;
+  height:22px;
+  top:7px;
+  left:7px;
 }
 
 /* the norm */
 #gritter-notice-wrapper {
-	position:fixed;
-	text-align:left;
-	top:20px;
-	right:20px;
-	width:301px;
-	z-index:9999;
+  position:fixed;
+  text-align:left;
+  top:20px;
+  right:20px;
+  width:301px;
+  z-index:9999;
 }
 .gritter-item-wrapper {
-	position:relative;
-	margin:0 0 10px 0;
-	/* background:url('.'); /* ie7/8 fix */ 
+  position:relative;
+  margin:0 0 10px 0;
+  /* background:url('.'); /* ie7/8 fix */ 
 }
 .gritter-top {
-	background:url(../../images/gritter/gritter.png) no-repeat left -30px;
-	height:10px;
+  background:url(/images/gritter/gritter.png) no-repeat left -30px;
+  height:10px;
 }
 .hover .gritter-top {
-	background-position:right -30px;
+  background-position:right -30px;
 }
 .gritter-bottom {
-	background:url(../../images/gritter/gritter.png) no-repeat left bottom;
-	height:8px;
-	margin:0;
+  background:url(/images/gritter/gritter.png) no-repeat left bottom;
+  height:8px;
+  margin:0;
 }
 .hover .gritter-bottom {
-	background-position: bottom right;
+  background-position: bottom right;
 }
 .gritter-item {
-	display:block;
-	background:url(../../images/gritter/gritter.png) no-repeat left -40px;
-	color:#eee;
-	padding:2px 11px 8px 11px;
-	font-size: 11px;
-	font-family:verdana;
+  display:block;
+  background:url(/images/gritter/gritter.png) no-repeat left -40px;
+  color:#eee;
+  padding:2px 11px 8px 11px;
+  font-size: 11px;
+  font-family:verdana;
 }
 .hover .gritter-item {
-	background-position:right -40px;
+  background-position:right -40px;
 }
 .gritter-item p {
-	padding:0;
-	margin:0;
+  padding:0;
+  margin:0;
 }
 .gritter-close {
-	position:absolute;
-	top:5px;
-	left:3px;
-	background:url(../../images/gritter/gritter.png) no-repeat left top;
-	cursor:pointer;
-	width:30px;
-	height:30px;
+  position:absolute;
+  top:5px;
+  left:3px;
+  background:url(/images/gritter/gritter.png) no-repeat left top;
+  cursor:pointer;
+  width:30px;
+  height:30px;
 }
 .gritter-title {
-	font-size:14px;
-	font-weight:bold;
-	padding:0 0 7px 0;
-	display:block;
-	text-shadow:1px 1px #000; /* Not supported by IE :( */
+  font-size:14px;
+  font-weight:bold;
+  padding:0 0 7px 0;
+  display:block;
+  text-shadow:1px 1px #000; /* Not supported by IE :( */
 }
 .gritter-image {
-	width:48px;
-	height:48px;
-	float:left;
+  width:48px;
+  height:48px;
+  float:left;
 }
 .gritter-with-image,
 .gritter-without-image {
-	padding:0 0 5px 0;
+  padding:0 0 5px 0;
 }
 .gritter-with-image {
-	width:220px;
-	float:right;
+  width:220px;
+  float:right;
 }

data/lib/gritter/engine.rb

@@ -0,0 +1,7 @@
+# Configure Rails 3.1 to have assert_select_jquery() in tests
+module Gritter
+  # Required for gritter.css to be discoverable in the asset pipeline
+  # @private
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/gritter/helpers.rb

@@ -15,13 +15,13 @@ module Gritter
     def add_gritter text, *args
       options = args.extract_options!
       options[:title] = "Notification" if options[:title].blank?
-      options[:image] = "/images/gritter/#{options[:image]}.png" if %w(success warning error notice progress).include?(options[:image].to_s)
+      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.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("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?

data/lib/gritter/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Robin Brouwer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +02:00
+date: 2011-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,16 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/assets/images/error.png
+- app/assets/images/gritter-close-ie6.gif
+- app/assets/images/gritter-long.png
+- app/assets/images/gritter.png
+- 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.erb
 - gritter.gemspec
 - init.rb
 - lib/gritter.rb
@@ -47,6 +57,7 @@ files:
 - lib/gritter/assets/images/warning.png
 - lib/gritter/assets/javascripts/jquery.gritter.min.js
 - lib/gritter/assets/stylesheets/jquery.gritter.css
+- lib/gritter/engine.rb
 - lib/gritter/gflash.rb
 - lib/gritter/helpers.rb
 - lib/gritter/railtie.rb