gritter 0.6.3 → 1.0.0

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

@@ -0,0 +1,119 @@
+#gritter-notice-wrapper {
+  position:fixed;
+  top:20px;
+  right:20px;
+  width:301px;
+  z-index:9999;
+  
+  &.top-left {
+    left: 20px;
+    right: auto;
+  }
+  
+  &.bottom-right {
+    top: auto;
+    left: auto;
+    bottom: 20px;
+    right: 20px;
+  }
+  
+  &.bottom-left {
+    top: auto;
+    right: auto;
+    bottom: 20px;
+    left: 20px;
+  }
+}
+
+.gritter-item-wrapper {
+  position:relative;
+  margin:0 0 10px 0;
+  background:url(image_path('ie-spacer.gif')); // ie7/8 fix
+}
+
+.gritter-top {
+  background:url(image_path('gritter.png')) no-repeat left -30px;
+  height:10px;
+}
+.hover .gritter-top {
+  background-position:right -30px;
+}
+.gritter-bottom {
+  background:url(image_path('gritter.png')) no-repeat left bottom;
+  height:8px;
+  margin:0;
+}
+.hover .gritter-bottom {
+  background-position: bottom right;
+}
+
+.gritter-item {
+  display:block;
+  color:#eee;
+  padding:2px 11px 8px 11px;
+  font-size: 11px;
+  font-family:verdana;
+  filter:inherit; // ie8 fix
+  
+  &.gritter-css2 {
+    background:url(image_path('gritter.png')) no-repeat left -40px;
+  }
+  &.gritter-css3 {
+    background:rgba(0, 0, 0, 0.8);
+    -webkit-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+    padding-top: 12px;
+    padding-bottom: 16px;
+  }
+  
+  p {
+    padding:0;
+    margin:0;
+  }
+}
+.hover .gritter-item.gritter-css2 {
+  background-position:right -40px;
+}
+.hover .gritter-item.gritter-css3 {
+  padding:10px 9px 14px 9px;
+  border: solid 2px #fff;
+}
+
+.gritter-close {
+  display:none;
+  position:absolute;
+  top:5px;
+  left:3px;
+  cursor:pointer;
+  width:30px;
+  height:30px;
+  filter:inherit; // ie8 fix
+}
+.gritter-css2 .gritter-close {
+  background:url(image_path('gritter.png')) no-repeat left top;
+}
+.gritter-css3 .gritter-close {
+  background:url(image_path('gritter-close.png')) no-repeat;
+}
+
+.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/generators/gritter/USAGE

@@ -0,0 +1,7 @@
+Available generators:
+  gritter:locale
+
+Examples:
+  rails g gritter:locale
+  This will create:
+    config/locales/gflash.en.yml

data/lib/generators/gritter/locale_generator.rb

@@ -0,0 +1,9 @@
+module Gritter
+  class LocaleGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    
+    def copy_gflash_locale
+      copy_file "gflash.en.yml", "config/locales/gflash.en.yml"
+    end
+  end
+end

data/lib/{gritter/assets → generators/gritter/templates}/gflash.en.yml

@@ -17,5 +17,5 @@ en:
     #     error: "Something went wrong"
     #
     # Inside controller: 
-    # gflash :notice => true, :error => true
+    # gflash :notice, :error
     #

data/lib/gritter.rb

@@ -9,50 +9,8 @@ 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_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
-    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')
-    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')
-    
-    gritter = File.join(dest_javascripts, 'jquery.gritter.min.js')
-
-    unless File.exists?(gritter) && FileUtils.identical?(File.join(orig_javascripts, 'jquery.gritter.min.js'), gritter)
-      begin
-        puts "Creating directory #{dest_javascripts}..."
-        FileUtils.mkdir_p dest_javascripts
-        puts "Creating directory #{dest_stylesheets}..."
-        FileUtils.mkdir_p dest_stylesheets
-        puts "Creating directory #{dest_images}..."
-        FileUtils.mkdir_p dest_images
-        puts "Copying gritter to #{dest_javascripts}..."
-        FileUtils.cp_r "#{orig_javascripts}/.", dest_javascripts
-        puts "Copying gritter to #{dest_stylesheets}..."
-        FileUtils.cp_r "#{orig_stylesheets}/.", dest_stylesheets
-        puts "Copying gritter to #{dest_images}..."
-        FileUtils.cp_r "#{orig_images}/.", dest_images
-        puts "Successfully installed gritter."
-      rescue
-        puts "ERROR: Problem installing gritter. Please copy the files manually."
-      end
-    end
-  end
 end
 
 if defined?(Rails::Railtie)

data/lib/gritter/gflash.rb

@@ -1,28 +1,50 @@
 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)
-          gflash_value = value
-          gflash_value[:value] = gflash_text(key, gflash_value[:value]) if gflash_value.has_key?(:value)
+          if value.has_key?(:value)
+            value[:value] = gflash_text(key, value[:value])
+          else
+            value[:value] = gflash_translation(key)
+          end
         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]
+          value = gflash_text(key, value)
         end
+        gflash_push(key, value)
       end
     end
   
   private
     
     def gflash_text(key, value)
-      value == true ? I18n.t("gflash.#{params[:controller]}.#{params[:action]}.#{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
 end

data/lib/gritter/helpers.rb

@@ -1,22 +1,11 @@
 module Gritter
   module Helpers
-    def include_gritter *args
-      options = args.extract_options!
-      includes = [stylesheet_link_tag("gritter/jquery.gritter.css"), javascript_include_tag("gritter/jquery.gritter.min.js")]
-      includes.push(js(extend_gritter(options))) if options.present?
-      includes.join("\n").html_safe
-    end
-    
-    def include_gritter_and_jquery *args
-      includes = [javascript_include_tag("http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"), include_gritter(*args)]
-      includes.join("\n").html_safe
-    end
-    
     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.gritter.add({"]
+      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?
@@ -28,6 +17,7 @@ module Gritter
       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
     
@@ -44,10 +34,12 @@ 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)
+      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("time:#{options[:time]},") if options[:time].present?
+      extended.push("position:#{options[:position]}") if options[:position].present?
       extended.push("});")
       extended.join.html_safe
     end
@@ -81,10 +73,6 @@ 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) }

data/lib/gritter/railtie.rb

@@ -1,10 +1,6 @@
 if defined?(Rails::Railtie)
   module Gritter
     class Railtie < Rails::Railtie
-      rake_tasks do
-        load "tasks/gritter.rake"
-      end
-
       initializer :gritter do
         Gritter.initialize
       end

data/lib/gritter/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gritter
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Robin Brouwer
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +01:00
+date: 2011-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -35,35 +35,26 @@ files:
 - 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-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.erb
+- app/assets/stylesheets/gritter.css.scss
 - gritter.gemspec
 - init.rb
+- lib/generators/gritter/USAGE
+- lib/generators/gritter/locale_generator.rb
+- lib/generators/gritter/templates/gflash.en.yml
 - lib/gritter.rb
-- lib/gritter/assets/gflash.en.yml
-- lib/gritter/assets/images/error.png
-- lib/gritter/assets/images/gritter-close-ie6.gif
-- lib/gritter/assets/images/gritter-long.png
-- lib/gritter/assets/images/gritter.png
-- lib/gritter/assets/images/notice.png
-- lib/gritter/assets/images/progress.gif
-- lib/gritter/assets/images/success.png
-- 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
 - lib/gritter/version.rb
-- lib/tasks/gritter.rake
 has_rdoc: true
 homepage: http://www.45north.nl
 licenses: []

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

@@ -1,94 +0,0 @@
-/* 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;
-}