sinatra_warden 0.2.0.2 → 0.3.0

data/Gemfile

@@ -1,8 +1,8 @@
-source :gemcutter
+source 'http://rubygems.org'
 
 group :runtime do
   gem 'sinatra',        '>= 0.9.4'
-  gem 'warden',         '>= 0.5.0'
+  gem 'warden',         '>= 0.10.3'
 end
 
 group :test do
@@ -10,7 +10,7 @@ group :test do
   gem 'jeweler',        '~> 1.3.0'
   gem 'bundler',        '~> 0.9.7'
   gem 'rspec',          '~> 1.2.9', :require => 'spec'
-  gem 'yard'
+  gem 'yard',           '>= 0.5.4'
   gem 'rack-test',      '~> 0.5.0', :require => 'rack/test'
   gem 'rcov'
 
@@ -18,5 +18,5 @@ group :test do
   gem 'dm-core',        '~> 0.10.1'
   gem 'bcrypt-ruby',                :require => 'bcrypt'
   gem 'haml'
-  gem 'rack-flash',                 :require => 'rack/flash'
+  gem 'rack-flash',                 :require => 'rack-flash'
 end

data/VERSION

@@ -1 +1 @@
-0.2.0.2
+0.3.0

data/lib/sinatra_warden/sinatra.rb

@@ -2,33 +2,58 @@ module Sinatra
   module Warden
     module Helpers
 
-      # The main accessor for the warden proxy instance
+      # The main accessor to the warden middleware
       def warden
         request.env['warden']
       end
 
-      # Proxy to the authenticated? method on warden
-      def authenticated?(*args)
-        warden.authenticated?(*args)
+      # Return session info
+      #
+      # @param [Symbol] the scope to retrieve session info for
+      def session_info(scope=nil)
+        scope ? warden.session(scope) : scope
+      end
+
+      # Check the current session is authenticated to a given scope
+      def authenticated?(scope=nil)
+        scope ? warden.authenticated?(scope) : warden.authenticated?
       end
       alias_method :logged_in?, :authenticated?
 
-      # Access the currently logged in user
-      def user(*args)
-        warden.user(*args)
+      # Authenticate a user against defined strategies
+      def authenticate(*args)
+        warden.authenticate!(*args)
+      end
+      alias_method :login, :authenticate
+
+      # Terminate the current session
+      #
+      # @param [Symbol] the session scope to terminate
+      def logout(scopes=nil)
+        scopes ? warden.logout(scopes) : warden.logout
+      end
+
+      # Access the user from the current session
+      #
+      # @param [Symbol] the scope for the logged in user
+      def user(scope=nil)
+        scope ? warden.user(scope) : warden.user
       end
       alias_method :current_user, :user
 
-      # Set the currently logged in user
-      #   Usage: self.user = @user
+      # Store the logged in user in the session
       #
-      # @param [User] the user you want to log in
-      def user=(new_user)
-        warden.set_user(new_user)
+      # @param [Object] the user you want to store in the session
+      # @option opts [Symbol] :scope The scope to assign the user
+      # @example Set John as the current user
+      #   user = User.find_by_name('John')
+      def user=(new_user, opts={})
+        warden.set_user(new_user, opts)
       end
       alias_method :current_user=, :user=
 
       # Require authorization for an action
+      #
       # @param [String] path to redirect to if user is unauthenticated
       def authorize!(failure_path=nil)
         redirect(failure_path ? failure_path : options.auth_failure_path) unless authenticated?
@@ -49,13 +74,13 @@ module Sinatra
       app.set :auth_success_message, "You have logged in successfully."
       app.set :auth_use_erb, false
       app.set :auth_login_template, :login
-      
+
       # OAuth Specific Settings
       app.set :auth_use_oauth, false
 
       app.post '/unauthenticated/?' do
         status 401
-        flash[:error] = (env['warden'].message || options.auth_error_message) if defined?(Rack::Flash)
+        env['x-rack.flash'][:error] = options.auth_error_message if defined?(Rack::Flash)
         options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
       end
 
@@ -64,15 +89,15 @@ module Sinatra
           session[:request_token] = @auth_oauth_request_token.token
           session[:request_token_secret] = @auth_oauth_request_token.secret
           redirect @auth_oauth_request_token.authorize_url
-        else          
+        else
           options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
         end
       end
 
       app.get '/oauth_callback/?' do
         if options.auth_use_oauth
-          env['warden'].authenticate!
-          flash[:success] = options.auth_success_message if defined?(Rack::Flash)
+          authenticate
+          env['x-rack.flash'][:success] = options.auth_success_message if defined?(Rack::Flash)
           redirect options.auth_success_path
         else
           redirect options.auth_failure_path
@@ -80,15 +105,15 @@ module Sinatra
       end
 
       app.post '/login/?' do
-        env['warden'].authenticate!
-        flash[:success] = options.auth_success_message if defined?(Rack::Flash)
+        authenticate
+        env['x-rack.flash'][:success] = options.auth_success_message if defined?(Rack::Flash)
         redirect options.auth_success_path
       end
 
       app.get '/logout/?' do
         authorize!
-        env['warden'].logout(:default)
-        flash[:success] = options.auth_success_message if defined?(Rack::Flash)
+        logout
+        env['x-rack.flash'][:success] = options.auth_success_message if defined?(Rack::Flash)
         redirect options.auth_success_path
       end
     end

data/sinatra_warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_warden}
-  s.version = "0.2.0.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad", "Daniel Neighman"]
-  s.date = %q{2010-03-02}
+  s.date = %q{2010-04-23}
   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.extra_rdoc_files = [
@@ -54,14 +54,14 @@ 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<warden>, [">= 0.10.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_dependency(%q<warden>, [">= 0.5.0"])
+      s.add_dependency(%q<warden>, [">= 0.10.3"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-    s.add_dependency(%q<warden>, [">= 0.5.0"])
+    s.add_dependency(%q<warden>, [">= 0.10.3"])
   end
 end
 

data/spec/fixtures/basic_strategy.rb

@@ -1,6 +1,11 @@
+
+
+
 Warden::Strategies.add(:password) do
   def valid?
-    params['email'] && params['password']
+    # params['email'] && params['password']
+    # p params
+    true
   end
 
   def authenticate!

data/spec/fixtures/testing_login.rb

@@ -1,3 +1,16 @@
+Warden::Strategies.add(:password) do
+  def valid?
+    # params['email'] && params['password']
+    # p params
+    true
+  end
+
+  def authenticate!
+    u = User.authenticate(params['email'], params['password'])
+    u.nil? ? fail!("Could not log you in.") : success!(u)
+  end
+end
+
 class TestingLogin < Sinatra::Base
   register Sinatra::Warden
 
@@ -5,6 +18,7 @@ class TestingLogin < Sinatra::Base
   set :sessions, true
 
   set :auth_success_path, '/welcome'
+
   get '/dashboard' do
     authorize!('/login')
     "My Dashboard"

data/spec/fixtures/user.rb

@@ -1,4 +1,3 @@
-
 class User
   include DataMapper::Resource
 

data/spec/sinatra_warden_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Sinatra::Warden" do
+
   before(:each) do
     @user = User.create(:email => 'justin.smestad@gmail.com', :password => 'thedude')
   end
@@ -52,6 +53,7 @@ describe "Sinatra::Warden" do
     end
 
     context "the user helper" do
+
       before(:each) do
         post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
         last_request.env['warden'].authenticated?.should be_true
@@ -77,6 +79,7 @@ describe "Sinatra::Warden" do
     end
 
     context "the logged_in/authenticated? helper" do
+
       before(:each) do
         post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
         last_request.env['warden'].authenticated?.should be_true
@@ -98,6 +101,7 @@ describe "Sinatra::Warden" do
     end
 
     context "the warden helper" do
+
       before(:each) do
         post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
         last_request.env['warden'].authenticated?.should be_true
@@ -115,32 +119,31 @@ describe "Sinatra::Warden" do
 
     it "should return a success message" do
       post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
-      last_request.env['rack.session'][:__FLASH__][:success].should == "You have logged in successfully."
+      last_request.env['x-rack.flash'][:success].should == "You have logged in successfully."
     end
 
     it "should return an error message" do
       post '/login', 'email' => 'bad', 'password' => 'wrong'
-      last_request.env['rack.session'][:__FLASH__][:error].should == "Could not log you in."
+      last_request.env['x-rack.flash'][:error].should == "Could not log you in."
     end
 
   end
 
   context "OAuth support" do
     context "when enabled" do
-      before(:each) do
+      before do
+        pending
         #TestingLogin.set(:auth_use_oauth, true)
         #@app = app
       end
 
       it "should redirect to authorize_url" do
-        pending
         get '/login'
         follow_redirect!
         last_request.url.should == "http://twitter.com/oauth/authorize"
       end
 
       it "should redirect to a custom authorize_url, if set" do
-        pending
         get '/login'
         follow_redirect!
         last_request.url.should == "http://facebook.com"

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ require 'spec/autorun'
 DataMapper.setup(:default, 'sqlite3::memory:')
 
 %w(fixtures support).each do |path|
-  Dir[ File.join(project_root, path, '/**/*.rb') ].each do |m|
+  Dir[ File.join(File.dirname(__FILE__), path, '/**/*.rb') ].each do |m|
     require m
   end
 end
@@ -29,6 +29,8 @@ Spec::Runner.configure do |config|
       use Warden::Manager do |manager|
         manager.default_strategies :password
         manager.failure_app = TestingLogin
+        manager.serialize_into_session { |user| user.id }
+        manager.serialize_from_session { |id| User.get(id) }
       end
       use Rack::Flash
       run TestingLogin

metadata

@@ -4,10 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  - 2
-  version: 0.2.0.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Justin Smestad
@@ -16,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -07:00
+date: 2010-04-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -31,22 +30,22 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: warden
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :runtime
-  version_requirements: *id002
+        - 10
+        - 3
+        version: 0.10.3
+  requirement: *id002
+  prerelease: false
 description: basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash
 email: justin.smestad@gmail.com
 executables: []