lib/authlogic_connect/oauth/tokens/oauth_token.rb in authlogic-connect-0.0.1 vs lib/authlogic_connect/oauth/tokens/oauth_token.rb in authlogic-connect-0.0.2

@@ -1,21 +1,36 @@
 class OauthToken < Token
-  
   # Main client for interfacing with remote service. Override this to use
   # preexisting library eg. Twitter gem.
   def client
-    @client ||= OAuth::AccessToken.new(self.class.consumer, token, secret)
+    unless @client
+      if oauth_version == 1.0
+        @client = OAuth::AccessToken.new(self.consumer, self.key, self.secret)
+      else
+        @client = OAuth2::AccessToken.new(self.consumer, self.key)
+      end
+    end
+    
+    @client
   end
   
+  def consumer
+    self.class.consumer
+  end
+  
   def simple_client
     @simple_client ||= SimpleClient.new(OAuth::AccessToken.new(self.class.consumer, token, secret))
   end
   
   def oauth_version
     self.class.oauth_version
   end
   
+  def get(path, options = {})
+    client.get(path)
+  end
+  
   class << self
     
     def oauth_version
       1.0
     end
@@ -23,14 +38,18 @@
     def settings
       @settings ||= {}
     end
     
     def consumer
-      @consumer ||= OAuth::Consumer.new(credentials[:key], credentials[:secret], settings.merge(credentials[:options] || {}))
-    end
-    
-    def client
-      OAuth2::Client.new(credentials[:key], credentials[:secret], settings)
+      unless @consumer
+        if oauth_version == 1.0
+          @consumer = OAuth::Consumer.new(credentials[:key], credentials[:secret], settings.merge(credentials[:options] || {}))
+        else
+          @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], settings)
+        end
+      end
+      
+      @consumer
     end
     
     def request_token(token, secret)
       OAuth::RequestToken.new(consumer, token, secret)
     end