authlogic-connect-andrewacove 0.5.5 → 0.5.6

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.5'
+  s.version           = '0.5.6'
   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

@@ -18,15 +18,23 @@ class OauthToken < AccessToken
   
   def get(path, options = {})
     config_options = self.class.send(:credentials)[:options]
-    api_version = config_options[:api_version] unless config_options.nil?
+    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?
+    options.reverse_merge!("User-Agent" => user_agent) unless user_agent.nil?
     client.get(path, options)
   end
 
   def post(path, body='', headers ={})
     config_options = self.class.send(:credentials)[:options]
-    api_version = config_options[:api_version] unless config_options.nil?
+    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?
     client.post(path, body, headers)
   end
 

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

@@ -18,15 +18,23 @@ class OauthToken < AccessToken
   
   def get(path, options = {})
     config_options = self.class.send(:credentials)[:options]
-    api_version = config_options[:api_version] unless config_options.nil?
+    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?
+    options.reverse_merge! {"User-Agent" => user_agent} unless user_agent.nil?
     client.get(path, options)
   end
 
   def post(path, body='', headers ={})
     config_options = self.class.send(:credentials)[:options]
-    api_version = config_options[:api_version] unless config_options.nil?
+    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?
     client.post(path, body, headers)
   end
 
@@ -57,17 +65,14 @@ class OauthToken < AccessToken
       @oauth_key
     end
     
-    def reset_consumer!
+
+    def consumer
       if oauth_version == 1.0
-        @consumer = OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
+        OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
       else
-        @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
+        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 = {})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic-connect-andrewacove
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
+date: 2010-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency