sinatra_warden 0.1.1 → 0.1.2

data/Rakefile

@@ -15,10 +15,11 @@ begin
 
     manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
     manifest.dependencies.each do |d|
-      next if d.only && d.only.include?('testing')
+      next if d.only && d.only.include?(:testing)
       gem.add_dependency(d.name, d.version)
     end
-
+    
+    gem.executables = nil
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/sinatra_warden/sinatra.rb

@@ -62,7 +62,7 @@ module Sinatra
 
       app.get '/logout/?' do
         authorize!
-        env['warden'].logout
+        env['warden'].logout(:default)
         flash[:success] = options.auth_success_message if defined?(Rack::Flash)
         redirect options.auth_success_path
       end

data/sinatra_warden.gemspec

@@ -5,14 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_warden}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad", "Daniel Neighman"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-04}
   s.description = %q{basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash}
   s.email = %q{justin.smestad@gmail.com}
-  s.executables = ["autospec", "css2sass", "edit_json.rb", "haml", "html2haml", "jeweler", "prettify_json.rb", "rackup", "rake", "rcov", "rubyforge", "sass", "spec", "yard-graph", "yardoc", "yri"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -56,13 +55,49 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<warden>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<bundler>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_runtime_dependency(%q<yard>, [">= 0"])
+      s.add_runtime_dependency(%q<rack-test>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<do_sqlite3>, ["~> 0.10.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.1"])
+      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_dependency(%q<warden>, ["~> 0.5.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rack-test>, ["~> 0.5.0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<do_sqlite3>, ["~> 0.10.0"])
+      s.add_dependency(%q<dm-core>, ["~> 0.10.1"])
+      s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<rack-flash>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     s.add_dependency(%q<warden>, ["~> 0.5.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rack-test>, ["~> 0.5.0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<do_sqlite3>, ["~> 0.10.0"])
+    s.add_dependency(%q<dm-core>, ["~> 0.10.1"])
+    s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<rack-flash>, [">= 0"])
   end
 end
 

data/spec/fixtures/testing_login.rb

@@ -11,8 +11,19 @@ class TestingLogin < Sinatra::Base
     "My Dashboard"
   end
 
+  get '/account' do
+    authorize!
+    "#{user.email}'s account page"
+  end
+
+  post '/login_as/?' do
+    authorize!
+    user = User.authenticate(params['email'], params['password'])
+  end
+
   get '/admin' do
     authorize!
+    "Welcome #{current_user.email}"
   end
 
 end

data/spec/sinatra_warden_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "SinatraWarden" do
+describe "Sinatra::Warden" do
   before(:each) do
     @user = User.create(:email => 'justin.smestad@gmail.com', :password => 'thedude')
   end
@@ -15,7 +15,6 @@ describe "SinatraWarden" do
   end
 
   context "the authentication system" do
-
     it "should allow us to login as that user" do
       post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
       last_request.env['warden'].authenticated?.should == true
@@ -24,15 +23,14 @@ describe "SinatraWarden" do
     it "should allow us to logout after logging in" do
       post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
       last_request.env['warden'].authenticated?.should == true
-      pending
+      get '/logout'
+      last_request.env['warden'].authenticated?.should == false
     end
-
   end
 
   context "the helpers" do
 
     context "the authorize! helper" do
-
       it "should redirect to root (default) if not logged in" do
         get '/admin'
         follow_redirect!
@@ -51,16 +49,30 @@ describe "SinatraWarden" do
         get '/dashboard'
         last_response.body.should == "My Dashboard"
       end
-
     end
 
     context "the user helper" do
+      before(:each) do
+        post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
+        last_request.env['warden'].authenticated?.should == true
+      end
 
-      it "should be aliased to current_user"
+      it "should be aliased to current_user" do
+        get '/admin'
+        last_response.body.should == "Welcome #{@user.email}"
+      end
 
-      it "should allow assignment of the user (user=)"
+      it "should allow assignment of the user (user=)" do
+        john = User.create(:email => 'john.doe@hotmail.com', :password => 'secret')
+        last_request.env['warden'].user.should == @user
+        post '/login_as', 'email' => 'john.doe@hotmail.com', 'password' => 'secret'
+        last_request.env['warden'].user.should == john
+      end
 
-      it "should return the current logged in user"
+      it "should return the current logged in user" do
+        get '/account'
+        last_response.body.should == "#{@user.email}'s account page"
+      end
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_warden
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Justin Smestad
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -07:00
+date: 2009-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,25 +33,130 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.10.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-flash
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash
 email: justin.smestad@gmail.com
-executables: 
-- autospec
-- css2sass
-- edit_json.rb
-- haml
-- html2haml
-- jeweler
-- prettify_json.rb
-- rackup
-- rake
-- rcov
-- rubyforge
-- sass
-- spec
-- yard-graph
-- yardoc
-- yri
+executables: []
+
 extensions: []
 
 extra_rdoc_files: