sinatra-redirect-with-flash 0.1.2 → 0.2.0

data/README.md

@@ -1,38 +1,56 @@
 #Sinatra Extension: redirect with flash
 
-Shortly: sinatra-redirect-with-flash provides `redirect` helper that can set proper flash (rack-flash) before the
-  redirection
+Shortly: sinatra-redirect-with-flash provides `redirect` helper that can
+set proper flash (rack-flash or sinatra-flash) before the redirection.
 
-In fact, every time you set a flash parameter the very next step is often to perform your redirect:
+In fact, every time you set a flash parameter the very next step is often to
+perform your redirect:
 
     post '/posts/?' do
-      @post = Post.new(params)
+      @post = Post.create(params)
       flash[:notice] = 'The post was successfully created'
       redirect "/posts/#{@post.id}"
     end
 
-With sinatra-redirect-with-flash you can do one-line redirects. For instance, to rewrite the above example:
+With sinatra-redirect-with-flash you can do one-line redirects. For instance,
+to rewrite the above example:
 
     post '/posts/?' do
-      @post = Post.new(params)
+      @post = Post.create(params)
       redirect "/posts/#{@post.id}", :notice => 'The post was successfully created'
     end
 
+
 ##Installation
 
-    sudo gem install sinatra-redirect-with-flash -s http://gemcutter.org/
+If you use [bundler](http://gembundler.com/), simply specify
+`sinatra-redirect-with-flash` as a dependency in a Gemfile
+in your project's root:
+
+    gem 'sinatra-flash' # or `gem 'rack-flash'`
+    gem 'sinatra-redirect-with-flash'
+
+and run `bundle install`.
+
+
+Otherwise install the gem as usual:
+
+    [sudo] gem install sinatra-redirect-with-flash
+
+
 
 ##Example
+
     require 'rubygems'
     require 'sinatra'
-    require 'rack-flash'
+    require 'sinatra/flash' # or `require 'rack-flash'`
     require 'sinatra/redirect_with_flash'
 
-    use Rack::Flash
     enable :sessions
 
     post '/sessions/new' do
-      redirect '/secret', :notice => 'Logged in' #predefined keys are: :notice, :error, :warning, :alert, :info      
+      redirect '/secret', :notice => 'Logged in'
+      # predefined keys are: :notice, :error, :warning, :alert, :info, :success
     end
 
     get '/foo' do
@@ -43,5 +61,13 @@ With sinatra-redirect-with-flash you can do one-line redirects. For instance, to
       redirect '/posts/', :flash => {:my_msg => 'Moving on!'}      
     end
 
+*Note* that if your application subclasses `Sinatra::Base` (modular app),
+you have to register the extension in your subclass:
+
+    helpers Sinatra::RedirectWithFlash
+
+
 ##Requirements
-  * [rack-flash](http://nakajima.github.com/rack-flash/)
+
+Either [rack-flash](http://nakajima.github.com/rack-flash/) or
+[sinatra-flash](https://github.com/SFEley/sinatra-flash).

data/Rakefile

@@ -8,16 +8,16 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "sinatra-redirect-with-flash"
-    gemspec.version = "0.1.2"
+    gemspec.version = "0.2.0"
     gemspec.summary = gemspec.description = "redirect with flash helper for Sinatra"
     gemspec.email = "vasily@polovnyov.ru"
     gemspec.homepage = "http://github.com/vast/sinatra-redirect-with-flash"
     gemspec.authors = ["Vasily Polovnyov"]
 
-    gemspec.add_dependency 'sinatra', '>=0.9.1'
-    gemspec.add_dependency 'rack-flash', '>=0.1.1'
+    gemspec.add_dependency 'sinatra', '>=1.0.0'
 
     gemspec.add_development_dependency 'rack-test', '>=0.3.0'
+    gemspec.add_development_dependency 'sinatra-flash', '>=0.3.0'
 
     gemspec.test_files = Dir.glob('test/*')
     gemspec.files = ["LICENSE", "README.md", "Rakefile"] + Dir.glob('lib/**/*') + gemspec.test_files

data/lib/sinatra/redirect_with_flash.rb

@@ -2,7 +2,7 @@ require 'sinatra/base'
 
 module Sinatra
   module RedirectWithFlash
-    COMMON_FLASH_NAMES = [:notice, :alert, :warning, :error, :info]
+    COMMON_FLASH_NAMES = [:notice, :alert, :warning, :error, :info, :success]
     
     def redirect(uri, *args)
       flash_opts = args.last

data/test/sinatra_app.rb

@@ -1,15 +1,15 @@
 require 'rubygems'
 require 'sinatra'
-require 'rack-flash'
+require 'sinatra/flash'
 require 'lib/sinatra/redirect_with_flash'
 
-use Rack::Flash
+enable :sessions
 
 get '/' do
   redirect '/fff', :flash => {:info => 'sample info'}
 end
 
-[:notice, :error, :warning, :alert].each do |k|
+Sinatra::RedirectWithFlash::COMMON_FLASH_NAMES.each do |k|
   get "/#{k.to_s}" do
     redirect '/fff', k => "sample #{k.to_s}"
   end

data/test/sinatra_redirect_with_flash_test.rb

@@ -1,7 +1,7 @@
+require 'rubygems'
+require 'rack/test'
 require 'sinatra_app'
 require 'test/unit'
-require 'rack/test'
-require 'rack/flash/test'
 
 set :environment, :test
 
@@ -13,7 +13,7 @@ class SinatraRedirectWithFlashTest < Test::Unit::TestCase
   end
 
   def flash
-    last_request.env['x-rack.flash']
+    last_request.env['x-rack.flash'] || last_request.env['rack.session']['flash']
   end
 
   def test_redirect_with_custom_flash_opts
@@ -23,7 +23,7 @@ class SinatraRedirectWithFlashTest < Test::Unit::TestCase
   end
 
   def test_common_flash_names
-    [:notice, :error, :warning, :alert].each do |k|
+    Sinatra::RedirectWithFlash::COMMON_FLASH_NAMES.each do |k|
       get "/#{k.to_s}"
       assert_not_nil flash
       assert_equal "sample #{k.to_s}", flash[k]
@@ -37,21 +37,21 @@ class SinatraRedirectWithFlashTest < Test::Unit::TestCase
 
     assert_equal last_response.status, 301
     assert_equal last_response.body, ''
-    assert_equal last_response.headers['Location'], '/fff'
+    assert last_response.headers['Location'] =~ /\/fff$/
   end
 
   def test_old_school_redirect
     get '/old-school-redirect'
     assert_equal last_response.status, 302
     assert_equal last_response.body, ''
-    assert_equal last_response.headers['Location'], '/aaa'
+    assert last_response.headers['Location'] =~ /\/aaa$/
   end
 
   def test_old_school_redirect_with_code
     get '/old-school-redirect-with-code'
     assert_equal last_response.status, 301
     assert_equal last_response.body, ''
-    assert_equal last_response.headers['Location'], '/aaa'
+    assert last_response.headers['Location'] =~ /\/aaa$/
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Vasily Polovnyov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +03:00
+date: 2012-02-13 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,14 +25,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 9
         - 1
-        version: 0.9.1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rack-flash
+  name: rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 1
-        version: 0.1.1
-  type: :runtime
+        - 3
+        - 0
+        version: 0.3.0
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: sinatra-flash
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -80,8 +80,8 @@ homepage: http://github.com/vast/sinatra-redirect-with-flash
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement