warden-github 0.0.4 → 0.0.5

data/lib/warden-github.rb

@@ -9,5 +9,6 @@ module Warden
 end
 
 require 'warden-github/user'
+require 'warden-github/proxy'
 require 'warden-github/version'
 require 'warden-github/strategy'

data/lib/warden-github/proxy.rb

@@ -0,0 +1,33 @@
+module Warden
+  module Github
+    module Oauth
+      class Proxy
+        def initialize(client_id, secret, callback_url)
+          @client_id, @secret, @callback_url = client_id, secret, callback_url
+        end
+
+        def client
+          @client ||= OAuth2::Client.new(@client_id, @secret,
+                                         :site              => 'https://github.com',
+                                         :authorize_path    => '/login/oauth/authorize',
+                                         :access_token_path => '/login/oauth/access_token')
+        end
+
+        def access_token_for(code)
+          web_server.get_access_token(code, :redirect_uri => @callback_url)
+        end
+
+        def authorize_url
+          web_server.authorize_url(
+            :scope        => 'email,offline_access',
+            :redirect_uri => @callback_url
+          )
+        end
+
+        def web_server
+          client.web_server
+        end
+      end
+    end
+  end
+end

data/lib/warden-github/strategy.rb

@@ -8,28 +8,35 @@ Warden::Strategies.add(:github) do
   def authenticate!
     if params['code']
       begin
-        access_token = oauth_client.web_server.get_access_token(params['code'], :redirect_uri => callback_url)
+        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
-        %(<p>Outdated ?code=#{params[:code]}:</p><p>#{$!}</p><p><a href="/auth/github">Retry</a></p>)
+        %(<p>Outdated ?code=#{params['code']}:</p><p>#{$!}</p><p><a href="/auth/github">Retry</a></p>)
       end
     else
-      url = oauth_client.web_server.authorize_url(
-        :scope        => 'email,offline_access',
-        :redirect_uri => callback_url
-      )
-      throw(:halt, [ 302, {'Location' => url}, [ ]])
+      throw(:halt, [ 302, {'Location' => authorize_url}, [ ]])
     end
   end
 
   private
+
   def oauth_client
-    OAuth2::Client.new(env['warden'].config[:github_client_id],
-                       env['warden'].config[:github_secret],
-                       :site              => 'https://github.com',
-                       :authorize_path    => '/login/oauth/authorize',
-                       :access_token_path => '/login/oauth/access_token')
+    oauth_proxy.client
+  end
+
+  def authorize_url
+    oauth_proxy.authorize_url
+  end
+
+  def access_token_for(code)
+    oauth_proxy.access_token_for(code)
+  end
+
+  def oauth_proxy
+    @oauth_proxy ||= Warden::Github::Oauth::Proxy.new(env['warden'].config[:github_client_id],
+                                                      env['warden'].config[:github_secret],
+                                                      callback_url)
   end
 
   def callback_url

data/lib/warden-github/user.rb

@@ -2,8 +2,6 @@ module Warden
   module Github
     module Oauth
       class User < Struct.new(:attribs, :token)
-        extend Forwardable
-
         def name
           attribs['name']
         end
@@ -11,6 +9,10 @@ module Warden
         def email
           attribs['email']
         end
+
+        def company
+          attribs['company']
+        end
       end
     end
   end

data/lib/warden-github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module Github
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden-github
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -07:00
+date: 2010-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ extra_rdoc_files:
 files: 
 - LICENSE
 - README.md
+- lib/warden-github/proxy.rb
 - lib/warden-github/strategy.rb
 - lib/warden-github/user.rb
 - lib/warden-github/version.rb