@@ -1,4 +1,2 @@ -gem "json", ">=1.1.2" -require "json" require "cacheable_flash" ActionView::Helpers::AssetTagHelper.register_javascript_include_default('cookie','flash','json') init.rb @@ -3,17 +3,16 @@ var Flash = new Object(); Flash.data = {}; Flash.transferFromCookies = function() { - var data = JSON.parse(unescape(Cookie.get("flash"))); + var data = JSON.parse(unescape((Cookie.get("flash") || '').replace(/\+/g, '%20'))); if(!data) data = {}; Flash.data = data; Cookie.erase("flash"); }; Flash.writeDataTo = function(name, element) { - element = $(element); var content = ""; if(Flash.data[name]) { - content = Flash.data[name].toString().gsub(/\+/, ' '); + content = Flash.data[name].toString().replace(/\+/g, ' '); } element.innerHTML = unescape(content); }; javascripts/flash.js @@ -4,7 +4,7 @@ module CacheableFlash end def write_flash_to_cookie - cookie_flash = cookies['flash'] ? JSON.parse(cookies['flash']) : {} + cookie_flash = cookies['flash'] ? ActiveSupport::JSON.decode(cookies['flash']) : {} flash.each do |key, value| if cookie_flash[key.to_s].blank? lib/cacheable_flash.rb @@ -2,7 +2,7 @@ module CacheableFlash module TestHelpers def flash_cookie return {} unless cookies['flash'] - JSON.parse(cookies['flash'].first) + ActiveSupport::JSON.decode(cookies['flash'].first) end end end \ No newline at end of file lib/cacheable_flash/test_helpers.rb 1921711f722f0a9f4ebbf0b6e6f95ec645dcd9fc Luke Francl look@subtleknife.local http://github.com/look/cacheable-flash/commit/84e9fc893e0d9cc56e2794c62b28c9e501c6dc0c 84e9fc893e0d9cc56e2794c62b28c9e501c6dc0c 2008-09-27T19:35:37-07:00 2008-09-27T19:35:37-07:00 Rewrote CacheableFlash to not use the JSON gem or Prototype. This version uses ActiveSupport::JSON and raw JavaScript for fewer dependencies. e7040b5d85f4f08f400d798146623da2eeb24e8f Luke Francl look@subtleknife.local