sinatra_warden 0.1.5.1 → 0.1.6

data/Gemfile

@@ -1,22 +1,22 @@
 source "http://gemcutter.org"
 
-group :runtime do
-  gem 'sinatra',        '>= 0.9.4'
-  gem 'warden',         '>= 0.5.0'
-end
+gem 'sinatra',        '>= 0.9.4'
+gem 'warden',         '>= 0.5.3'
 
-group :test do
+only :testing do
   gem 'rake'
-  gem 'jeweler'
-  gem 'bundler',        '~> 0.9.7'
-  gem 'rspec',          '~> 1.2.9', :require => 'spec'
+  gem 'jeweler',        '~> 1.3.0'
+  gem 'bundler'
+  gem 'rspec',          '~> 1.2.9',   :require_as => 'spec'
   gem 'yard'
-  gem 'rack-test',      '~> 0.5.0', :require => 'rack/test'
+  gem 'rack-test',      '~> 0.5.0',   :require_as => 'rack/test'
   gem 'rcov'
-
+                                    
   gem 'do_sqlite3',     '~> 0.10.0'
   gem 'dm-core',        '~> 0.10.1'
-  gem 'bcrypt-ruby',    :require => 'bcrypt'
+  gem 'bcrypt-ruby',                  :require_as => 'bcrypt'
   gem 'haml'
-  gem 'rack-flash',     :require => 'rack/flash'
+  gem 'rack-flash',                   :require_as => 'rack/flash'
 end
+
+disable_system_gems

data/README.rdoc

@@ -27,10 +27,12 @@ Please read the wiki (http://wiki.github.com/jsmestad/sinatra_warden) for more i
 
 == 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
-  $ bundle install
-  $ bundle exec rake
+  $ gem bundle
+  $ ./bin/rake
 
 * Fork the project.
 * Make your feature addition or bug fix.

data/Rakefile

@@ -1,3 +1,5 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'vendor', 'gems', 'environment')
+Bundler.require_env
 require 'rake'
 require 'bundler'
 
@@ -11,11 +13,13 @@ begin
     gem.homepage = "http://github.com/jsmestad/sinatra_warden"
     gem.authors = ["Justin Smestad", "Daniel Neighman"]
 
-    bundle = Bundler::Definition.from_gemfile('Gemfile')
-    bundle.dependencies.each do |dep|
-      next unless dep.groups.include?(:runtime)
-      gem.add_dependency(dep.name, dep.version_requirements.to_s)
+    manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
+    manifest.dependencies.each do |d|
+      next if d.only
+      gem.add_dependency(d.name, d.version)
     end
+    
+    gem.executables = nil
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.5.1
+0.1.6

data/lib/sinatra_warden.rb

@@ -1,4 +1,3 @@
-require 'warden'
 require File.join(File.dirname(__FILE__), 'sinatra_warden', 'sinatra')
 
 Warden::Manager.before_failure do |env, opts|

data/lib/sinatra_warden/sinatra.rb

@@ -33,6 +33,7 @@ module Sinatra
       def authorize!(failure_path=nil)
         redirect(failure_path ? failure_path : options.auth_failure_path) unless authenticated?
       end
+
     end
 
     def self.registered(app)
@@ -41,19 +42,37 @@ module Sinatra
       app.set :auth_failure_path, '/'
       app.set :auth_success_path, lambda { back }
 
-      app.set :auth_error_message,   "Could not log you in."
+      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
+      
+      # OAuth Specific Settings
+      app.set :auth_use_oauth, false
+      app.set :auth_oauth_authorize_url, nil
 
       app.post '/unauthenticated/?' do
         status 401
-        flash[:error] = (env['warden'].message || options.auth_error_message) 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
 
       app.get '/login/?' do
-         options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
+        if options.auth_use_oauth && !options.auth_oauth_authorize_url.nil?
+          redirect options.auth_oauth_authorize_url
+        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)
+          redirect options.auth_success_path
+        else
+          redirect options.auth_failure_path
+        end
       end
 
       app.post '/login/?' do

data/sinatra_warden.gemspec

@@ -5,14 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_warden}
-  s.version = "0.1.5.1"
+  s.version = "0.1.6"
 
   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{2009-12-16}
   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"
@@ -55,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.5.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_dependency(%q<warden>, [">= 0.5.0"])
+      s.add_dependency(%q<warden>, [">= 0.5.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.5.3"])
   end
 end
 

data/spec/fixtures/basic_strategy.rb

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

data/spec/fixtures/testing_login.rb

@@ -5,7 +5,6 @@ class TestingLogin < Sinatra::Base
   set :sessions, true
 
   set :auth_success_path, '/welcome'
-
   get '/dashboard' do
     authorize!('/login')
     "My Dashboard"

data/spec/sinatra_warden_spec.rb

@@ -125,4 +125,28 @@ describe "Sinatra::Warden" do
 
   end
 
+  context "OAuth support" do
+    context "when enabled" do
+      before(:each) do
+        #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"
+      end
+
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
-Bundler.require(:default, :runtime, :test)
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $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(:testing)
 
 require 'sinatra_warden'
 require 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_warden
 version: !ruby/object:Gem::Version 
-  version: 0.1.5.1
+  version: 0.1.6
 platform: ruby
 authors: 
 - Justin Smestad
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -07:00
+date: 2009-12-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,27 +31,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.5.3
     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: