sinatra_warden 0.0.1 → 0.1.0

data/Gemfile

@@ -1,16 +1,16 @@
 source "http://gemcutter.org"
 
-gem 'sinatra', '~> 0.9.4'
-gem 'warden',  '~> 0.5.0'
+gem 'sinatra',        '>= 0.9.4'
+gem 'warden',         '~> 0.5.0'
 
-gem 'rake',                         :only => [:test]
-gem 'rspec',          '~> 1.2.9',   :only => [:test], :require_as => 'spec'
-gem 'yard',                         :only => [:test]
-gem 'rack-test',      '~> 0.5.0',   :only => [:test], :require_as => 'rack/test'
-gem 'rcov',                         :only => [:test]
+gem 'rake',                         :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'
+gem 'rcov',                         :only => :testing
 
-gem 'do_sqlite3',     '~> 0.10.0',  :only => [:test]
-gem 'dm-core',        '~> 0.10.1',  :only => [:test]
-gem 'bcrypt-ruby',                  :only => [:test], :require_as => 'bcrypt'
+gem 'do_sqlite3',     '~> 0.10.0',  :only => :testing
+gem 'dm-core',        '~> 0.10.1',  :only => :testing
+gem 'bcrypt-ruby',                  :only => :testing, :require_as => 'bcrypt'
 
-disable_system_gems
+disable_system_gems

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 jsmestad
+Copyright (c) 2009 Justin Smestad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,8 +1,6 @@
-= sinatra_warden
+= Sinatra::Warden
 
-Provides a module for basic helpers and actions needed for user 
-authentication using Warden with Sinatra. In addition to a
-collection of authentication strategies.
+A Sinatra (http://github.com/sinatra/sinatra) module that provides authentication for your Sinatra application through Warden (http://github.com/hassox/warden).
 
 == Usage
 
@@ -10,7 +8,7 @@ collection of authentication strategies.
   require 'sinatra_warden'
 
   class Application < Sinatra::Base
-    register SinatraWarden
+    register Sinatra::Warden
 
     get '/admin' do
       authorize!('/login') # require session, redirect to '/login' instead of work
@@ -22,22 +20,32 @@ collection of authentication strategies.
       haml :dashboard
     end
   end
+  
+== More Information
 
-== Issues
-
-* Currently assumes you have a model named 'User' and an email &  password field.
+Please read the wiki (http://wiki.github.com/jsmestad/sinatra_warden) for more information on more advanced configurations.
 
 == Note on Patches/Pull Requests
- 
+
+We use bundler on this project and disable system gems. Contributers should do the following:
+
+  $ git clone git://github.com/jsmestad/sinatra_warden.git
+  $ cd sinatra_warden
+  $ gem bundle
+  $ rake
+
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Contributors
+
+* Justin Smestad (http://github.com/jsmestad)
+* Daniel Neighman (http://github.com/hassox)
+* Shane Hanna (http://github.com/shanna)
+
 == Copyright
 
 Copyright (c) 2009 Justin Smestad. See LICENSE for details.

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.description = %Q{basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash}
     gem.email = "justin.smestad@gmail.com"
     gem.homepage = "http://github.com/jsmestad/sinatra_warden"
-    gem.authors = ["Justin Smestad"]
+    gem.authors = ["Justin Smestad", "Daniel Neighman"]
 
     manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
     manifest.dependencies.each do |d|

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/sinatra_warden.rb

@@ -1,9 +1,7 @@
-require 'sinatra'
-require 'warden'
+Bundler.require_env
+require File.join(File.dirname(__FILE__), 'sinatra_warden', 'sinatra')
 
-require File.join(File.dirname(__FILE__) + '/sinatra_warden/sinatra')
-
-Warden::Manager.before_failure do |env,opts|
+Warden::Manager.before_failure do |env, opts|
   # Sinatra is very sensitive to the request method
   # since authentication could fail on any type of method, we need
   # to set it for the failure app so it is routed to the correct block

data/lib/sinatra_warden/sinatra.rb

@@ -1,57 +1,72 @@
-module SinatraWarden
-  module Helpers
-    # The main accessor for the warden proxy instance
-    def warden
-      request.env['warden']
-    end
+module Sinatra
+  module Warden
+    module Helpers
+      
+      # The main accessor for the warden proxy instance
+      def warden
+        request.env['warden']
+      end
 
-    # Proxy to the authenticated? method on warden
-    def authenticated?(*args)
-      warden.authenticated?(*args)
-    end
-    alias_method :logged_in?, :authenticated?
+      # Proxy to the authenticated? method on warden
+      def authenticated?(*args)
+        warden.authenticated?(*args)
+      end
+      alias_method :logged_in?, :authenticated?
 
-    # Access the currently logged in user
-    def user(*args)
-      warden.user(*args)
-    end
-    alias_method :current_user, :user
+      # Access the currently logged in user
+      def user(*args)
+        warden.user(*args)
+      end
+      alias_method :current_user, :user
 
-    # Set the currently logged in user
-    def user=(user)
-      warden.set_user user
-    end
-    alias_method :current_user=, :user=
+      # Set the currently logged in user
+      # @params [User] the user you want to log in
+      def user=(user)
+        warden.set_user user
+      end
+      alias_method :current_user=, :user=
 
-    # Require authorization for an action
-    def authorize!(failure_path=nil)
-      redirect(failure_path ? failure_path : '/') unless authenticated?
+      # Require authorization for an action
+      # @params [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?
+      end
     end
-  end
 
-  def self.registered(app)
-    app.helpers SinatraWarden::Helpers
+    def self.registered(app)
+      app.helpers Warden::Helpers
+      
+      app.set :auth_failure_path, '/'
+      app.set :auth_success_path, lambda{ back }
 
-    app.post '/unauthenticated/?' do
-      status 401
-      flash[:error] = "Could not log you in" if defined?(Rack::Flash)
-      haml :login
-    end
+      app.set :auth_error_message, "Could not log you in."
+      app.set :auth_success_message, "You have logged in successfully."
+      app.set :auth_use_erb, false
+      app.set :auth_login_template, :login
 
-    app.get '/login/?' do
-      haml :login
-    end
+      app.post '/unauthenticated/?' do
+        status 401
+        flash[:error] = "Could not log you in." if defined?(Rack::Flash)
+        options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
+      end
 
-    app.post '/login/?' do
-      env['warden'].authenticate!
-      flash[:success] = "You have logged in successfully." if defined?(Rack::Flash)
-      redirect back
-    end
+      app.get '/login/?' do
+         options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
+      end
 
-    app.get '/logout/?' do
-      env['warden'].logout
-      flash[:success] = "You are now logged out." if defined?(Rack::Flash)
-      redirect back
+      app.post '/login/?' do
+        env['warden'].authenticate!
+        flash[:success] = options.auth_success_message if defined?(Rack::Flash)
+        redirect options.auth_success_path
+      end
+
+      app.get '/logout/?' do
+        env['warden'].logout
+        flash[:success] = options.auth_error_message if defined?(Rack::Flash)
+        redirect options.auth_success_path
+      end
     end
-  end
-end
+  end # Warden
+
+  register Warden
+end # Sinatra

data/sinatra_warden.gemspec

@@ -0,0 +1,91 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sinatra_warden}
+  s.version = "0.1.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{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.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "Gemfile",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/sinatra_warden.rb",
+     "lib/sinatra_warden/sinatra.rb",
+     "sinatra_warden.gemspec",
+     "spec/fixtures/bcrypt_strategy.rb",
+     "spec/fixtures/testing_login.rb",
+     "spec/fixtures/user.rb",
+     "spec/sinatra_warden_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/jsmestad/sinatra_warden}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  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/testing_login.rb",
+     "spec/fixtures/user.rb",
+     "spec/sinatra_warden_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    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/testing_login.rb

@@ -1,5 +1,5 @@
 class TestingLogin < Sinatra::Base
-  register SinatraWarden
+  register Sinatra::Warden
 
   get '/dashboard' do
     authorize!('/login')

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 ENV['RACK_ENV'] ||= 'test'
 project_root = File.expand_path(File.dirname(__FILE__))
 require File.join(project_root, '..', 'vendor', 'gems', 'environment')
-Bundler.require_env(:test)
+Bundler.require_env(:testing)
 
 require 'sinatra_warden'
 require 'spec'
@@ -13,7 +13,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(project_root, path, '/**/*.rb') ].each do |m|
     require m
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_warden
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Justin Smestad
+- Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -06:00
+date: 2009-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +19,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.4
     version: 
@@ -32,6 +33,86 @@ 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: 
@@ -58,8 +139,7 @@ files:
 - VERSION
 - lib/sinatra_warden.rb
 - lib/sinatra_warden/sinatra.rb
-- lib/sinatra_warden/strategies/bcrypt_activerecord.rb
-- lib/sinatra_warden/strategies/bcrypt_datamapper.rb
+- sinatra_warden.gemspec
 - spec/fixtures/bcrypt_strategy.rb
 - spec/fixtures/testing_login.rb
 - spec/fixtures/user.rb

data/lib/sinatra_warden/strategies/bcrypt_activerecord.rb

@@ -1,21 +0,0 @@
-Warden::Manager.serialize_into_session{ |user| [user.class, user.id] }
-Warden::Manager.serialize_from_session{ |klass, id| klass.find(id) }
-
-Warden::Strategies.add(:bcrypt_activerecord) do
-
-  def valid?
-    params["login"] || params["password"]
-  end
-
-  def authenticate!
-    return fail! unless user = User.find(params["login"])
-
-    if user.password == params["password"]
-      success!(user)
-    else
-      errors.add(:login, "Login or Password incorrect")
-      fail!
-    end
-  end
-
-end

data/lib/sinatra_warden/strategies/bcrypt_datamapper.rb

@@ -1,16 +0,0 @@
-require 'dm-core'
-require 'bcrypt'
-
-Warden::Manager.serialize_into_session{|user| user.id }
-Warden::Manager.serialize_from_session{|id| User.get(id) }
-
-Warden::Strategies.add(:bcrypt_datamapper) do
-  def valid?
-    params["email"] || params["password"]
-  end
-
-  def authenticate!
-    return fail!("Could not log in") unless user = User.first(:email => params["email"])
-    user.password == params["password"] ? success!(user) : fail!("Could not log in")
-  end
-end