javascripts/cookie.js test/js_unit/cookie_test.html @@ -1,2 +1,6 @@ +- Flash on the Rails side is cleared when written to the cookie +- Uses existing cookie flash value +- Using Scriptaculous cookie.js library + 0.1.1 - Added cookies.js \ No newline at end of file CHANGES @@ -13,9 +13,9 @@ else cp "#{dir}/json.js", rails_javascripts_dir end -if File.exists?("#{rails_javascripts_dir}/cookies.js") - puts "#{rails_javascripts_dir}/cookies.js already exists" +if File.exists?("#{rails_javascripts_dir}/cookie.js") + puts "#{rails_javascripts_dir}/cookie.js already exists" else - puts "copying cookies.js to #{rails_javascripts_dir}" - cp "#{dir}/cookies.js", rails_javascripts_dir + puts "copying cookie.js to #{rails_javascripts_dir}" + cp "#{dir}/cookie.js", rails_javascripts_dir end install.rb @@ -3,10 +3,10 @@ var Flash = new Object(); Flash.data = {}; Flash.transferFromCookies = function() { - var data = JSON.parse(unescape(Cookies.read("flash"))); + var data = JSON.parse(unescape(Cookie.get("flash"))); if(!data) data = {}; Flash.data = data; - Cookies.expire("flash"); + Cookie.erase("flash"); }; Flash.writeDataTo = function(name, element) { javascripts/flash.js @@ -4,6 +4,17 @@ module CacheableFlash end def write_flash_to_cookie - cookies['flash'] = flash.to_json + cookie_flash = cookies['flash'] ? JSON.parse(cookies['flash']) : {} + + flash.each do |key, value| + if cookie_flash[key.to_s].blank? + cookie_flash[key.to_s] = value + else + cookie_flash[key.to_s] << "<br/>#{value}" + end + end + + cookies['flash'] = cookie_flash.to_json + flash.clear end end lib/cacheable_flash.rb @@ -4,9 +4,11 @@ require "#{dir}/../test_helper" class CacheableFlashTest < Test::Unit::TestCase def setup @controller_class = Struct.new(:cookies, :flash) - @controller_class.stubs(:after_filter) + stub(@controller_class).after_filter @controller_class.send(:include, CacheableFlash) @controller = @controller_class.new({}, {}) + @cookies = {} + stub(@controller).cookies {@cookies} end def test_write_flash_to_cookie @@ -14,17 +16,48 @@ class CacheableFlashTest < Test::Unit::TestCase 'errors' => "This is an Error", 'notice' => "This is a Notice" } - @controller.flash = expected_flash + @controller.flash = expected_flash.dup @controller.write_flash_to_cookie assert_equal expected_flash, JSON.parse(@controller.cookies['flash']) end + + def test_flash_is_appended_to_existing_flash_cookie + @cookies['flash'] = { + 'notice' => "Existing notice", + 'errors' => "Existing errors", + }.to_json + + @controller.flash = { + 'notice' => 'New notice', + 'errors' => 'New errors', + } + + @controller.write_flash_to_cookie + + expected_flash = { + 'notice' => "Existing notice<br/>New notice", + 'errors' => "Existing errors<br/>New errors", + } + assert_equal expected_flash, JSON.parse(@controller.cookies['flash']) + end + + def test_flash_is_cleared + flash = { + 'errors' => "This is an Error", + 'notice' => "This is a Notice" + } + @controller.flash = flash + @controller.write_flash_to_cookie + + assert_equal({}, @controller.flash) + end end class CacheableFlashAfterFilterTest < Test::Unit::TestCase def test_after_filter_is_set @controller_class = Struct.new(:cookies, :flash) - @controller_class.expects(:after_filter).with(:write_flash_to_cookie) + mock(@controller_class).after_filter(:write_flash_to_cookie) @controller_class.send(:include, CacheableFlash) end end \ No newline at end of file test/cacheable_flash/cacheable_flash_test.rb @@ -24,11 +24,11 @@ class InstallTest < Test::Unit::TestCase def test_install_without_json_js_file assert !File.exists?("#{@js_dir}/flash.js") assert !File.exists?("#{@js_dir}/json.js") - assert !File.exists?("#{@js_dir}/cookies.js") + assert !File.exists?("#{@js_dir}/cookie.js") load(@install_path) assert File.exists?("#{@js_dir}/flash.js") assert File.exists?("#{@js_dir}/json.js") - assert File.exists?("#{@js_dir}/cookies.js") + assert File.exists?("#{@js_dir}/cookie.js") end def test_install_with_json_js_file @@ -37,25 +37,25 @@ class InstallTest < Test::Unit::TestCase end assert File.exists?("#{@js_dir}/json.js") assert !File.exists?("#{@js_dir}/flash.js") - assert !File.exists?("#{@js_dir}/cookies.js") + assert !File.exists?("#{@js_dir}/cookie.js") load(@install_path) assert File.exists?("#{@js_dir}/flash.js") assert File.exists?("#{@js_dir}/json.js") - assert File.exists?("#{@js_dir}/cookies.js") + assert File.exists?("#{@js_dir}/cookie.js") assert_equal "Original json.js", File.read("#{@js_dir}/json.js") end def test_install_with_cookies_js_file - File.open("#{@js_dir}/cookies.js", "w") do |f| - f.write "Original cookies.js" + File.open("#{@js_dir}/cookie.js", "w") do |f| + f.write "Original cookie.js" end assert !File.exists?("#{@js_dir}/json.js") assert !File.exists?("#{@js_dir}/flash.js") - assert File.exists?("#{@js_dir}/cookies.js") + assert File.exists?("#{@js_dir}/cookie.js") load(@install_path) assert File.exists?("#{@js_dir}/flash.js") assert File.exists?("#{@js_dir}/json.js") - assert File.exists?("#{@js_dir}/cookies.js") - assert_equal "Original cookies.js", File.read("#{@js_dir}/cookies.js") + assert File.exists?("#{@js_dir}/cookie.js") + assert_equal "Original cookie.js", File.read("#{@js_dir}/cookie.js") end end \ No newline at end of file test/cacheable_flash/install_test.rb @@ -2,20 +2,27 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <script src="../../javascripts/prototype.js" type="text/javascript"></script> - <script src="../../javascripts/cookies.js" type="text/javascript"></script> - <script src="../../javascripts/flash.js" type="text/javascript"></script> - + <script src="../js-common/include.js" type="text/javascript"></script> + <script src="../cpr-include.js" type="text/javascript"></script> + <script type="text/javascript"> + Include.jsUnitCore(); + Include.allProduction(); + Include.allCommonTest(); + Include.testHelper(); + + + </script> + <script language="javascript" type="text/javascript"> var content; function setUp() { content = $('content'); content.innerHTML = ""; - Cookies.expireAll(); + Cookie.eraseAll(); } function tearDown() { - Cookies.expireAll(); + Cookie.eraseAll(); } function test_transferFromCookies_setsFlashData_whenCookieExists() { @@ -45,7 +52,7 @@ 'notice': "The Notice" }); Flash.transferFromCookies(); - assertNull(Cookies.read("flash")); + assertNull(Cookie.get("flash")); } function test_writeDataTo_whenThereIsACookieValue() { @@ -78,7 +85,7 @@ } function setUpCookieWithData(values) { - Cookies.write('flash', JSON.stringify(values)); + Cookie.set('flash', JSON.stringify(values)); } </script> test/js_unit/flash_test.html @@ -1,10 +1,15 @@ require "rubygems" require "test/unit" require "json" -require "mocha" +require "rr" require "tmpdir" require "fileutils" +require "active_support" dir = File.dirname(__FILE__) $LOAD_PATH << "#{dir}/../lib" require "cacheable_flash" + +class Test::Unit::TestCase + include RR::Adapters::TestUnit +end \ No newline at end of file test/test_helper.rb javascripts/cookies.js test/js_unit/cookies_test.html 3ba0a732f9f278d31e835a0ce165e1695ce41e8c btakita btakita@af276e61-6b34-4dac-905b-574b5f35ef33 http://github.com/pivotal/cacheable-flash/commit/d2cb0aed2be000ede6f49738f6ce255080645b8e d2cb0aed2be000ede6f49738f6ce255080645b8e 2007-07-29T22:51:37-07:00 2007-07-29T22:51:37-07:00 - Flash on the Rails side is cleared when written to the cookie - Uses existing cookie flash value - Using Scriptaculous cookie.js library git-svn-id: svn+ssh://rubyforge.org/var/svn/pivotalrb/cacheable_flash/trunk@591 af276e61-6b34-4dac-905b-574b5f35ef33 092c57c221254743359964de573129786589c639 btakita btakita@af276e61-6b34-4dac-905b-574b5f35ef33