sinatra_warden 0.1.0 → 0.1.1

data/Gemfile

@@ -4,6 +4,8 @@ gem 'sinatra',        '>= 0.9.4'
 gem 'warden',         '~> 0.5.0'
 
 gem 'rake',                         :only => :testing
+gem 'jeweler',                      :only => :testing
+gem 'bundler',                      :only => :testing
 gem 'rspec',          '~> 1.2.9',   :only => :testing, :require_as => 'spec'
 gem 'yard',                         :only => :testing
 gem 'rack-test',      '~> 0.5.0',   :only => :testing, :require_as => 'rack/test'
@@ -12,5 +14,7 @@ gem 'rcov',                         :only => :testing
 gem 'do_sqlite3',     '~> 0.10.0',  :only => :testing
 gem 'dm-core',        '~> 0.10.1',  :only => :testing
 gem 'bcrypt-ruby',                  :only => :testing, :require_as => 'bcrypt'
+gem 'haml',                         :only => :testing
+gem 'rack-flash',                   :only => :testing, :require_as => 'rack/flash'
 
 disable_system_gems

data/README.rdoc

@@ -32,7 +32,7 @@ We use bundler on this project and disable system gems. Contributers should do t
   $ git clone git://github.com/jsmestad/sinatra_warden.git
   $ cd sinatra_warden
   $ gem bundle
-  $ rake
+  $ ./bin/rake
 
 * Fork the project.
 * Make your feature addition or bug fix.

data/Rakefile

@@ -1,4 +1,5 @@
-require 'rubygems'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'vendor', 'gems', 'environment')
+Bundler.require_env
 require 'rake'
 require 'bundler'
 
@@ -14,11 +15,10 @@ begin
 
     manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
     manifest.dependencies.each do |d|
-      next if d.only && d.only.include?('test')
+      next if d.only && d.only.include?('testing')
       gem.add_dependency(d.name, d.version)
     end
 
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -37,8 +37,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 begin

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/autospec

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
 load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rspec-1.2.9/bin/autospec")

data/bin/css2sass

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/haml-2.2.10/bin/css2sass")

data/bin/edit_json.rb

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/json_pure-1.1.9/bin/edit_json.rb")

data/bin/haml

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/haml-2.2.10/bin/haml")

data/bin/html2haml

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/haml-2.2.10/bin/html2haml")

data/bin/jeweler

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/jeweler-1.3.0/bin/jeweler")

data/bin/prettify_json.rb

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/json_pure-1.1.9/bin/prettify_json.rb")

data/bin/rackup

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
 load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rack-1.0.1/bin/rackup")

data/bin/rake

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
 load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rake-0.8.7/bin/rake")

data/bin/rcov

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rcov-0.9.5/bin/rcov")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rcov-0.9.6/bin/rcov")

data/bin/rubyforge

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rubyforge-2.0.3/bin/rubyforge")

data/bin/sass

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/haml-2.2.10/bin/sass")

data/bin/spec

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
 load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rspec-1.2.9/bin/spec")

data/bin/yard-graph

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
 load File.join(File.dirname(__FILE__), "../vendor/gems/gems/yard-0.2.3.5/bin/yard-graph")

data/bin/yardoc

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
 load File.join(File.dirname(__FILE__), "../vendor/gems/gems/yard-0.2.3.5/bin/yardoc")

data/bin/yri

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
 load File.join(File.dirname(__FILE__), "../vendor/gems/gems/yard-0.2.3.5/bin/yri")

data/lib/sinatra_warden/sinatra.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module Warden
     module Helpers
-      
+
       # The main accessor for the warden proxy instance
       def warden
         request.env['warden']
@@ -35,9 +35,9 @@ module Sinatra
 
     def self.registered(app)
       app.helpers Warden::Helpers
-      
+
       app.set :auth_failure_path, '/'
-      app.set :auth_success_path, lambda{ back }
+      app.set :auth_success_path, lambda { back }
 
       app.set :auth_error_message, "Could not log you in."
       app.set :auth_success_message, "You have logged in successfully."
@@ -46,7 +46,7 @@ module Sinatra
 
       app.post '/unauthenticated/?' do
         status 401
-        flash[:error] = "Could not log you in." if defined?(Rack::Flash)
+        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
 
@@ -61,8 +61,9 @@ module Sinatra
       end
 
       app.get '/logout/?' do
+        authorize!
         env['warden'].logout
-        flash[:success] = options.auth_error_message if defined?(Rack::Flash)
+        flash[:success] = options.auth_success_message if defined?(Rack::Flash)
         redirect options.auth_success_path
       end
     end

data/sinatra_warden.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_warden}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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.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", "rackup", "rake", "rcov", "spec", "yard-graph", "yardoc", "yri"]
+  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"
@@ -28,9 +28,10 @@ Gem::Specification.new do |s|
      "lib/sinatra_warden.rb",
      "lib/sinatra_warden/sinatra.rb",
      "sinatra_warden.gemspec",
-     "spec/fixtures/bcrypt_strategy.rb",
+     "spec/fixtures/basic_strategy.rb",
      "spec/fixtures/testing_login.rb",
      "spec/fixtures/user.rb",
+     "spec/fixtures/views/login.haml",
      "spec/sinatra_warden_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -41,7 +42,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{authentication system for using warden with sinatra}
   s.test_files = [
-    "spec/fixtures/bcrypt_strategy.rb",
+    "spec/fixtures/basic_strategy.rb",
      "spec/fixtures/testing_login.rb",
      "spec/fixtures/user.rb",
      "spec/sinatra_warden_spec.rb",
@@ -55,37 +56,13 @@ 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<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"])
     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<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"])
     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<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"])
   end
 end
 

data/spec/fixtures/basic_strategy.rb

@@ -0,0 +1,10 @@
+Warden::Strategies.add(:password) do
+  def valid?
+    params['email'] || params['password']
+  end
+
+  def authenticate!
+    u = User.authenticate(params['email'], params['password'])
+    u.nil? ? fail!("Could not log in") : success!(u)
+  end
+end

data/spec/fixtures/testing_login.rb

@@ -1,8 +1,14 @@
 class TestingLogin < Sinatra::Base
   register Sinatra::Warden
 
+  set :views, File.join(File.dirname(__FILE__), 'views')
+  set :sessions, true
+
+  set :auth_success_path, '/welcome'
+
   get '/dashboard' do
     authorize!('/login')
+    "My Dashboard"
   end
 
   get '/admin' do

data/spec/fixtures/user.rb

@@ -1,20 +1,14 @@
-require 'dm-core'
-require 'bcrypt'
 
 class User
   include DataMapper::Resource
 
   property :id, Serial
   property :email, String
-  property :encrypted_password, String
+  property :password, String
 
-  def password=(new_password)
-    @password = BCrypt::Password.create(new_password)
-    self.encrypted_password = @password
-  end
-
-  def password
-    @password ||= BCrypt::Password.new(encrypted_password)
+  def self.authenticate(email, password)
+    u = self.first(:email => email)
+    u.password == password ? u : nil
   end
 
 end

data/spec/sinatra_warden_spec.rb

@@ -9,13 +9,23 @@ describe "SinatraWarden" do
     @user.new?.should be_false
   end
 
-  context "the authentication system" do
+  it "should create successfully" do
+    @user.password.should == "thedude"
+    User.authenticate('justin.smestad@gmail.com', 'thedude').should == @user
+  end
 
-    it "should allow us to login as that user"
+  context "the authentication system" do
 
-    it "should allow us to logout after logging in"
+    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
+    end
 
-    it "should redirect to root"
+    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
+    end
 
   end
 
@@ -23,11 +33,24 @@ describe "SinatraWarden" do
 
     context "the authorize! helper" do
 
-      it "should redirect to root if not logged in"
-
-      it "should redirect to the passed path if available"
-
-      it "should allow access if user is logged in"
+      it "should redirect to root (default) if not logged in" do
+        get '/admin'
+        follow_redirect!
+        last_request.url.should == 'http://example.org/'
+      end
+
+      it "should redirect to the passed path if available" do
+        get '/dashboard'
+        follow_redirect!
+        last_request.url.should == 'http://example.org/login'
+      end
+
+      it "should allow access if user is logged in" do
+        post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
+        last_request.env['warden'].authenticated?.should == true
+        get '/dashboard'
+        last_response.body.should == "My Dashboard"
+      end
 
     end
 

data/spec/spec_helper.rb

@@ -28,7 +28,12 @@ Spec::Runner.configure do |config|
   def app
     @app ||= Rack::Builder.app do
       use Rack::Session::Cookie
-      run TestingLogin.app
+      use Warden::Manager do |manager|
+        manager.default_strategies :password
+        manager.failure_app = TestingLogin
+      end
+      use Rack::Flash
+      run TestingLogin
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_warden
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Justin Smestad
@@ -33,93 +33,21 @@ 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: 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: 
 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
@@ -140,9 +68,10 @@ files:
 - lib/sinatra_warden.rb
 - lib/sinatra_warden/sinatra.rb
 - sinatra_warden.gemspec
-- spec/fixtures/bcrypt_strategy.rb
+- spec/fixtures/basic_strategy.rb
 - spec/fixtures/testing_login.rb
 - spec/fixtures/user.rb
+- spec/fixtures/views/login.haml
 - spec/sinatra_warden_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -175,7 +104,7 @@ signing_key:
 specification_version: 3
 summary: authentication system for using warden with sinatra
 test_files: 
-- spec/fixtures/bcrypt_strategy.rb
+- spec/fixtures/basic_strategy.rb
 - spec/fixtures/testing_login.rb
 - spec/fixtures/user.rb
 - spec/sinatra_warden_spec.rb