glow 0.0.11 → 0.0.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    glow (0.0.11)
+    glow (0.0.12)
       jquery-rails
       rails (>= 3.0.0, < 4.0.0)
 

data/README.md

@@ -35,6 +35,8 @@ responses).
       <%= javascript_tag "Flash.fire('#{type}', '#{message}')" %>
     <% end %>
 
+If you want to skip the glow after_filter just set `flash[:skip_glow]`.
+
 ## Installation
 
 In your gemfile add

data/lib/glow/filter.rb

@@ -9,6 +9,8 @@ module Glow
 
     def flash_to_headers
       return unless flash.any? && request.xhr?
+      return if flash[:skip_glow] and flash.delete(:skip_glow)
+
       type, message = flash.first
       response.headers['X-Message'] = message.to_s.unpack('U*').map{ |i| "&##{i};" }.join
         response.headers['X-Message-Type'] = type.to_s

data/lib/glow/version.rb

@@ -1,3 +1,3 @@
 module Glow
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/test/rails3/app/controllers/flash_controller.rb

@@ -12,6 +12,7 @@ class FlashController < ApplicationController
     respond_to do |wants|
       wants.js {
         flash[params[:type]] = params[:message]
+        flash[:skip_glow] = params[:skip_glow].present?
         head :ok
       }
     end

data/test/rails3/spec/controllers/flash_controller_spec.rb

@@ -30,4 +30,9 @@ describe FlashController do
     @response.headers['X-Message-Type'].should be == 'notice'
     HTMLEntities.new.decode(@response.headers['X-Message']).should be == 'utf8: ✓'
   end
+
+  it "should not display flash message on xhr when skip_glow is set" do
+    xhr :get, :ajax, type: :notice, message: 'utf8: ✓', skip_glow: true
+    @response.headers.should_not have_key 'X-Message-Type'
+  end
 end

data/test/rails31/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    glow (0.0.10)
+    glow (0.0.11)
       jquery-rails
       rails (>= 3.0.0, < 4.0.0)
 

data/test/rails31/app/controllers/flash_controller.rb

@@ -12,6 +12,7 @@ class FlashController < ApplicationController
     respond_to do |wants|
       wants.js {
         flash[params[:type].to_sym] = params[:message]
+        flash[:skip_glow] = params[:skip_glow].present?
         head :ok
       }
     end

data/test/rails31/spec/controllers/flash_controller_spec.rb

@@ -30,4 +30,9 @@ describe FlashController do
     @response.headers['X-Message-Type'].should be == 'notice'
     HTMLEntities.new.decode(@response.headers['X-Message']).should be == 'utf8: ✓'
   end
+
+  it "should not display flash message on xhr when skip_glow is set" do
+    xhr :get, :ajax, type: :notice, message: 'utf8: ✓', skip_glow: true
+    @response.headers.should_not have_key 'X-Message-Type'
+  end
 end

data/test/rails32/app/controllers/flash_controller.rb

@@ -12,6 +12,7 @@ class FlashController < ApplicationController
     respond_to do |wants|
       wants.js {
         flash[params[:type].to_sym] = params[:message]
+        flash[:skip_glow] = params[:skip_glow].present?
         head :ok
       }
     end

data/test/rails32/spec/controllers/flash_controller_spec.rb

@@ -30,4 +30,9 @@ describe FlashController do
     @response.headers['X-Message-Type'].should be == 'notice'
     HTMLEntities.new.decode(@response.headers['X-Message']).should be == 'utf8: ✓'
   end
+
+  it "should not display flash message on xhr when skip_glow is set" do
+    xhr :get, :ajax, type: :notice, message: 'utf8: ✓', skip_glow: true
+    @response.headers.should_not have_key 'X-Message-Type'
+  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: glow
 version: !ruby/object:Gem::Version
-  version: 0.0.11
   prerelease: 
+  version: 0.0.12
 platform: ruby
 authors:
 - Daniel Kirsch
@@ -10,12 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,10 +21,10 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,22 +32,24 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  type: :runtime
 description: ! '    Handles Flash messages in Javascript for Rails xhr-responses.
   Fires a dom event when flash messages are present.
 
@@ -204,23 +204,23 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3927576654263050558
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 3382820471934454932
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3927576654263050558
+      hash: 3382820471934454932
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24