aggcat 0.0.8 → 0.0.9

data/lib/aggcat/base.rb

@@ -27,17 +27,19 @@ module Aggcat
 
     protected
 
-    def access_token
-      token = oauth_token
-      consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, {:timeout => TIMEOUT})
-      OAuth::AccessToken.new(consumer, token[:key], token[:secret])
+    def oauth_client
+      OAuth::AccessToken.new(oauth_consumer, *oauth_token)
+    end
+
+    def oauth_consumer
+      @oauth_consumer ||= OAuth::Consumer.new(@consumer_key, @consumer_secret, {:timeout => TIMEOUT})
     end
 
     def oauth_token
-      now = Time.now.utc
-      if @oauth_token.nil? || @oauth_token[:expire_at] <= now
+      now = Time.now
+      if @oauth_token.nil? || @oauth_token_expire_at <= now
         @oauth_token = new_token(saml_message(@customer_id))
-        @oauth_token[:expire_at] = now + 9 * 60 # 9 minutes
+        @oauth_token_expire_at = now + 9 * 60 # 9 minutes
       end
       @oauth_token
     end
@@ -53,7 +55,7 @@ module Aggcat
       #http.set_debug_output($stdout)
       response = http.request(request)
       params = CGI::parse(response.body)
-      {key: params['oauth_token'][0], secret: params['oauth_token_secret'][0]}
+      [params['oauth_token'][0], params['oauth_token_secret'][0]]
     end
 
     def saml_message(user_id)

data/lib/aggcat/client.rb

@@ -91,7 +91,7 @@ module Aggcat
     private
 
     def request(method, uri, *options)
-      response = access_token.send(method.to_sym, BASE_URL + uri, *options)
+      response = oauth_client.send(method.to_sym, BASE_URL + uri, *options)
       result = {:response_code => response.code, :response => parse_xml(response.body)}
       if response['challengeSessionId']
         result[:challenge_session_id] = response['challengeSessionId']

data/lib/aggcat/version.rb

@@ -1,3 +1,3 @@
 module Aggcat
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggcat
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: