warden-github 0.6.1 → 0.7.0

data/lib/warden-github.rb

@@ -1,6 +1,6 @@
 require 'warden'
 require 'oauth2'
-require 'json'
+require 'yajl'
 
 module Warden
   module Github

data/lib/warden-github/strategy.rb

@@ -10,12 +10,7 @@ Warden::Strategies.add(:github) do
       begin
         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))
+        success!(Warden::Github::Oauth::User.new(Yajl.load(user_info_for(api.token)), api.token))
       rescue OAuth2::Error
         %(<p>Outdated ?code=#{params['code']}:</p><p>#{$!}</p><p><a href="/auth/github">Retry</a></p>)
       end
@@ -47,6 +42,10 @@ Warden::Strategies.add(:github) do
                                                       callback_url)
   end
 
+  def user_info_for(token)
+    @user_info ||= RestClient.get("https://api.github.com/user", :params => {:access_token => token})
+  end
+
   def callback_url
     absolute_url(request, env['warden'].config[:github_callback_url], env['HTTP_X_FORWARDED_PROTO'])
   end

data/lib/warden-github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module Github
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden-github
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 -07:00
+date: 2012-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency