authlogic-connect 0.0.4.06 → 0.0.5

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "authlogic-connect"
   s.author            = "Lance Pollard"
-  s.version           = "0.0.4.06"
+  s.version           = "0.0.5"
   s.summary           = "Authlogic Connect: Oauth and OpenID made dead simple"
   s.homepage          = "http://github.com/viatropos/authlogic-connect"
   s.email             = "lancejpollard@gmail.com"

data/lib/authlogic-connect.rb

@@ -24,4 +24,15 @@ custom_models +=  Dir["#{library}/openid/tokens"]
 custom_models.each do |path|
   $LOAD_PATH << path
   ActiveSupport::Dependencies.load_paths << path
+end
+
+# Rails 3beta4 backport
+if defined?(ActiveSupport::HashWithIndifferentAccess)
+  ActiveSupport::HashWithIndifferentAccess.class_eval do
+    unless defined?(:symbolize_keys!)
+      def symbolize_keys!
+        symbolize_keys
+      end
+    end
+  end
 end

data/lib/authlogic_connect/oauth/tokens/github_token.rb

@@ -0,0 +1,12 @@
+class GithubToken < OauthToken
+  
+  key do |access_token|
+    user = JSON.parse(access_token.get("/api/v2/json/user/show"))
+    user["id"]
+  end
+  
+  settings "https://github.com",
+    :authorize_path     => "/login/oauth/authorize",
+    :access_token_path  => "/login/oauth/access_token"
+  
+end

data/lib/authlogic_connect/oauth/tokens/oauth_token.rb

@@ -12,6 +12,10 @@ class OauthToken < AccessToken
     @client
   end
   
+  def clear
+    @client = nil
+  end
+  
   def oauth_version
     self.class.oauth_version
   end
@@ -20,7 +24,7 @@ class OauthToken < AccessToken
     client.get(path, options)
   end
 
-  def post(path, body='', headers ={})
+  def post(path, body = "", headers = {})
     client.post(path, body, headers)
   end
 
@@ -52,15 +56,11 @@ class OauthToken < AccessToken
     end
     
     def consumer
-      unless @consumer
-        if oauth_version == 1.0
-          @consumer = OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
-        else
-          @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
-        end
+      if oauth_version == 1.0
+        OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
+      else
+        OAuth2::Client.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
       end
-      
-      @consumer
     end
     
     # if we're lucky we can find it by the token.
@@ -84,7 +84,8 @@ class OauthToken < AccessToken
       redirect_uri    = options[:redirect_uri]
       token           = options[:token]
       secret          = options[:secret]
-
+      consumer        = self.consumer # cached
+      
       if oauth_version == 1.0
         access = request_token(token, secret).get_access_token(:oauth_verifier => oauth_verifier)
         result = {:token => access.token, :secret => access.secret, :key => nil}
@@ -109,8 +110,10 @@ class OauthToken < AccessToken
     # this is a cleaner method so we can access the authorize_url
     # from oauth 1 or 2
     def authorize_url(callback_url, &block)
+      consumer        = self.consumer # cached
+
       if oauth_version == 1.0
-        request = get_request_token(callback_url)
+        request = get_request_token(callback_url, consumer)
         yield request if block_given?
         return request.authorize_url
       else
@@ -131,8 +134,9 @@ class OauthToken < AccessToken
     
     # if you pass a hash as the second parameter to consumer.get_request_token,
     # ruby oauth will think this is a form and all sorts of bad things happen
-    def get_request_token(callback_url)
+    def get_request_token(callback_url, consumer = nil)
       options = {:scope => config[:scope]} if config[:scope]
+      consumer ||= self.consumer
       consumer.get_request_token({:oauth_callback => callback_url}, options)
     end
     

data/test/libs/database.rb

@@ -18,7 +18,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime :updated_at
   end
 
-  create_table :tokens, :force => true do |t|
+  create_table :access_tokens, :force => true do |t|
     t.integer  :user_id
     t.string   :type,       :limit => 30
     t.string   :key,        :limit => 1024

data/test/test_helper.rb

@@ -33,7 +33,8 @@ AuthlogicConnect.config = {
     :twitter => {
       :key => "my_key",
       :secret => "my_secret",
-      :label => "Twitter"
+      :label => "Twitter",
+      :user_agent => "Netscape"
     },
     :facebook => {
       :key => "my_key",

data/test/test_user.rb

@@ -190,5 +190,14 @@ module AuthlogicConnect
       end
     end
     
+    context "tokens" do
+      setup do
+        @token = TwitterToken.new
+      end
+      
+      should "be version 1 since it's twitter" do
+        assert_equal 1.0, @token.oauth_version
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic-connect
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  - 6
-  version: 0.0.4.06
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -07:00
+date: 2010-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,6 +167,7 @@ files:
 - lib/authlogic_connect/oauth/tokens/aol_token.rb
 - lib/authlogic_connect/oauth/tokens/facebook_token.rb
 - lib/authlogic_connect/oauth/tokens/get_satisfaction_token.rb
+- lib/authlogic_connect/oauth/tokens/github_token.rb
 - lib/authlogic_connect/oauth/tokens/google_token.rb
 - lib/authlogic_connect/oauth/tokens/linked_in_token.rb
 - lib/authlogic_connect/oauth/tokens/meetup_token.rb