warden-github 0.2.0 → 0.2.1

data/Gemfile

@@ -1,24 +1,6 @@
-source 'http://rubygems.org'
+source :rubygems
 
-group :runtime do
-  gem 'warden',              '~>1.0.4'
-  gem 'oauth2',              '~>0.4.1'
-  gem 'json',                '>=1.0.0'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec',            '~>1.3.0', :require => 'spec'
-  gem 'rcov'
-  gem 'sinatra',          '~>1.0',   :require => 'sinatra/base'
-  gem 'shotgun'
-  gem 'webrat',           '~>0.7.0'
-  gem 'bundler',          '~>1.0'
-  gem 'randexp',          '>=0.1.4'
-  gem 'ruby-debug19',     :platforms => :ruby_19
-  gem 'ruby-debug',       :platforms => :ruby_18
-  gem 'addressable',      '~>2.2.0', :require => 'addressable/uri'
-  gem 'rack-test',        '~>0.5.3', :require => 'rack/test'
-end
+# Specify your gem's dependencies in failbot.gemspec
+gemspec
 
 # vim:ft=ruby

data/lib/warden-github/proxy.rb

@@ -25,7 +25,7 @@ module Warden
         end
 
         def access_token_for(code)
-          web_server.get_access_token(code, :redirect_uri => callback_url)
+          web_server.get_token(code, :redirect_uri => callback_url)
         end
 
         def authorize_url
@@ -36,7 +36,7 @@ module Warden
         end
 
         def web_server
-          client.web_server
+          client.auth_code
         end
       end
     end

data/lib/warden-github/strategy.rb

@@ -11,7 +11,7 @@ Warden::Strategies.add(:github) do
         access_token = access_token_for(params['code'])
         user = JSON.parse(access_token.get('/api/v2/json/user/show'))
         success!(Warden::Github::Oauth::User.new(user['user'], access_token.token))
-      rescue OAuth2::HTTPError
+      rescue OAuth2::Error
         %(<p>Outdated ?code=#{params['code']}:</p><p>#{$!}</p><p><a href="/auth/github">Retry</a></p>)
       end
     else

data/lib/warden-github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module Github
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/app.rb

@@ -1,6 +1,10 @@
+require 'sinatra'
+
 module Example
   class App < Sinatra::Base
-    enable  :sessions
+    use Rack::Session::Cookie, :key => 'rack.session', 
+                               :secret => 'warden-github-auth',
+                               :expire_after => 2592000
     enable  :raise_errors
     disable :show_exceptions
 
@@ -11,7 +15,7 @@ module Example
       manager[:github_client_id]    = ENV['GITHUB_CLIENT_ID']     || 'ee9aa24b64d82c21535a'
       manager[:github_secret]       = ENV['GITHUB_CLIENT_SECRET'] || 'ed8ff0c54067aefb808dab1ca265865405d08d6f'
 
-      manager[:github_scopes]       = 'user,public_repo,repo,gist'
+      manager[:github_scopes]       = ''
       manager[:github_callback_url] = '/auth/github/callback'
     end
 

data/spec/oauth_spec.rb

@@ -11,7 +11,7 @@ describe "Warden::Github" do
 
     params = uri.query_values
     params['response_type'].should eql('code')
-    params['scope'].should eql('user,public_repo,repo,gist')
+    params['scope'].should eql('')
     params['client_id'].should match(/\w{20}/)
     params['redirect_uri'].should eql('http://example.org/auth/github/callback')
   end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ Bundler.require(:default, :runtime, :test)
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'warden-github')
 require File.join(File.dirname(__FILE__), 'app')
+require 'rack/test'
+require 'webrat'
 
 require 'pp'
 

data/warden-github.gemspec

@@ -19,10 +19,12 @@ Gem::Specification.new do |s|
   s.add_dependency "warden", "~>1.0.4"
   s.add_dependency "oauth2", "~>0.5.2"
 
+  s.add_development_dependency "rack",      "~>1.3.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec",     "~>1.3.0"
+  s.add_development_dependency "webrat"
+  s.add_development_dependency "sinatra"
   s.add_development_dependency "shotgun"
-  s.add_development_dependency "bundler",   "~>1.0"
   s.add_development_dependency "addressable", "~>2.2.0"
   s.add_development_dependency "rack-test",   "~>0.5.3"
   s.add_development_dependency "ruby-debug"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden-github
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 -08:00
+date: 2012-01-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,9 +66,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +94,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,11 +110,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: shotgun
+  name: webrat
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,26 +124,39 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: shotgun
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: addressable
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -139,11 +168,11 @@ dependencies:
         - 0
         version: 2.2.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,11 +184,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -169,7 +198,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id012
 description: A warden strategy for easy oauth integration with github
 email: 
 - atmos@atmos.org