cacheable_flash 0.2.9 → 0.2.10

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head

data/CHANGELOG

@@ -1,66 +1,75 @@
-0.2.9 - AUG.08.2012
-- More rearranging
-- Improved integration test of CacheableFlash & CacheableFlash::TestHelpers
-- Updated to latest jquery.cookie
-
-0.2.8 - AUG.07.2012
-- switch from jeweler to gem-release for bumping and tagging
-- bundler update (1.0.24)
-- Escape HTML in flash values unless they're html_safe
-- Add CacheableFlash rack middleware
-
-0.2.7 - JUN.21.2012
-- Note: Does not support flash.now feature of the FlashHash in Rails
-- Corrected directory names for controllers/layouts
-
-0.2.6 - unreleased
-- all specs pass with rspec 2.10
-
-0.2.5 - MAR.01.2012
-- Real integration test!
-
-0.2.4 - FEB.27.2012
-- Dependency diet!  No longer requires all of rails - only railties.
-
-0.2.3 - JAN.13.2012
-- Fixed problems loading assets: Sprockets::FileNotFound - thanks jlxw
-- reflect move back to pivotal's repo in README.
-- Updated specs, to running and passing condition!
-- Made rails > 3.0 a dependency, since it is (uses ::Rails::Engine and :Rails::Railtie)
-
-0.2.2 - SEP.10.2011
-- Improved deprecation warnings about using the generator (not needed with asset pipeline)
-- Improved README setup instructions
-
-0.2.1 - SEP.10.2011
-- Fixed bug in generator for those not using asset pipeline, or pre Rails 3.1
-
-0.2.0 - SEP.10.2011 [Peter Boling begins gemification process]
-- Converted to a gem
-- Updated to improved, patched jquery.cookie from https://github.com/pboling/jquery-cookie
-- Merged a few other forks of cacheable-flash
-- Added Engine to hook into Rails 3.1 asset pipeline
-- Added Railtie to improve usability with Rails 3.0
-- Added Generator to improve usability with Rails < 3
-
-Unreleased
-- Implicitly adding js files to Rails include defaults (Patch from Michael Erb)
-
-0.1.5
-- Requiring version >= 1.1.2 of the json gem
-- Converted tests into specs
-
-0.1.4
-- Added TestHelpers
-- Added flash_cookie method for tests
-
-0.1.3
-- Require json in init.rb
-
-0.1.2
-- 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
+0.2.10 - AUG.13.2012
+- Split test_helpers from rspec_matchers (test_helpers may be useful in TestUnit
+- When using Middleware: Flash Cookies now stay in the cookie until cleared out by the javascript: closer to guaranteed delivery.
+- Improved spec suite
+- Added CacheableFlash::Config class
+  - Configuration of :append_as now possible
+- Added facets runtime dependency
+- corrected namespace of CacheableFlash::CookieFlash
+
+0.2.9 - AUG.08.2012
+- More rearranging
+- Improved integration test of CacheableFlash & CacheableFlash::TestHelpers
+- Updated to latest jquery.cookie
+
+0.2.8 - AUG.07.2012
+- switch from jeweler to gem-release for bumping and tagging
+- bundler update (1.0.24)
+- Escape HTML in flash values unless they're html_safe
+- Add CacheableFlash rack middleware
+
+0.2.7 - JUN.21.2012
+- Note: Does not support flash.now feature of the FlashHash in Rails
+- Corrected directory names for controllers/layouts
+
+0.2.6 - unreleased
+- all specs pass with rspec 2.10
+
+0.2.5 - MAR.01.2012
+- Real integration test!
+
+0.2.4 - FEB.27.2012
+- Dependency diet!  No longer requires all of rails - only railties.
+
+0.2.3 - JAN.13.2012
+- Fixed problems loading assets: Sprockets::FileNotFound - thanks jlxw
+- reflect move back to pivotal's repo in README.
+- Updated specs, to running and passing condition!
+- Made rails > 3.0 a dependency, since it is (uses ::Rails::Engine and :Rails::Railtie)
+
+0.2.2 - SEP.10.2011
+- Improved deprecation warnings about using the generator (not needed with asset pipeline)
+- Improved README setup instructions
+
+0.2.1 - SEP.10.2011
+- Fixed bug in generator for those not using asset pipeline, or pre Rails 3.1
+
+0.2.0 - SEP.10.2011 [Peter Boling begins gemification process]
+- Converted to a gem
+- Updated to improved, patched jquery.cookie from https://github.com/pboling/jquery-cookie
+- Merged a few other forks of cacheable-flash
+- Added Engine to hook into Rails 3.1 asset pipeline
+- Added Railtie to improve usability with Rails 3.0
+- Added Generator to improve usability with Rails < 3
+
+Unreleased
+- Implicitly adding js files to Rails include defaults (Patch from Michael Erb)
+
+0.1.5
+- Requiring version >= 1.1.2 of the json gem
+- Converted tests into specs
+
+0.1.4
+- Added TestHelpers
+- Added flash_cookie method for tests
+
+0.1.3
+- Require json in init.rb
+
+0.1.2
+- 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

data/Gemfile

@@ -1,22 +1,3 @@
-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
-  gem "jquery-rails"
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-  gem "rspec-rails", ">= 2.8.0"
-  gem "rdoc", ">= 3.12"
-  gem "bundler", ">= 1.0.24"
-  gem "jeweler", ">= 1.6.4"
-  gem "reek", ">= 1.2.8"
-  gem "roodi", ">= 2.1.0"
-end
+source "http://rubygems.org"
+
+gemspec

data/README.rdoc

@@ -1,4 +1,4 @@
-= CacheableFlash {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/pivotal/cacheable-flash]
+= CacheableFlash {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/pivotal/cacheable-flash] {<img src="https://secure.travis-ci.org/pboling/cacheable-flash.png?branch=master" alt="Build Status" />}[http://travis-ci.org/pboling/cacheable-flash]
 
 == Description
 

data/Rakefile

@@ -1,46 +1,46 @@
-# encoding: utf-8
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require 'rake'
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-require 'reek/rake/task'
-Reek::Rake::Task.new do |t|
-  t.fail_on_error = true
-  t.verbose = false
-  t.source_files = 'lib/**/*.rb'
-end
-
-require 'roodi'
-require 'roodi_task'
-RoodiTask.new do |t|
-  t.verbose = false
-end
-
-task :default => :spec
-
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = "CacheableFlash #{version}"
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-
-Bundler::GemHelper.install_tasks
+# encoding: utf-8
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rake'
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+require 'reek/rake/task'
+Reek::Rake::Task.new do |t|
+  t.fail_on_error = true
+  t.verbose = false
+  t.source_files = 'lib/**/*.rb'
+end
+
+require 'roodi'
+require 'roodi_task'
+RoodiTask.new do |t|
+  t.verbose = false
+end
+
+task :default => :spec
+
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = "CacheableFlash #{version}"
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+
+Bundler::GemHelper.install_tasks

data/cacheable_flash.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
 
   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-08-07"
+  s.date = "2012-08-13"
   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 (default) or a Rack Middleware (option)."
   s.email = "peter.boling@gmail.com"
   s.extra_rdoc_files = [
@@ -23,40 +23,15 @@ Gem::Specification.new do |s|
   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
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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.24"])
-      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.24"])
-      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.24"])
-    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
+  s.add_runtime_dependency(%q<facets>, [">= 0"])
+  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.24"])
+  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"])
 end
 

data/lib/cacheable_flash.rb

@@ -9,8 +9,9 @@ module CacheableFlash
     # For older rails use generator
   end
 
+  require 'cacheable_flash/config'
   require 'cacheable_flash/cookie_flash'
-  include CookieFlash
+  include CacheableFlash::CookieFlash
 
   def self.included(base)
     #base must define around_filter, as in Rails

data/lib/cacheable_flash/config.rb

@@ -0,0 +1,29 @@
+require 'facets/module/mattr' # gives cattr
+
+module CacheableFlash
+  class Config
+
+    DEFAULTS = {
+      # Specify how multiple flashes at the same key (e.g. :notice, :errors) should be handled
+      :append_as => :br, # or :array
+    }
+
+    cattr_reader :config
+    cattr_writer :config
+
+    self.config ||= DEFAULTS
+    def self.configure &block
+      yield @@config
+    end
+
+    def self.[](key)
+      return nil unless key.respond_to?(:to_sym)
+      CacheableFlash::Config.config[key.to_sym]
+    end
+
+    def self.method_missing(name, *args)
+      CacheableFlash[name]
+    end
+
+  end
+end

data/lib/cacheable_flash/cookie_flash.rb

@@ -1,15 +1,32 @@
-module CookieFlash
-  def cookie_flash(flash, cookies)
-    cookie_flash = (JSON(cookies['flash']) if cookies['flash']) || {} rescue {}
+module CacheableFlash
+  module CookieFlash
+    def cookie_flash(flash, cookies)
+      cookie_flash = (JSON(cookies['flash']) if cookies['flash']) || {} rescue {}
 
-    flash.each do |key, value|
-      value = ERB::Util.html_escape(value) unless value.is_a?(Hash) || value.html_safe?
-      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}"
+      flash.each do |key, value|
+        value = ERB::Util.html_escape(value) unless value.is_a?(Hash) || value.html_safe?
+        if cookie_flash[key.to_s].blank?
+          value_as_string = value.kind_of?(Numeric) ? value.to_s : value
+          case CacheableFlash::Config[:append_as]
+            when :br then
+              cookie_flash[key.to_s] = value_as_string
+            when :array then
+              cookie_flash[key.to_s] = Array(value_as_string)
+            else
+              raise "CacheableFlash: #{CacheableFlash::Config.config[:append_as]} is not a valid value for CacheableFlash::Config.config[:append_as]"
+          end
+        else
+          case CacheableFlash::Config[:append_as]
+            when :br then
+              cookie_flash[key.to_s] << "<br/>#{value}"
+            when :array then
+              cookie_flash[key.to_s] << "#{value}"
+            else
+              raise "CacheableFlash: #{CacheableFlash::Config.config[:append_as]} is not a valid value for CacheableFlash::Config.config[:append_as]"
+          end
+        end
       end
+      cookie_flash.to_json.gsub("+", "%2B")
     end
-    cookie_flash.to_json.gsub("+", "%2B")
   end
 end

data/lib/cacheable_flash/middleware.rb

@@ -1,26 +1,38 @@
 module CacheableFlash
   class Middleware
     require 'cacheable_flash/cookie_flash'
-    include CookieFlash
+    include CacheableFlash::CookieFlash
     FLASH_HASH_KEY = "action_dispatch.request.flash_hash".freeze
 
     def initialize(app)
       @app = app
     end
 
+    # Cookies stick in the flash until rendered (cleared out of the cookie by javascript),
+    #   to ensure they are seen and not lost, so we grab them from the rails flash hash, or the request cookies
     def call(env)
       status, headers, body = @app.call(env)
       flash = env[FLASH_HASH_KEY]
 
       if flash
         response = Rack::Response.new(body, status, headers)
-
         cookies = env["rack.cookies"] || {}
         response.set_cookie("flash", { :value => cookie_flash(flash, cookies), :path => "/" })
         response.finish
       else
-        [status, headers, body]
+        request = ActionDispatch::Request.new(env)
+        cookie_flash = request.respond_to?(:cookie_jar) ?
+          request.cookie_jar['flash'] :
+          nil
+        if cookie_flash
+          response = Rack::Response.new(body, status, headers)
+          response.set_cookie("flash", { :value => cookie_flash, :path => "/" })
+          response.finish
+        else
+          [status, headers, body]
+        end
       end
     end
+
   end
 end

data/lib/cacheable_flash/rspec_matchers.rb

@@ -0,0 +1,22 @@
+require 'cacheable_flash/test_helpers'
+
+module CacheableFlash
+  module RspecMatchers
+    include CacheableFlash::TestHelpers
+    RSpec::Matchers.define :have_flash_cookie do |flash_status, regex|
+      define_method :has_flash_cookie? do |response|
+        regex = /#{Regexp.escape(regex)}/ if regex.is_a?(String)
+
+        cook = begin
+          response.cookies['flash'] ?
+            JSON(response.cookies['flash']) :
+            {}
+        rescue JSON::ParserError
+          {}
+        end
+        cook[flash_status] =~ regex
+      end
+      match{|response| has_flash_cookie?(response)}
+    end
+  end
+end

data/lib/cacheable_flash/test_helpers.rb

@@ -1,12 +1,14 @@
-require 'json'
-
-module CacheableFlash
-  module TestHelpers
-    def flash_cookie
-      return {} unless response.cookies['flash']
-      JSON(response.cookies['flash'])
-    rescue JSON::ParserError
-      {}
-    end
-  end
-end
+require 'json'
+
+module CacheableFlash
+  module TestHelpers
+
+    def flash_cookie
+      return {} unless response.cookies['flash']
+      JSON(response.cookies['flash'])
+    rescue JSON::ParserError
+      {}
+    end
+
+  end
+end

data/lib/cacheable_flash/version.rb

@@ -1,3 +1,3 @@
 module CacheableFlash
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/controllers/dummy_controller_spec.rb

@@ -1,26 +1,23 @@
-require 'spec_helper'
-
-describe DummyController do
-
-  include CacheableFlash::TestHelpers
-
-  render_views
-
-  before(:each) do
-    @expected_flash = {
-      'errors' => "This is an Error",
-      'notice' => "This is a Notice"
-    }
-    get :index
-  end
-
-  describe "TestHelpers" do
-    it "should assign flashes to cookie" do
-      flash_cookie['errors'].should == @expected_flash['errors']
-      flash_cookie['notice'].should == @expected_flash['notice']
-      flash_cookie.should == @expected_flash
-    end
-  end
-
-end
-
+require 'spec_helper'
+
+describe DummyController do
+
+  render_views
+
+  before(:each) do
+    @expected_flash = {
+      'errors' => "This is an Error",
+      'notice' => "This is a Notice"
+    }
+    get :index
+  end
+
+  describe "TestHelpers" do
+    it "should assign flashes to cookie" do
+      response.should have_flash_cookie('errors', @expected_flash['errors'])
+      response.should have_flash_cookie('notice', @expected_flash['notice'])
+    end
+  end
+
+end
+

data/spec/dummy/app/controllers/dummy_controller.rb

@@ -1,11 +1,22 @@
-class DummyController < ApplicationController
-  include CacheableFlash
-  def index
-    expected_flash = {
-    'errors' => "This is an Error",
-    'notice' => "This is a Notice"
-    }
-    flash[:errors] = expected_flash['errors']
-    flash[:notice] = expected_flash['notice']
-  end
-end
+class DummyController < ApplicationController
+  include CacheableFlash
+  def index
+    expected_flash = {
+    'errors' => "This is an Error",
+    'notice' => "This is a Notice"
+    }
+    flash[:errors] = expected_flash['errors']
+    flash[:notice] = expected_flash['notice']
+  end
+
+  def error
+    expected_flash = {
+    'errors' => "This is a real Error",
+    }
+    flash[:errors] = expected_flash['errors']
+  end
+
+  def no_flash
+    # Does not set any flash
+  end
+end

data/spec/dummy/app/views/dummy/error.html.erb

@@ -0,0 +1,3 @@
+<p>
+  Here I am!  Error Action
+</p>

data/spec/dummy/app/views/dummy/index.html.erb

@@ -1,3 +1,3 @@
-<p>
-  Here I am!
-</p>
+<p>
+  Here I am!  Index Action!
+</p>

data/spec/dummy/app/views/dummy/no_flash.html.erb

@@ -0,0 +1,3 @@
+<p>
+  Here I am!  No Flash Action!
+</p>

data/spec/dummy/config/routes.rb

@@ -1,4 +1,6 @@
-Rails.application.routes.draw do
-  root :controller => 'dummy', :action => 'index' 
-  mount CacheableFlash::Engine => "/cacheable_flash"
-end
+Rails.application.routes.draw do
+  root :controller => 'dummy', :action => 'index'
+
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  match ':controller(/:action(/:id(.:format)))'
+end

data/spec/requests/cacheable_flash_sticky_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+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")
+
+      get "/dummy/no_flash"
+      response.should have_flash_cookie('errors', "This is an Error")
+      response.should have_flash_cookie('notice', "This is a Notice")
+
+    end
+  end
+
+  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")
+
+      get "/dummy/error"
+      response.should have_flash_cookie('errors', "This is an Error")
+      response.should have_flash_cookie('errors', "This is a real Error")
+
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,27 +1,27 @@
-# Configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
-require File.expand_path("../dummy/config/environment",  __FILE__)
-
-require 'rspec/rails'
-require "json"
-
-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 }
-
-require 'cacheable_flash'
-# Instead of loading the installed gem, we load the source code directly, would this work?
-#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-#$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'cacheable_flash/test_helpers'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.include CacheableFlash::TestHelpers, :type => :controller
-end
+# Configure Rails Envinronment
+ENV["RAILS_ENV"] = "test"
+require File.expand_path("../dummy/config/environment",  __FILE__)
+
+require 'rspec/rails'
+require "json"
+
+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 }
+
+require 'cacheable_flash'
+# Instead of loading the installed gem, we load the source code directly, would this work?
+#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+#$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'cacheable_flash/rspec_matchers'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  config.include CacheableFlash::RspecMatchers
+end

data/vendor/assets/javascripts/flash.js

@@ -1,21 +1,25 @@
-// refactoring from https://github.com/leonid-shevtsov/cacheable-flash-jquery
-var Flash = new Object();
-
-Flash.data = {};
-
-Flash.transferFromCookies = function() {
-  var data = JSON.parse(unescape($.cookie("flash")));
-  if(!data) data = {};
-  Flash.data = data;
-  $.cookie('flash',null, {path: '/'});
-};
-
-Flash.writeDataTo = function(name, element) {
-  element = $(element);
-  var content = "";
-  if (Flash.data[name]) {
-    message = Flash.data[name].toString().replace(/\+/g, ' ');
-    element.html(message);
-    element.show();
-  }
-};
+// refactoring from https://github.com/leonid-shevtsov/cacheable-flash-jquery
+var Flash = new Object();
+
+Flash.data = {};
+
+Flash.transferFromCookies = function() {
+  var data = JSON.parse(unescape($.cookie("flash")));
+  if(!data) data = {};
+  Flash.data = data;
+  $.cookie('flash',null, {path: '/'});
+};
+
+Flash.writeDataTo = function(name, element, callback) {
+  element = $(element);
+  var content = "";
+  if (Flash.data[name]) {
+    message = Flash.data[name].toString().replace(/\+/g, ' ');
+    element.html(message);
+    if (callback && typeof(callback) === 'function') {
+      callback(element);
+    } else {
+      element.show();
+    }
+  }
+};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cacheable_flash
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -172,25 +188,26 @@ extra_rdoc_files:
 files:
 - .document
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - cacheable_flash.gemspec
-- config/routes.rb
 - init.rb
 - install.rb
 - lib/cacheable_flash.rb
+- lib/cacheable_flash/config.rb
 - lib/cacheable_flash/cookie_flash.rb
 - lib/cacheable_flash/engine.rb
 - lib/cacheable_flash/middleware.rb
 - lib/cacheable_flash/railtie.rb
+- lib/cacheable_flash/rspec_matchers.rb
 - lib/cacheable_flash/test_helpers.rb
 - lib/cacheable_flash/version.rb
 - lib/generators/cacheable_flash/install/install_generator.rb
 - lib/tasks/cacheable-flash_tasks.rake
-- script/rails
 - spec/cacheable_flash/cacheable_flash_spec.rb
 - spec/cacheable_flash/install_spec.rb
 - spec/cacheable_flash/test_helpers_spec.rb
@@ -204,7 +221,9 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
+- spec/dummy/app/views/dummy/error.html.erb
 - spec/dummy/app/views/dummy/index.html.erb
+- spec/dummy/app/views/dummy/no_flash.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -231,6 +250,7 @@ files:
 - spec/dummy/script/rails
 - spec/js_unit/cookie_test.html
 - spec/js_unit/flash_test.html
+- spec/requests/cacheable_flash_sticky_spec.rb
 - spec/spec_helper.rb
 - tasks/cacheable_flash_tasks.rake
 - vendor/assets/javascripts/flash.js
@@ -275,7 +295,9 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
+- spec/dummy/app/views/dummy/error.html.erb
 - spec/dummy/app/views/dummy/index.html.erb
+- spec/dummy/app/views/dummy/no_flash.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -302,4 +324,5 @@ test_files:
 - spec/dummy/script/rails
 - spec/js_unit/cookie_test.html
 - spec/js_unit/flash_test.html
+- spec/requests/cacheable_flash_sticky_spec.rb
 - spec/spec_helper.rb

data/config/routes.rb

@@ -1,2 +0,0 @@
-CacheableFlash::Engine.routes.draw do
-end

data/script/rails

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/cacheable_flash/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'