sinatra_warden 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/sinatra_warden/sinatra.rb

@@ -20,9 +20,11 @@ module Sinatra
       alias_method :current_user, :user
 
       # Set the currently logged in user
+      #   Usage: self.user = @user
+      #
       # @params [User] the user you want to log in
-      def user=(user)
-        warden.set_user user
+      def user=(new_user)
+        warden.set_user(new_user)
       end
       alias_method :current_user=, :user=
 

data/sinatra_warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_warden}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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-04}
+  s.date = %q{2009-11-05}
   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 = [

data/spec/fixtures/basic_strategy.rb

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

data/spec/fixtures/testing_login.rb

@@ -11,14 +11,23 @@ class TestingLogin < Sinatra::Base
     "My Dashboard"
   end
 
+  get '/warden' do
+    authorize!
+    "#{warden}"
+  end
+
+  get '/check_login' do
+    logged_in? ? "Hello Moto" : "Get out!"
+  end
+
   get '/account' do
     authorize!
     "#{user.email}'s account page"
   end
 
-  post '/login_as/?' do
+  post '/login_as' do
     authorize!
-    user = User.authenticate(params['email'], params['password'])
+    self.user = User.authenticate(params['email'], params['password'])
   end
 
   get '/admin' do

data/spec/fixtures/user.rb

@@ -8,7 +8,7 @@ class User
 
   def self.authenticate(email, password)
     u = self.first(:email => email)
-    u.password == password ? u : nil
+    u && u.password == password ? u : nil
   end
 
 end

data/spec/sinatra_warden_spec.rb

@@ -76,21 +76,53 @@ describe "Sinatra::Warden" do
 
     end
 
-    context "the authenticated? helper" do
+    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 == true
+      end
 
-      it "should be aliased as logged_in?"
+      it "should be aliased as logged_in?" do
+        get '/check_login'
+        last_response.body.should == "Hello Moto"
+      end
 
-      it "should return true when a user is authenticated"
+      it "should return false when a user is not authenticated" do
+        get '/logout'
+        last_request.env['warden'].authenticated?.should == false
 
-      it "should return false when a user is not authenticated"
+        get '/check_login'
+        last_response.body.should == "Get out!"
+      end
 
     end
 
     context "the warden helper" do
+      before(:each) do
+        post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
+        last_request.env['warden'].authenticated?.should == true
+      end
 
-      it "returns the environment variables from warden"
+      it "returns the environment variables from warden" do
+        get '/warden'
+        last_response.body.should_not be_nil
+      end
 
     end
   end
 
+  context "Rack::Flash integration" 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."
+    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."
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_warden
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Justin Smestad
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -07:00
+date: 2009-11-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency