glow 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -1,92 +1,93 @@
 PATH
   remote: .
   specs:
-    glow (0.0.10)
+    glow (0.0.11)
       jquery-rails
       rails (>= 3.0.0, < 4.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.4)
+    json (1.7.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.1.3)
+    sprockets (2.2.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -22,6 +22,7 @@ end
 
 Bundler::GemHelper.install_tasks
 
+desc 'compile glow.coffee to .js'
 task :compile do
   sh 'coffee -co vendor/assets/javascripts src/glow.coffee'
 end

data/lib/glow/version.rb

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

data/src/glow.coffee

@@ -4,7 +4,7 @@ window.Glow =
 $(document).ajaxComplete (evt, xhr, options) ->
   type = xhr.getResponseHeader('X-Message-Type')
   message = xhr.getResponseHeader('X-Message')
-  Glow.flash type, message if type and message
+  Glow.flash type, $('<div/>').html(message).text() if type and message
 
 window.Flash =
   fire: Glow.flash

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]
+        head :ok
       }
     end
   end

data/test/rails3/app/views/flash/show.html.erb

@@ -1,13 +1,13 @@
 <script type="application/javascript">
   // Flash handling
-  $(document).bind('glow:flash', function(evt, flash) { console.log('glow flash'); $('#flash').html(flash.message); });
+  $(document).bind('glow:flash', function(evt, flash) { console.log('glow flash'); $('#flash').text(flash.message); });
 </script>
 
 <p id="flash"><%= flash.map { |type, message| message }.join %></p>
-<p><%= link_to 'redirect', action: :redirect, type: :notice, message: 'utf8: ✓ ' %></p>
-<p><%= link_to 'rails ajax', {action: :ajax, type: :notice, message: 'rails ajax: ✓ '}, remote: true %></p>
+<p><%= link_to 'redirect', action: :redirect, type: :notice, message: 'utf8: ✓' %></p>
+<p><%= link_to 'rails ajax', {action: :ajax, type: :notice, message: 'rails ajax: ✓'}, remote: true %></p>
 <p><%= link_to 'jquery ajax', '#', id: 'ajax' %></p>
 
 <script type="application/javascript">
-  $('#ajax').click(function(){$.get('<%= url_for action: :ajax, type: :notice, message: 'jquery utf8: ✓', format: :js %>'); return false;});
+  $('#ajax').click(function(){$.get('<%= url_for action: :ajax, type: :notice, message: 'jquery ajax: ✓', format: :js %>'); return false;});
 </script>

data/test/rails3/public/javascripts/glow.js

@@ -1,4 +1,6 @@
+// Generated by CoffeeScript 1.3.3
 (function() {
+
   window.Glow = {
     flash: function(type, message) {
       return $(document).trigger('glow:flash', {
@@ -7,12 +9,16 @@
       });
     }
   };
+
   $(document).ajaxComplete(function(evt, xhr, options) {
     var message, type;
-    if (type = xhr.getResponseHeader('X-Message-Type') && (message = xhr.getResponseHeader('X-Message'))) {
-      return Glow.flash(type, message);
+    type = xhr.getResponseHeader('X-Message-Type');
+    message = xhr.getResponseHeader('X-Message');
+    if (type && message) {
+      return Glow.flash(type, $('<div/>').html(message).text());
     }
   });
+
   window.Flash = {
     fire: Glow.flash,
     success: function(message) {
@@ -25,4 +31,5 @@
       return Glow.flash('error', message);
     }
   };
+
 }).call(this);

data/test/rails3/spec/integration/flash_spec.rb

@@ -5,13 +5,18 @@ describe "the flash view" do
   it "redirects" do
     visit root_path
     click_on 'redirect'
-    page.has_content?('utf8: ✓')
+    page.should have_content('utf8: ✓')
   end
 
-  it "handles ajax" do
+  it "handles rails ajax" do
     visit root_path
-    click_on 'ajax'
-    page.has_content?('ajax: ✓')
+    click_on 'rails ajax'
+    page.should have_content('rails ajax: ✓')
   end
-end
 
+  it "handles jquery ajax" do
+    visit root_path
+    click_on 'jquery ajax'
+    page.should have_content('jquery ajax: ✓')
+  end
+end

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]
+        head :ok
       }
     end
   end

data/test/rails31/app/views/flash/show.html.erb

@@ -1,13 +1,13 @@
 <script type="application/javascript">
   // Flash handling
-  $(document).bind('glow:flash', function(evt, flash) { console.log('glow flash'); $('#flash').html(flash.message); });
+  $(document).bind('glow:flash', function(evt, flash) { console.log('glow flash'); $('#flash').text(flash.message); });
 </script>
 
 <p id="flash"><%= flash.map { |type, message| message }.join %></p>
-<p><%= link_to 'redirect', action: :redirect, type: :notice, message: 'utf8: ✓ ' %></p>
-<p><%= link_to 'rails ajax', {action: :ajax, type: :notice, message: 'rails ajax: ✓ '}, remote: true %></p>
+<p><%= link_to 'redirect', action: :redirect, type: :notice, message: 'utf8: ✓' %></p>
+<p><%= link_to 'rails ajax', {action: :ajax, type: :notice, message: 'rails ajax: ✓'}, remote: true %></p>
 <p><%= link_to 'jquery ajax', '#', id: 'ajax' %></p>
 
 <script type="application/javascript">
-  $('#ajax').click(function(){$.get('<%= url_for action: :ajax, type: :notice, message: 'jquery utf8: ✓', format: :js %>'); return false;});
+  $('#ajax').click(function(){$.get('<%= url_for action: :ajax, type: :notice, message: 'jquery ajax: ✓', format: :js %>'); return false;});
 </script>

data/test/rails31/spec/integration/flash_spec.rb

@@ -5,13 +5,18 @@ describe "the flash view" do
   it "redirects" do
     visit root_path
     click_on 'redirect'
-    page.has_content?('utf8: ✓')
+    page.should have_content('utf8: ✓')
   end
 
-  it "handles ajax" do
+  it "handles rails ajax" do
     visit root_path
-    click_on 'ajax'
-    page.has_content?('ajax: ✓')
+    click_on 'rails ajax'
+    page.should have_content('rails ajax: ✓')
   end
-end
 
+  it "handles jquery ajax" do
+    visit root_path
+    click_on 'jquery ajax'
+    page.should have_content('jquery ajax: ✓')
+  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]
+        head :ok
       }
     end
   end

data/test/rails32/app/views/flash/show.html.erb

@@ -1,13 +1,13 @@
 <script type="application/javascript">
   // Flash handling
-  $(document).bind('glow:flash', function(evt, flash) { console.log('glow flash'); $('#flash').html(flash.message); });
+  $(document).bind('glow:flash', function(evt, flash) { console.log('glow flash'); $('#flash').text(flash.message); });
 </script>
 
 <p id="flash"><%= flash.map { |type, message| message }.join %></p>
-<p><%= link_to 'redirect', action: :redirect, type: :notice, message: 'utf8: ✓ ' %></p>
-<p><%= link_to 'rails ajax', {action: :ajax, type: :notice, message: 'rails ajax: ✓ '}, remote: true %></p>
+<p><%= link_to 'redirect', action: :redirect, type: :notice, message: 'utf8: ✓' %></p>
+<p><%= link_to 'rails ajax', {action: :ajax, type: :notice, message: 'rails ajax: ✓'}, remote: true %></p>
 <p><%= link_to 'jquery ajax', '#', id: 'ajax' %></p>
 
 <script type="application/javascript">
-  $('#ajax').click(function(){$.get('<%= url_for action: :ajax, type: :notice, message: 'jquery utf8: ✓', format: :js %>'); return false;});
+  $('#ajax').click(function(){$.get('<%= url_for action: :ajax, type: :notice, message: 'jquery ajax: ✓', format: :js %>'); return false;});
 </script>

data/test/rails32/spec/integration/flash_spec.rb

@@ -5,13 +5,18 @@ describe "the flash view" do
   it "redirects" do
     visit root_path
     click_on 'redirect'
-    page.has_content?('utf8: ✓')
+    page.should have_content('utf8: ✓')
   end
 
-  it "handles ajax" do
+  it "handles rails ajax" do
     visit root_path
-    click_on 'ajax'
-    page.has_content?('ajax: ✓')
+    click_on 'rails ajax'
+    page.should have_content('rails ajax: ✓')
   end
-end
 
+  it "handles jquery ajax" do
+    visit root_path
+    click_on 'jquery ajax'
+    page.should have_content('jquery ajax: ✓')
+  end
+end

data/vendor/assets/javascripts/glow.js

@@ -1,4 +1,6 @@
+// Generated by CoffeeScript 1.3.3
 (function() {
+
   window.Glow = {
     flash: function(type, message) {
       return $(document).trigger('glow:flash', {
@@ -7,14 +9,16 @@
       });
     }
   };
+
   $(document).ajaxComplete(function(evt, xhr, options) {
     var message, type;
     type = xhr.getResponseHeader('X-Message-Type');
     message = xhr.getResponseHeader('X-Message');
     if (type && message) {
-      return Glow.flash(type, message);
+      return Glow.flash(type, $('<div/>').html(message).text());
     }
   });
+
   window.Flash = {
     fire: Glow.flash,
     success: function(message) {
@@ -27,4 +31,5 @@
       return Glow.flash('error', message);
     }
   };
+
 }).call(this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glow
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,7 +75,6 @@ files:
 - lib/glow/filter.rb
 - lib/glow/railtie.rb
 - lib/glow/version.rb
-- lib/tasks/glow_tasks.rake
 - src/glow.coffee
 - test/rails3/.rspec
 - test/rails3/Gemfile
@@ -212,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4248034504190271721
+      hash: -3927576654263050558
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4248034504190271721
+      hash: -3927576654263050558
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/tasks/glow_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :glow do
-#   # Task goes here
-# end