authlogic-connect-andrewacove 0.5.0 → 0.5.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "authlogic-connect-andrewacove"
   s.authors           = ['Lance Pollard', 'Andrew Cove']
-  s.version           = '0.5.0'
+  s.version           = '0.5.2'
   s.summary           = "Personal fork of Authlogic Connect: Oauth and OpenID made dead simple"
   s.homepage          = "http://github.com/andrewacove/authlogic-connect"
   s.email             = "andrewacove@gmail.com"

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

@@ -17,14 +17,19 @@ class OauthToken < AccessToken
   end
   
   def get(path, options = {})
-    config_options = self.class.send(:credentials)[:options]
+    credentials = self.class.send(:credentials)
+    puts "DEBUG: credentials #{credentials.to_yaml}"
+    config_options = credentials[:options] unless credentials.nil?
+    puts "DEBUG: config_options #{config_options.to_yaml}"
     api_version = config_options[:api_version] unless config_options.nil?
+    puts "DEBUG: api_version #{api_version.to_yaml}"
     path.insert(0, "/#{api_version}") unless api_version.nil?
     client.get(path, options)
   end
 
   def post(path, body='', headers ={})
-    config_options = self.class.send(:credentials)[:options]
+    credentials = self.class.send(:credentials)
+    config_options = credentials[:options] unless credentials.nil?
     api_version = config_options[:api_version] unless config_options.nil?
     path.insert(0, "/#{api_version}") unless api_version.nil?
     client.post(path, body, headers)

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

@@ -0,0 +1,152 @@
+class OauthToken < AccessToken
+  
+  def client
+    unless @client
+      if oauth_version == 1.0
+        @client = OAuth::AccessToken.new(self.consumer, self.token, self.secret)
+      else
+        @client = OAuth2::AccessToken.new(self.consumer, self.token)
+      end
+    end
+    
+    @client
+  end
+  
+  def oauth_version
+    self.class.oauth_version
+  end
+  
+  def get(path, options = {})
+    credentials = self.class.send(:credentials)
+    config_options = credentials[:options] unless credentials.nil?
+    api_version = config_options[:api_version] unless config_options.nil?
+    path.insert(0, "/#{api_version}") unless api_version.nil?
+    client.get(path, options)
+  end
+
+  def post(path, body='', headers ={})
+    credentials = self.class.send(:credentials)
+    config_options = credentials[:options] unless credentials.nil?
+    api_version = config_options[:api_version] unless config_options.nil?
+    path.insert(0, "/#{api_version}") unless api_version.nil?
+    client.post(path, body, headers)
+  end
+
+  class << self
+    
+    # oauth version, 1.0 or 2.0
+    def version(value)
+      @oauth_version = value
+    end
+    
+    def oauth_version
+      @oauth_version ||= 1.0
+    end
+    
+    # unique key that we will use from the AccessToken response
+    # to identify the user by.
+    # in Twitter, its "user_id".  Twitter has "screen_name", but that's
+    # more subject to change than user_id.  Pick whatever is least likely to change
+    def key(value = nil, &block)
+      if block_given?
+        @oauth_key = block
+      else
+        @oauth_key = value.is_a?(Symbol) ? value : value.to_sym
+      end
+    end
+    
+    def oauth_key
+      @oauth_key
+    end
+    
+    def reset_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
+    end
+
+    def consumer
+      @consumer || reset_consumer!
+    end
+    
+    # if we're lucky we can find it by the token.
+    def find_by_key_or_token(key, token, options = {})
+      result = self.find_by_key(key, options) unless key.nil?
+      unless result
+        if !token.blank? && self.respond_to?(:find_by_token)
+          result = self.find_by_token(token, options)
+        end
+      end
+      result 
+    end
+    
+    # this is a wrapper around oauth 1 and 2.
+    # it looks obscure, but from the api point of view
+    # you won't have to worry about it's implementation.
+    # in oauth 1.0, key = oauth_token, secret = oauth_secret
+    # in oauth 2.0, key = code, secret = access_token
+    def get_token_and_secret(options = {})
+      oauth_verifier  = options[:oauth_verifier]
+      redirect_uri    = options[:redirect_uri]
+      token           = options[:token]
+      secret          = options[:secret]
+
+      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}
+        if self.oauth_key
+          if oauth_key.is_a?(Proc)
+            result[:key] = oauth_key.call(access)
+          else
+            result[:key] = access.params[self.oauth_key] || access.params[self.oauth_key.to_s] # try both
+          end
+        else
+          puts "Access Token: #{access.inspect}"
+          raise "please set an oauth key for #{service_name.to_s}"
+        end
+      else
+        access = consumer.web_server.get_access_token(secret, :redirect_uri => redirect_uri)
+        result = {:token => access.token, :secret => secret, :key => nil}
+      end
+      
+      result
+    end
+    
+    # this is a cleaner method so we can access the authorize_url
+    # from oauth 1 or 2
+    def authorize_url(callback_url, &block)
+      if oauth_version == 1.0
+        request = get_request_token(callback_url)
+        yield request if block_given?
+        return request.authorize_url
+      else
+        options = {:redirect_uri => callback_url}
+
+        unless consumer.nil? || consumer.options.empty? || consumer.options[:scope].nil?
+          options[:scope] = consumer.options[:scope]
+        else
+          options[:scope] = self.config[:scope] unless self.config[:scope].blank?
+        end
+        return consumer.web_server.authorize_url(options)
+      end
+    end
+    
+    def request_token(token, secret)
+      OAuth::RequestToken.new(consumer, token, secret)
+    end
+    
+    # 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)
+      options = {:scope => config[:scope]} if config[:scope]
+      consumer.get_request_token({:oauth_callback => callback_url}, options)
+    end
+    
+    def get_access_token(oauth_verifier)
+      request_token.get_access_token(:oauth_verifier => oauth_verifier)
+    end
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic-connect-andrewacove
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Lance Pollard
@@ -175,6 +175,7 @@ files:
 - lib/authlogic_connect/oauth/tokens/myspace_token.rb
 - lib/authlogic_connect/oauth/tokens/netflix_token.rb
 - lib/authlogic_connect/oauth/tokens/oauth_token.rb
+- lib/authlogic_connect/oauth/tokens/oauth_token.rb~
 - lib/authlogic_connect/oauth/tokens/ohloh_token.rb
 - lib/authlogic_connect/oauth/tokens/opensocial_token.rb
 - lib/authlogic_connect/oauth/tokens/twitter_token.rb