cacheable_flash 0.2.5 → 0.2.7

data/Gemfile

@@ -1,9 +1,10 @@
-source "http://rubygems.org"
+#source "http://rubygems.org"
 
 gem "json"
 
 # Development dependencies (everything needed to run rake, tests, features, etc.)
 group :development, :test do
+  # The Dummy application for the specs is a Rails 3.1.3 app.
   gem "rails", "~> 3.1.3"
 
   # jquery-rails is used by the dummy application
@@ -12,10 +13,10 @@ group :development, :test do
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
 
-  gem "rspec-rails", "~> 2.8.0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.21"
-  gem "jeweler", "~> 1.6.4"
-  gem "reek", "~> 1.2.8"
-  gem "roodi", "~> 2.1.0"
+  gem "rspec-rails", ">= 2.8.0"
+  gem "rdoc", ">= 3.12"
+  gem "bundler", ">= 1.0.21"
+  gem "jeweler", ">= 1.6.4"
+  gem "reek", ">= 1.2.8"
+  gem "roodi", ">= 2.1.0"
 end

data/Gemfile.lock

@@ -1,5 +1,4 @@
 GEM
-  remote: http://rubygems.org/
   specs:
     actionmailer (3.1.3)
       actionpack (= 3.1.3)
@@ -36,23 +35,24 @@ GEM
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
-    jeweler (1.6.4)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.7.3)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
     polyglot (0.3.3)
     rack (1.3.6)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -78,31 +78,34 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
+    reek (1.2.12)
+      ripper_ruby_parser (~> 0.0.7)
+      ruby2ruby (~> 1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
+    ripper_ruby_parser (0.0.7)
+      sexp_processor (~> 3.0)
     roodi (2.1.0)
       ruby_parser
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rspec-rails (2.10.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    ruby2ruby (1.3.1)
+      rspec (~> 2.10.0)
+    ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.10)
+    sexp_processor (3.2.0)
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -112,18 +115,18 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.21)
-  jeweler (~> 1.6.4)
+  bundler (>= 1.0.21)
+  jeweler (>= 1.6.4)
   jquery-rails
   json
   rails (~> 3.1.3)
-  rdoc (~> 3.12)
-  reek (~> 1.2.8)
-  roodi (~> 2.1.0)
-  rspec-rails (~> 2.8.0)
+  rdoc (>= 3.12)
+  reek (>= 1.2.8)
+  roodi (>= 2.1.0)
+  rspec-rails (>= 2.8.0)

data/README.rdoc

@@ -43,7 +43,6 @@ The asset pipeline should have access to the assets in this gem via your app/ass
 == Mailing List
 
 http://groups.google.com/group/PivotalLabsOpenSource
-*This mailing list is for the original CacheableFlash, and may not be able to help with issues with this gem.
 
 == Bug/Feature Tracker
 

data/Rakefile

@@ -23,10 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Render flash messages from a cookie using JavaScript, instead of in your Rails
 view template}
-  gem.description = %Q{This plugin enables greater levels of page caching by rendering flash
-messages from a cookie using JavaScript, instead of in your Rails
-view template.  Flash contents are converted to JSON and placed in
-a cookie by an after_filter in a controller.}
+  gem.description = %Q{Allows caching of pages with flash messages by rendering flash\nmessages from a cookie using JavaScript, instead of statically in your Rails\nview template.  Flash contents are converted to JSON and placed in\na cookie by an after_filter in a controller.}
   gem.email = "peter.boling@gmail.com"
   gem.authors = ["Peter H. Boling","Brian Takita"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.7

data/app/controllers/{cacheable-flash → cacheable_flash}/application_controller.rb

@@ -1,5 +1,5 @@
-module CacheableFlash
-  class ApplicationController < ActionController::Base
-    include CacheableFlash
-  end
-end
+module CacheableFlash
+  class ApplicationController < ActionController::Base
+    include CacheableFlash
+  end
+end

data/app/views/layouts/{cacheable-flash → cacheable_flash}/application.html.erb

@@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>CacheableFlash</title>
-  <%= stylesheet_link_tag    "cacheable_flash/application", :media => "all" %>
-  <%= javascript_include_tag "cacheable_flash/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+  <title>CacheableFlash</title>
+  <%= stylesheet_link_tag    "cacheable_flash/application", :media => "all" %>
+  <%= javascript_include_tag "cacheable_flash/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/cacheable_flash.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "cacheable_flash"
-  s.version = "0.2.5"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter H. Boling", "Brian Takita"]
-  s.date = "2012-03-01"
-  s.description = "This plugin enables greater levels of page caching by rendering flash\nmessages from a cookie using JavaScript, instead of in your Rails\nview template.  Flash contents are converted to JSON and placed in\na cookie by an after_filter in a controller."
+  s.date = "2012-06-21"
+  s.description = "Allows caching of pages with flash messages by rendering flash\nmessages from a cookie using JavaScript, instead of statically in your Rails\nview template.  Flash contents are converted to JSON and placed in\na cookie by an after_filter in a controller."
   s.email = "peter.boling@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -29,9 +29,9 @@ Gem::Specification.new do |s|
     "app/assets/images/cacheable_flash/.gitkeep",
     "app/assets/javascripts/cacheable_flash/application.js",
     "app/assets/stylesheets/cacheable_flash/application.css",
-    "app/controllers/cacheable-flash/application_controller.rb",
+    "app/controllers/cacheable_flash/application_controller.rb",
     "app/helpers/cacheable_flash/application_helper.rb",
-    "app/views/layouts/cacheable-flash/application.html.erb",
+    "app/views/layouts/cacheable_flash/application.html.erb",
     "cacheable_flash.gemspec",
     "config/routes.rb",
     "init.rb",
@@ -92,7 +92,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pivotal/cacheable-flash"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Render flash messages from a cookie using JavaScript, instead of in your Rails view template"
 
   if s.respond_to? :specification_version then
@@ -102,33 +102,33 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rails>, ["~> 3.1.3"])
       s.add_development_dependency(%q<jquery-rails>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.21"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
-      s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.21"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_development_dependency(%q<reek>, [">= 1.2.8"])
+      s.add_development_dependency(%q<roodi>, [">= 2.1.0"])
     else
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rails>, ["~> 3.1.3"])
       s.add_dependency(%q<jquery-rails>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.21"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<reek>, ["~> 1.2.8"])
-      s.add_dependency(%q<roodi>, ["~> 2.1.0"])
+      s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
+      s.add_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.21"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_dependency(%q<reek>, [">= 1.2.8"])
+      s.add_dependency(%q<roodi>, [">= 2.1.0"])
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rails>, ["~> 3.1.3"])
     s.add_dependency(%q<jquery-rails>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.21"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<reek>, ["~> 1.2.8"])
-    s.add_dependency(%q<roodi>, ["~> 2.1.0"])
+    s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
+    s.add_dependency(%q<rdoc>, [">= 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.21"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+    s.add_dependency(%q<reek>, [">= 1.2.8"])
+    s.add_dependency(%q<roodi>, [">= 2.1.0"])
   end
 end
 

data/lib/cacheable_flash.rb

@@ -1,44 +1,46 @@
-require 'json'
-
-module CacheableFlash
-  if defined?(Rails) && ::Rails::VERSION::MAJOR == 3
-    if ::Rails::VERSION::MINOR >= 1
-      require "cacheable_flash/engine"
-      require 'cacheable_flash/railtie'
-    elsif ::Rails::VERSION::MINOR == 0
-      require 'cacheable_flash/railtie'
-    end
-  else
-    # For older rails use generator
-  end
-
-  def self.included(base)
-    #base must define around_filter, as in Rails
-    base.around_filter :write_flash_to_cookie
-  end
-
-  def write_flash_to_cookie
-    yield if block_given?
-    cookie_flash = if cookies['flash']
-      begin
-        JSON(cookies['flash'])
-      rescue
-        {}
-      end
-    else
-      {}
-    end
-
-    flash.each do |key, value|
-      if cookie_flash[key.to_s].blank?
-        cookie_flash[key.to_s] = value.kind_of?(Numeric) ? value.to_s : value
-      else
-        cookie_flash[key.to_s] << "<br/>#{value}"
-      end
-    end
-    # Base must define cookies, as in Rails
-    cookies['flash'] = cookie_flash.to_json.gsub("+", "%2B")
-    # Base must define flash, as in Rails
-    flash.clear
-  end
-end
+require 'json'
+
+module CacheableFlash
+  if defined?(Rails) && ::Rails::VERSION::MAJOR == 3
+    if ::Rails::VERSION::MINOR >= 1
+      require "cacheable_flash/engine"
+      require 'cacheable_flash/railtie'
+    elsif ::Rails::VERSION::MINOR == 0
+      require 'cacheable_flash/railtie'
+    end
+  else
+    # For older rails use generator
+  end
+
+  def self.included(base)
+    #base must define around_filter, as in Rails
+    base.around_filter :write_flash_to_cookie
+  end
+
+  def write_flash_to_cookie
+    yield if block_given?
+    cookie_flash = if cookies['flash']
+      begin
+        JSON(cookies['flash'])
+      rescue
+        {}
+      end
+    else
+      {}
+    end
+
+    flash.each do |key, value|
+      if cookie_flash[key.to_s].blank?
+        cookie_flash[key.to_s] = value.kind_of?(Numeric) ? value.to_s : value
+      else
+        cookie_flash[key.to_s] << "<br/>#{value}"
+      end
+    end
+    # Base must define cookies, as in Rails
+    cookies['flash'] = cookie_flash.to_json.gsub("+", "%2B")
+    # Base must define flash, as in Rails
+    # TODO: Does not support flash.now feature of the FlashHash in Rails, 
+    #       because flashes are only removed from cookies when they are used.
+    flash.clear
+  end
+end

data/lib/cacheable_flash/version.rb

@@ -1,3 +1,3 @@
 module CacheableFlash
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cacheable_flash
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70298566592720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298566592720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70298566592220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *70298566592220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70298566591720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,76 +54,111 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298566591720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70298566591220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70298566591220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70298566590720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70298566590720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70298566590200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *70298566590200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.21
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70298566589580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70298566589580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &70298566588940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *70298566588940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: roodi
-  requirement: &70298566588320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70298566588320
-description: ! 'This plugin enables greater levels of page caching by rendering flash
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+description: ! 'Allows caching of pages with flash messages by rendering flash
 
-  messages from a cookie using JavaScript, instead of in your Rails
+  messages from a cookie using JavaScript, instead of statically in your Rails
 
   view template.  Flash contents are converted to JSON and placed in
 
@@ -137,9 +182,9 @@ files:
 - app/assets/images/cacheable_flash/.gitkeep
 - app/assets/javascripts/cacheable_flash/application.js
 - app/assets/stylesheets/cacheable_flash/application.css
-- app/controllers/cacheable-flash/application_controller.rb
+- app/controllers/cacheable_flash/application_controller.rb
 - app/helpers/cacheable_flash/application_helper.rb
-- app/views/layouts/cacheable-flash/application.html.erb
+- app/views/layouts/cacheable_flash/application.html.erb
 - cacheable_flash.gemspec
 - config/routes.rb
 - init.rb
@@ -211,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4480446580812013099
+      hash: -2422206270089663668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Render flash messages from a cookie using JavaScript, instead of in your