@@ -44,9 +44,6 @@ use Chowder with all Rack based apps) to make life that lil' bit easier: require 'chowder' require 'my_app' - # Not optimal, but until fixed in Sinatra (see Lighthouse ticket #161) - # Rack::Session::Cookie has to be explicitly included. - use Rack::Session::Cookie use Chowder::Basic do |login, password| user = User.first(:login => login , :password => password) && user.id end README.md @@ -2,15 +2,17 @@ Gem::Specification.new do |s| s.name = %q{chowder} - s.version = "0.1" + s.version = "0.1.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Harry Vangberg"] - s.date = %q{2009-02-26} + s.date = %q{2009-02-28} s.email = %q{harry@vangberg.name} s.files = ["lib/chowder.rb", "lib/chowder/helpers/sinatra.rb"] s.homepage = %q{http://github.com/ichverstehe/chowder} s.require_paths = ["lib"] s.rubygems_version = %q{1.3.1} s.summary = %q{rack middleware providing session based authentication} + s.add_dependency 'sinatra', '>= 0.9.1' + s.add_dependency 'ruby-openid' end chowder.gemspec @@ -3,7 +3,6 @@ $:.unshift(File.dirname(File.expand_path(__FILE__))) require 'chowder' require 'app' -use Rack::Session::Cookie use Chowder::Basic do |login, password| login == "harry" && password == "clamchowder" end example/config.ru @@ -5,6 +5,8 @@ require 'openid/store/filesystem' module Chowder class Base < Sinatra::Base + enable :sessions + LOGIN_VIEW = <<-HTML <form action="/login" method="POST"> Login: <input type="text" name="login" /><br /> lib/chowder.rb @@ -11,3 +11,6 @@ class Test::Unit::TestCase include Sinatra::Test end +class Sinatra::Base + include Test::Unit::Assertions +end test/helpers.rb @@ -1,6 +1,7 @@ require File.join(File.dirname(__FILE__), 'helpers') class MyApp < Sinatra::Base + set :sessions, false get '/' do redirect '/login' unless session[:current_user] "protected area" @@ -9,6 +10,8 @@ end class TestBasic < Test::Unit::TestCase before do + Chowder::Basic.set :environment, :test + @app = Rack::Builder.new { use Chowder::Basic do |login, password| login == "harry" && password == "clam" @@ -41,6 +44,11 @@ class TestBasic < Test::Unit::TestCase assert_equal '/awesome_place', response.headers['Location'] end + test "allows authenticated users" do + get '/', {}, :session => {:current_user => "harry"} + assert_equal "protected area", body + end + #test "shows custom login template" do #get '/login' #assert_match /Custom login/, body test/test_basic.rb 7f80cad66a1b0e714b6ffbb2a592080c64aab1f2 Harry Vangberg harry@vangberg.name http://github.com/ichverstehe/chowder/commit/c8e3346ccf4d0d5d653785260130434fd552d790 c8e3346ccf4d0d5d653785260130434fd552d790 2009-02-28T09:44:14-08:00 2009-02-28T09:44:14-08:00 use Rack::Session::Cookie implicit, add tests, update gemspec ee4d1306f3b8170dc4b096de9650db8b9b24e7a9 Harry Vangberg harry@vangberg.name