cacheable_flash 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bdb098987853b71c911ad84e070ca44e3c3dee1
-  data.tar.gz: 167e3d10c1679c57f12d1a7f8127509301092e65
+  metadata.gz: 961455be26c61651eb110faf6af10b4bfccd10bf
+  data.tar.gz: 9c8087e7e479bf5c8d763871d4a090dde48810ff
 SHA512:
-  metadata.gz: 3bdf569f5354470eba7634a09c55dfe35d8f43362a1d2ef9949d290b6855bf781023df8555560ee8131851115d4a9150a572df528c56d245439f883b5f338493
-  data.tar.gz: b5a1f3892cefd5b90b3c450b27090e34b9d38fc33486ddd18fcc5cc48968aa2bdaf8c3f5dd050f86e672b46a3546c2826e2875c30dd583549af793c1e59890bf
+  metadata.gz: 2b86f36dce97b83134ba04e0609e4860e41716b2f5471870354e9e1ac7ca4cd351f59d8e8615209ce8f85b653dc346c40a435acfa0c9442b40464ffba3d01bbf
+  data.tar.gz: e893e5b5bb52d187dc2a792038aabec34f5316a8d98ca545beae27237c6ef9a967269f5b3e165cc2a7f007402e4f74ee8f055df33750d44c709db5b79503cca3

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.3.4 - SEP.28.2015
+* Maintenance release with minor changes and a security fix
+* fix JS error when flash cookie is not set (new version of jquery.cookie returns undefined when a cookie does not exist) [nickurban]
+* Reflected XSS vulnerability fix [rubyconvict]
+* If domain is not set, do not force as empty string. Breaks IE. [ndreckshage]
+* Update CacheableFlash::RspecMatchers and rspec test suite for latest Rspec v3.3 [Peter Boling]
+
 0.3.3 - SEP.13.2013
 * Maintenance release with lots of minor changes and fixes.
 * Main gem should be API compatible.

data/cacheable_flash.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency(%q<stackable_flash>, [">= 0.0.7"])
   s.add_runtime_dependency(%q<json>, [">= 0"])
-  s.add_development_dependency(%q<rails>, ["~> 3.1.3"])
+  s.add_development_dependency(%q<rails>, ["~> 3.1.12"])
   s.add_development_dependency(%q<jquery-rails>, [">= 0"])
-  s.add_development_dependency(%q<rspec-rails>, [">= 2.11.0"])
+  s.add_development_dependency(%q<rspec-rails>, [">= 3.3.3"])
   s.add_development_dependency(%q<rdoc>, [">= 3.12"])
-  s.add_development_dependency(%q<reek>, [">= 1.2.8"])
-  s.add_development_dependency(%q<roodi>, [">= 2.1.0"])
+  s.add_development_dependency(%q<reek>, [">= 3.5.0"])
+  s.add_development_dependency(%q<roodi>, [">= 5.0.0"])
   s.add_development_dependency(%q<rake>, [">= 0"])
 end

data/lib/cacheable_flash/middleware.rb

@@ -16,7 +16,7 @@ module CacheableFlash
       if env_flash
         domain = CacheableFlash::Config.config[:domain]
         cookies = Rack::Request.new(env).cookies
-        Rack::Utils.set_cookie_header!(headers, "flash", :value => cookie_flash(env_flash, cookies), :path => "/", :domain => "#{domain}")
+        Rack::Utils.set_cookie_header!(headers, "flash", :value => cookie_flash(env_flash, cookies), :path => "/", :domain => domain)
       end
 
       [status, headers, body]

data/lib/cacheable_flash/rspec_matchers.rb

@@ -11,10 +11,10 @@ module CacheableFlash
         flash_in_stack(flash_cookie_for(response)[flash_status], expecting)
       end
       match{|response| has_flash_cookie?(response)}
-      failure_message_for_should do |actual|
+      failure_message do |actual|
         "expected flash[:#{expected[0]}] to be or include #{expected[1].inspect}, but got #{flash_cookie_for(actual)[expected[0]]}"
       end
-      failure_message_for_should_not do |actual|
+      failure_message_when_negated do |actual|
         "expected flash[:#{expected[0]}] to not be and not include #{expected[1].inspect}, but got #{flash_cookie_for(actual)[expected[0]]}"
       end
     end
@@ -24,10 +24,10 @@ module CacheableFlash
         flash_in_stack(flash_cookie_for(response)[flash_status], expecting)
       end
       match{|response| has_cacheable_flash?(response)}
-      failure_message_for_should do |actual|
+      failure_message do |actual|
         "expected flash[:#{expected[0]}] to be or include #{expected[1].inspect}, but got #{flash_cookie_for(actual)[expected[0]]}"
       end
-      failure_message_for_should_not do |actual|
+      failure_message_when_negated do |actual|
         "expected flash[:#{expected[0]}] to not be and not include #{expected[1].inspect}, but got #{flash_cookie_for(actual)[expected[0]]}"
       end
     end

data/lib/cacheable_flash/version.rb

@@ -1,3 +1,3 @@
 module CacheableFlash
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/cacheable_flash/cacheable_flash_spec.rb

@@ -4,11 +4,11 @@ describe 'CacheableFlash' do
   attr_reader :controller_class, :controller, :cookies
   before do
     @controller_class = Struct.new(:cookies, :flash)
-    @controller_class.stub(:around_filter)
+    allow(@controller_class).to receive(:around_filter)
     @controller_class.send(:include, CacheableFlash)
     @controller = @controller_class.new({}, {})
     @cookies = {}
-    @controller.stub(:cookies).and_return(@cookies)
+    allow(@controller).to receive(:cookies) { @cookies }
   end
 
   def controller_cookie_flash
@@ -26,7 +26,7 @@ describe 'CacheableFlash' do
         @controller.flash = expected_flash.dup
         @controller.write_flash_to_cookie
 
-        JSON(controller_cookie_flash).should == expected_flash
+        expect(JSON(controller_cookie_flash)).to eq expected_flash
       end
     end
 
@@ -49,52 +49,50 @@ describe 'CacheableFlash' do
             'notice' => "New notice",
             'errors' => "New errors",
           }
-          JSON(controller_cookie_flash).should == expected_flash
+          expect(JSON(controller_cookie_flash)).to eq expected_flash
         end
       end
 
       context "when the flash cookie is 'invalid' json" do
         it "does not have an error and starts with an empty Hash" do
           @cookies['flash'] = ""
-          lambda do
-            JSON(@cookies['flash'])
-          end.should raise_error(JSON::ParserError)
+          expect { JSON(@cookies['flash']) }.to raise_error(JSON::ParserError)
 
           @controller.write_flash_to_cookie
 
-          JSON(@cookies['flash'][:value]).should == {}
+          expect(JSON(@cookies['flash'][:value])).to eq({})
         end
       end
     end
-    
+
     it "converts flash value to string before storing in cookie if value is a number" do
       @controller.flash = { 'quantity' => 5 }
       @controller.write_flash_to_cookie
-      JSON(controller_cookie_flash).should == { 'quantity' => 5 }
+      expect(JSON(controller_cookie_flash)).to eq({ 'quantity' => 5 })
     end
-    
+
     it "does not convert flash value to string before storing in cookie if value is anything other than a number" do
       @controller.flash = { 'foo' => { 'bar' => 'baz' } }
       @controller.write_flash_to_cookie
-      JSON(controller_cookie_flash).should == { 'foo' => { 'bar' => 'baz' } }
+      expect(JSON(controller_cookie_flash)).to eq({ 'foo' => { 'bar' => 'baz' } })
     end
-    
+
     it "encodes plus signs in generated JSON before storing in cookie" do
       @controller.flash = { 'notice' => 'Life, Love + Liberty' }
       @controller.write_flash_to_cookie
-      controller_cookie_flash.should == "{\"notice\":\"Life, Love %2B Liberty\"}"
+      expect(controller_cookie_flash).to eq "{\"notice\":\"Life, Love %2B Liberty\"}"
     end
 
     it "escapes strings when not html safe" do
       @controller.flash = { 'notice' => '<em>Life, Love + Liberty</em>' } # Not html_safe, so it will be escaped
       @controller.write_flash_to_cookie
-      controller_cookie_flash.should == "{\"notice\":\"&lt;em&gt;Life, Love %2B Liberty&lt;/em&gt;\"}"
+      expect(controller_cookie_flash).to eq "{\"notice\":\"&lt;em&gt;Life, Love %2B Liberty&lt;/em&gt;\"}"
     end
 
     it "does not escape strings that are html_safe" do
       @controller.flash = { 'notice' => '<em>Life, Love + Liberty</em>'.html_safe } # html_safe so it will not be escaped
       @controller.write_flash_to_cookie
-      controller_cookie_flash.should == "{\"notice\":\"<em>Life, Love %2B Liberty</em>\"}"
+      expect(controller_cookie_flash).to eq "{\"notice\":\"<em>Life, Love %2B Liberty</em>\"}"
     end
 
     it "clears the controller.flash hash provided by Rails" do
@@ -105,25 +103,25 @@ describe 'CacheableFlash' do
       @controller.flash = flash
       @controller.write_flash_to_cookie
 
-      @controller.flash.should == {}
+      expect(@controller.flash).to eq({})
     end
-    
+
     it "escapes HTML if the flash value is not html safe" do
       @controller.flash = { 'quantity' => "<div>foobar</div>" }
       @controller.write_flash_to_cookie
-      JSON(controller_cookie_flash).should == { 'quantity' => "&lt;div&gt;foobar&lt;/div&gt;" }
+      expect(JSON(controller_cookie_flash)).to eq({ 'quantity' => "&lt;div&gt;foobar&lt;/div&gt;" })
     end
-    
+
     it "does not escape flash HTML if the value is html safe" do
       @controller.flash = { 'quantity' => '<div>foobar</div>'.html_safe }
       @controller.write_flash_to_cookie
-      JSON(controller_cookie_flash).should == { 'quantity' => "<div>foobar</div>" }
+      expect(JSON(controller_cookie_flash)).to eq({ 'quantity' => "<div>foobar</div>" })
     end
   end
 
   describe ".included" do
     it "sets the around_filter on the controller to call #write_flash_to_cookie" do
-      @controller_class.should_receive(:around_filter).with(:write_flash_to_cookie)
+      expect(@controller_class).to receive(:around_filter).with(:write_flash_to_cookie)
       @controller_class.send(:include, CacheableFlash)
     end
   end

data/spec/controllers/comparison_cotroller_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 # even if you are actually using the Middleware in your actual app
 # The DummyController in the dummy app includes CacheableFlash to make the helpers testable as a controller spec.
 
-describe ComparisonController do
+describe ComparisonController, type: :controller do
 
   render_views
 
@@ -20,19 +20,19 @@ describe ComparisonController do
         #end
         it "should handle comparison with hash through keys" do
           get :single_key_hash
-          flash_cookie['notice'].should == {'hello' => 'asdf'} # Keys of hashes are always strings on the other side of JSON
+          expect(flash_cookie['notice']).to eq({'hello' => 'asdf'}) # Keys of hashes are always strings on the other side of JSON
         end
         it "should handle comparison with number" do
           get :single_key_number
-          flash_cookie['notice'].should == 1
+          expect(flash_cookie['notice']).to eq(1)
         end
         it "should handle comparison with string" do
           get :single_key_string
-          flash_cookie['notice'].should == 'message'
+          expect(flash_cookie['notice']).to eq('message')
         end
         it "should handle comparison with array" do
           get :single_key_array
-          flash_cookie['notice'].should == ['message'] # Because actually set to an array, not because stacking
+          expect(flash_cookie['notice']).to eq(['message']) # Because actually set to an array, not because stacking
         end
       end
       describe "stacking" do
@@ -47,19 +47,19 @@ describe ComparisonController do
         end
         it "should handle comparison with hash through keys" do
           get :single_key_hash
-          flash_cookie['notice'].should == [{'hello' => 'asdf'}] # Keys of hashes are always strings on the other side of JSON
+          expect(flash_cookie['notice']).to eq([{'hello' => 'asdf'}]) # Keys of hashes are always strings on the other side of JSON
         end
         it "should handle comparison with number" do
           get :single_key_number
-          flash_cookie['notice'].should == [1]
+          expect(flash_cookie['notice']).to eq([1])
         end
         it "should handle comparison with string" do
           get :single_key_string
-          flash_cookie['notice'].should == ['message'] # flash was set to a string, but comparison is with an array!
+          expect(flash_cookie['notice']).to eq(['message']) # flash was set to a string, but comparison is with an array!
         end
         it "should handle comparison with array" do
           get :single_key_array
-          flash_cookie['notice'].should == ['message']
+          expect(flash_cookie['notice']).to eq(['message'])
         end
       end
     end
@@ -80,18 +80,18 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice','not message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice','not message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice','message')}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice','message')}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice','message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice','message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice','not message')}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice','not message')}.to_not raise_error
             end
 
           end
@@ -102,18 +102,18 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice','not message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice','not message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice','message')}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice','message')}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice','message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice','message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice','not message')}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice','not message')}.to_not raise_error
             end
           end
         end
@@ -123,18 +123,18 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice','not message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice','not message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice',{'hello' => 'asdf'})}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice',{'hello' => 'asdf'})}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice',{'hello' => 'asdf'})}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',{'hello' => 'asdf'})}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice','not message')}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice','not message')}.to_not raise_error
             end
 
           end
@@ -145,18 +145,18 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice',2)}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice',2)}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice',1)}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice',1)}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice',1)}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',1)}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice',2)}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice',2)}.to_not raise_error
             end
           end
         end
@@ -177,20 +177,20 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice','not message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice','not message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice','message')}.should_not raise_exception
-              lambda {response.should have_cacheable_flash('notice',['message'])}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice','message')}.to_not raise_error
+              expect { expect(response).to have_cacheable_flash('notice',['message'])}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice','message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
-              lambda {response.should_not have_cacheable_flash('notice',['message'])}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice','message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',['message'])}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice','not message')}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice','not message')}.to_not raise_error
             end
 
           end
@@ -201,20 +201,20 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice',['not message'])}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice',['not message'])}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice','message')}.should_not raise_exception
-              lambda {response.should have_cacheable_flash('notice',['message'])}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice','message')}.to_not raise_error
+              expect { expect(response).to have_cacheable_flash('notice',['message'])}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice','message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
-              lambda {response.should_not have_cacheable_flash('notice',['message'])}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice','message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',['message'])}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice','not message')}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice','not message')}.to_not raise_error
             end
           end
         end
@@ -224,20 +224,20 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice','not message')}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice','not message')}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice',{'hello' => 'asdf'})}.should_not raise_exception
-              lambda {response.should have_cacheable_flash('notice',[{'hello' => 'asdf'}])}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice',{'hello' => 'asdf'})}.to_not raise_error
+              expect { expect(response).to have_cacheable_flash('notice',[{'hello' => 'asdf'}])}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice',{'hello' => 'asdf'})}.should raise_error RSpec::Expectations::ExpectationNotMetError
-              lambda {response.should_not have_cacheable_flash('notice',[{'hello' => 'asdf'}])}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',{'hello' => 'asdf'})}.to raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',[{'hello' => 'asdf'}])}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice','not message')}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice','not message')}.to_not raise_error
             end
 
           end
@@ -248,20 +248,20 @@ describe ComparisonController do
           end
           context "#should" do
             it "raises error when not a match" do
-              lambda {response.should have_cacheable_flash('notice',2)}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to have_cacheable_flash('notice',2)}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when a match" do
-              lambda {response.should have_cacheable_flash('notice',1)}.should_not raise_exception
-              lambda {response.should have_cacheable_flash('notice',[1])}.should_not raise_exception
+              expect { expect(response).to have_cacheable_flash('notice',1)}.to_not raise_error
+              expect { expect(response).to have_cacheable_flash('notice',[1])}.to_not raise_error
             end
           end
           context "#should_not" do
             it "raises error when a match" do
-              lambda {response.should_not have_cacheable_flash('notice',1)}.should raise_error RSpec::Expectations::ExpectationNotMetError
-              lambda {response.should_not have_cacheable_flash('notice',[1])}.should raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',1)}.to raise_error RSpec::Expectations::ExpectationNotMetError
+              expect { expect(response).to_not have_cacheable_flash('notice',[1])}.to raise_error RSpec::Expectations::ExpectationNotMetError
             end
             it "should not raise error when not a match" do
-              lambda {response.should_not have_cacheable_flash('notice',2)}.should_not raise_exception
+              expect { expect(response).to_not have_cacheable_flash('notice',2)}.to_not raise_error
             end
           end
         end

data/spec/controllers/dummy_controller_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 # even if you are actually using the Middleware in your actual app
 # The DummyController in the dummy app includes CacheableFlash to make the helpers testable as a controller spec.
 
-describe DummyController do
+describe DummyController, type: :controller do
 
   render_views
 
@@ -20,20 +20,20 @@ describe DummyController do
         #end
         it "should handle multiple keys" do
           get :multiple_keys
-          flash_cookie['errors'].should == "This is an Error"
-          flash_cookie['notice'].should == "This is a Notice"
+          expect(flash_cookie['errors']).to eq("This is an Error")
+          expect(flash_cookie['notice']).to eq("This is a Notice")
         end
         it "should handle overriding values" do
           get :override
-          flash_cookie['notice'].should_not == "original"
-          flash_cookie['notice'].should == "message"
+          expect(flash_cookie['notice']).to_not eq("original")
+          expect(flash_cookie['notice']).to eq("message")
         end
         it "should handle stacking values as concatenations" do
           get :stack
-          flash_cookie['notice'].should == "originalmessageanother"
+          expect(flash_cookie['notice']).to eq("originalmessageanother")
         end
         it "should raise exception when cold booting the flash" do
-          lambda { get :cold_boot }.should raise_exception
+          expect { get :cold_boot }.to raise_error NoMethodError, /undefined method `<<' for nil:NilClass/
         end
       end
       describe "stacking" do
@@ -48,21 +48,21 @@ describe DummyController do
         end
         it "should handle multiple keys" do
           get :multiple_keys
-          flash_cookie['errors'].should == ["This is an Error"]
-          flash_cookie['notice'].should == ["This is a Notice"]
+          expect(flash_cookie['errors']).to eq(["This is an Error"])
+          expect(flash_cookie['notice']).to eq(["This is a Notice"])
         end
         it "should handle overriding values" do
           get :override
-          flash_cookie['notice'].should_not == ["original"]
-          flash_cookie['notice'].should == ["message"]
+          expect(flash_cookie['notice']).to_not eq(["original"])
+          expect(flash_cookie['notice']).to eq(["message"])
         end
         it "should handle stacking values" do
           get :stack
-          flash_cookie['notice'].should == ["original","message","another"]
+          expect(flash_cookie['notice']).to eq(["original","message","another"])
         end
         it "should handle cold booting the flash" do
           get :cold_boot
-          flash_cookie['notice'].should == ["original","message","another"]
+          expect(flash_cookie['notice']).to eq(["original","message","another"])
         end
       end
     end

data/spec/requests/integration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DummyController do
+describe DummyController, type: :request do
   before(:each) do
     CacheableFlash::Config.configure do |config|
       config[:stacking] = true
@@ -14,12 +14,12 @@ describe DummyController do
   describe "cookie flash is sticky" do
     it "should not clear after request" do # because they are only cleared out by javascripts
       get "/dummy/index"
-      response.should have_flash_cookie('errors', "This is an Error")
-      response.should have_flash_cookie('notice', "This is a Notice")
+      expect(response).to have_flash_cookie('errors', "This is an Error")
+      expect(response).to have_flash_cookie('notice', "This is a Notice")
 
       get "/dummy/no_flash"
-      response.should have_flash_cookie('errors', "This is an Error")
-      response.should have_flash_cookie('notice', "This is a Notice")
+      expect(response).to have_flash_cookie('errors', "This is an Error")
+      expect(response).to have_flash_cookie('notice', "This is a Notice")
 
     end
   end
@@ -27,17 +27,17 @@ describe DummyController do
   describe "cookie flash is stackable" do
     it "should not overwrite when new flash added" do # because they are only cleared out by javascripts
       get "/dummy/index"
-      response.should have_flash_cookie('errors', "This is an Error")
-      response.should have_flash_cookie('notice', "This is a Notice")
+      expect(response).to have_flash_cookie('errors', "This is an Error")
+      expect(response).to have_flash_cookie('notice', "This is a Notice")
 
       get "/dummy/error?id=1"
-      response.should have_flash_cookie('errors', "This is an Error")
-      response.should have_flash_cookie('errors', "Error #1")
+      expect(response).to have_flash_cookie('errors', "This is an Error")
+      expect(response).to have_flash_cookie('errors', "Error #1")
 
       get "/dummy/error?id=2"
-      response.should have_flash_cookie('errors', "This is an Error")
-      response.should have_flash_cookie('errors', "Error #1")
-      response.should have_flash_cookie('errors', "Error #2")
+      expect(response).to have_flash_cookie('errors', "This is an Error")
+      expect(response).to have_flash_cookie('errors', "Error #1")
+      expect(response).to have_flash_cookie('errors', "Error #2")
     end
   end
 
@@ -45,29 +45,29 @@ describe DummyController do
   #   https://github.com/pboling/stackable_flash/blob/master/spec/controllers/dummy_controller_spec.rb
   it "should handle multiple keys" do
     get "/dummy/multiple_keys"
-    response.should have_flash_cookie('notice', 'This is a Notice')
-    response.should have_flash_cookie('errors', 'This is an Error')
+    expect(response).to have_flash_cookie('notice', 'This is a Notice')
+    expect(response).to have_flash_cookie('errors', 'This is an Error')
   end
 
   it "should override" do
     get "/dummy/override"
-    response.should_not have_flash_cookie('notice','original')
-    response.should have_flash_cookie('notice','message')
+    expect(response).to_not have_flash_cookie('notice','original')
+    expect(response).to have_flash_cookie('notice','message')
   end
 
   it "should stack" do
     get "/dummy/stack"
-    response.should have_flash_cookie('notice',['original','message','another'])
+    expect(response).to have_flash_cookie('notice',['original','message','another'])
   end
 
   it "should cold boot" do
     get "/dummy/cold_boot"
-    response.should have_flash_cookie('notice',['original','message','another'])
+    expect(response).to have_flash_cookie('notice',['original','message','another'])
   end
 
   it "should allow use of have_cacheable_flash matcher" do
     get "/dummy/cold_boot"
-    lambda {response.should have_cacheable_flash('notice',['original','message','another'])}.should_not raise_exception
+    expect {expect(response).to have_cacheable_flash('notice',['original','message','another'])}.to_not raise_exception
   end
 
 end

data/spec/spec_helper.rb

@@ -2,19 +2,18 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment",  __FILE__)
 
-require 'rspec/rails'
+require "rspec/rails"
 require "json"
-require 'cacheable_flash'
-require 'cacheable_flash/rspec_matchers'
+require "cacheable_flash"
+require "cacheable_flash/rspec_matchers"
 
-ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
+ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), "../")
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -22,7 +21,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 
   config.include CacheableFlash::RspecMatchers
 end

data/vendor/assets/javascripts/flash.js.erb

@@ -4,7 +4,7 @@ var Flash = new Object();
 Flash.data = {};
 
 Flash.transferFromCookies = function() {
-  var data = JSON.parse(unescape($.cookie("flash")));
+  var data = JSON.parse(unescape($.cookie("flash") || '{}'));
   if(!data) data = {};
   Flash.data = data;
   $.cookie('flash', null, {path: '/', domain: '<%=CacheableFlash::Config.config[:domain]%>'});
@@ -15,7 +15,7 @@ Flash.writeDataTo = function(name, element, callback) {
   var message = "";
   if (Flash.data[name]) {
     message = Flash.data[name].toString().replace(/\+/g, ' ');
-    element.html(message);
+    element.text(message);
     if (callback && typeof(callback) === 'function') {
       callback(element);
     } else {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cacheable_flash
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stackable_flash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.12
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: roodi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -149,9 +149,9 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -230,17 +230,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Render flash messages from a cookie using JavaScript, instead of in your
@@ -292,3 +292,4 @@ test_files:
 - spec/js_unit/flash_test.html
 - spec/requests/integration_spec.rb
 - spec/spec_helper.rb
+has_rdoc: