authlogic-connect-andrewacove 0.5.6 → 0.5.7

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.6'
+  s.version           = '0.5.7'
   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-andrewacove.rb

@@ -1,7 +1,7 @@
 require 'active_record'
 require "rubygems"
 require 'authlogic'
-require 'oauth'
+require 'apigee-oauth'
 require 'oauth2'
 
 this = File.dirname(__FILE__)
@@ -24,4 +24,4 @@ custom_models +=  Dir["#{library}/openid/tokens"]
 custom_models.each do |path|
   $LOAD_PATH << path
   ActiveSupport::Dependencies.load_paths << path
-end
+end

data/lib/authlogic-connect-andrewacove.rb~

@@ -0,0 +1,27 @@
+require 'active_record'
+require "rubygems"
+require 'authlogic'
+require 'oauth'
+require 'oauth2'
+
+this = File.dirname(__FILE__)
+library = "#{this}/authlogic_connect"
+
+require "#{this}/open_id_authentication"
+require "#{library}/ext"
+require "#{library}/authlogic_connect"
+require "#{library}/callback_filter"
+require "#{library}/access_token"
+require "#{library}/openid"
+require "#{library}/oauth"
+require "#{library}/common"
+require "#{library}/engine" if defined?(Rails) && Rails::VERSION::MAJOR == 3
+
+custom_models =   ["#{library}/access_token"]
+custom_models +=  Dir["#{library}/oauth/tokens"]
+custom_models +=  Dir["#{library}/openid/tokens"]
+
+custom_models.each do |path|
+  $LOAD_PATH << path
+  ActiveSupport::Dependencies.load_paths << path
+end

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

@@ -1,4 +1,12 @@
 class OauthToken < AccessToken
+  OAuth::Consumer.class_eval do
+    alias_method :orig_sign!, :sign!
+
+    def sign!(request, token=nil, request_options={})
+      request_options.reverse_merge!(:site => options[:signing_endpoint]) if options[:signing_endpoint]
+      orig_sign!(request, token, request_options)
+    end
+  end
   
   def client
     unless @client
@@ -23,18 +31,19 @@ class OauthToken < AccessToken
       user_agent = config_options[:user_agent]
     end
     path.insert(0, "/#{api_version}") unless api_version.nil?
-    options.reverse_merge! {"User-Agent" => user_agent} unless user_agent.nil?
+    options.reverse_merge!("User-Agent" => user_agent) unless user_agent.nil?
     client.get(path, options)
   end
 
   def post(path, body='', headers ={})
+    debugger
     config_options = self.class.send(:credentials)[:options]
     unless config_options.nil?
       api_version = config_options[:api_version] 
       user_agent = config_options[:user_agent]
     end
     path.insert(0, "/#{api_version}") unless api_version.nil?
-    headers.reverse_merge! {"User-Agent" => user_agent} unless user_agent.nil?
+    headers.reverse_merge!("User-Agent" => user_agent) unless user_agent.nil?
     client.post(path, body, headers)
   end
 
@@ -66,13 +75,23 @@ class OauthToken < AccessToken
     end
     
 
-    def consumer
+    def consumer_helper options
       if oauth_version == 1.0
-        OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
+        OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(options || {}))
       else
-        OAuth2::Client.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
+        OAuth2::Client.new(credentials[:key], credentials[:secret], config.merge(options || {}))
       end
     end
+
+    def consumer
+      consumer_helper credentials[:options]
+    end
+    
+    def signing_consumer
+      signing_endpoint = credentials[:options].try(:fetch, :signing_endpoint, nil)
+      site_option = {:site => signing_endpoint} unless signing_endpoint.nil?
+      consumer_helper credentials[:options].try(:merge, site_option||{})
+    end
     
     # if we're lucky we can find it by the token.
     def find_by_key_or_token(key, token, options = {})
@@ -137,14 +156,14 @@ class OauthToken < AccessToken
     end
     
     def request_token(token, secret)
-      OAuth::RequestToken.new(consumer, token, secret)
+      OAuth::RequestToken.new(signing_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)
+      signing_consumer.get_request_token({:oauth_callback => callback_url}, options)
     end
     
     def get_access_token(oauth_verifier)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic-connect-andrewacove
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -07:00
+date: 2010-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,7 @@ files:
 - init.rb
 - MIT-LICENSE
 - lib/authlogic-connect-andrewacove.rb
+- lib/authlogic-connect-andrewacove.rb~
 - lib/authlogic_connect/access_token.rb
 - lib/authlogic_connect/authlogic_connect.rb
 - lib/authlogic_connect/callback_filter.rb