warden-github 0.2.1 → 0.3.0

data/README.md

@@ -11,4 +11,4 @@ The Extension in Action
 =======================
     % gem install bundler
     % bundle install
-    % GITHUB_CLIENT_ID="<from GH>" GITHUB_CLIENT_SECRET="<from GH>" bundle exec rackup
+    % GITHUB_CLIENT_ID="<from GH>" GITHUB_CLIENT_SECRET="<from GH>" bundle exec rackup -p9393 -E none

data/lib/warden-github/proxy.rb

@@ -18,26 +18,22 @@ module Warden
 
         def client
           @client ||= OAuth2::Client.new(@client_id, @secret,
-                                         :ssl               => ssl_options,
-                                         :site              => 'https://github.com',
-                                         :authorize_path    => '/login/oauth/authorize',
-                                         :access_token_path => '/login/oauth/access_token')
+                                         :ssl           => ssl_options,
+                                         :site          => 'https://github.com',
+                                         :token_url     => '/login/oauth/access_token',
+                                         :authorize_url => '/login/oauth/authorize')
         end
 
-        def access_token_for(code)
-          web_server.get_token(code, :redirect_uri => callback_url)
+        def api_for(code)
+          client.auth_code.get_token(code, :redirect_uri => callback_url)
         end
 
         def authorize_url
-          web_server.authorize_url(
+          client.auth_code.authorize_url(
             :scope        => scopes,
             :redirect_uri => callback_url
           )
         end
-
-        def web_server
-          client.auth_code
-        end
       end
     end
   end

data/lib/warden-github/strategy.rb

@@ -8,9 +8,14 @@ Warden::Strategies.add(:github) do
   def authenticate!
     if params['code']
       begin
-        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))
+        api = api_for(params['code'])
+
+        resp = api.get '/api/v2/json/user/show' do |request|
+          request.params['access_token'] = api.token
+        end.body
+
+        user = JSON.load(resp)
+        success!(Warden::Github::Oauth::User.new(user['user'], api.token))
       rescue OAuth2::Error
         %(<p>Outdated ?code=#{params['code']}:</p><p>#{$!}</p><p><a href="/auth/github">Retry</a></p>)
       end
@@ -30,8 +35,8 @@ Warden::Strategies.add(:github) do
     oauth_proxy.authorize_url
   end
 
-  def access_token_for(code)
-    oauth_proxy.access_token_for(code)
+  def api_for(code)
+    oauth_proxy.api_for(code)
   end
 
   def oauth_proxy

data/lib/warden-github/version.rb

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

data/spec/app.rb

@@ -2,7 +2,7 @@ require 'sinatra'
 
 module Example
   class App < Sinatra::Base
-    use Rack::Session::Cookie, :key => 'rack.session', 
+    use Rack::Session::Cookie, :key => 'rack.session',
                                :secret => 'warden-github-auth',
                                :expire_after => 2592000
     enable  :raise_errors

data/warden-github.gemspec

@@ -19,7 +19,7 @@ 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 "rack",      "~>1.4.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec",     "~>1.3.0"
   s.add_development_dependency "webrat"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden-github
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-07 00:00:00 -08:00
+date: 2012-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,12 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 7
         segments: 
         - 1
-        - 3
+        - 4
         - 0
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency