aggcat 0.0.4 → 0.0.5

data/lib/aggcat.rb

@@ -7,8 +7,16 @@ module Aggcat
   class << self
     include Aggcat::Configurable
 
+    def scope(customer_id)
+      if !defined?(@customer_id) || @customer_id != customer_id
+        @customer_id = customer_id
+        @client = Aggcat::Client.new(options.merge({customer_id: customer_id}))
+      end
+    end
+
     def client
-      @client ||= Aggcat::Client.new(options)
+      raise ArgumentError.new('set the client scope first by calling Aggcat.scope(customer_id)') unless defined?(@customer_id)
+      @client
     end
 
     private

data/lib/aggcat/base.rb

@@ -25,18 +25,17 @@ module Aggcat
 
     protected
 
-    def access_token(user_id)
-      token = oauth_token(user_id)
+    def access_token
+      token = oauth_token
       consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, {:timeout => TIMEOUT})
       OAuth::AccessToken.new(consumer, token[:key], token[:secret])
     end
 
-    def oauth_token(user_id)
+    def oauth_token
       now = Time.now.utc
-      if @oauth_token.nil? || @oauth_token[:expire_at] <= now || @oauth_token[:user_id] != user_id
-        @oauth_token = new_token(saml_message(user_id))
+      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[:user_id] = user_id
       end
       @oauth_token
     end

data/lib/aggcat/client.rb

@@ -4,6 +4,7 @@ module Aggcat
     BASE_URL = 'https://financialdatafeed.platform.intuit.com/rest-war/v1'
 
     def initialize(options={})
+      raise ArgumentError.new('customer_id is required for scoping all requests') if options[:customer_id].nil? || options[:customer_id].to_s.empty?
       Aggcat::Configurable::KEYS.each do |key|
         instance_variable_set(:"@#{key}", options[key] || Aggcat.instance_variable_get(:"@#{key}"))
       end
@@ -21,7 +22,7 @@ module Aggcat
     def discover_and_add_accounts(institution_id, username, password)
       validate(institution_id: institution_id, username: username, password: password)
       body = credentials(institution_id, username, password)
-      post("/institutions/#{institution_id}/logins", body, {user_id: "#{institution_id}-#{username}"})
+      post("/institutions/#{institution_id}/logins", body)
     end
 
     def accounts
@@ -47,19 +48,19 @@ module Aggcat
       delete("/accounts/#{account_id}")
     end
 
-    def delete_customers
+    def delete_customer
       delete('/customers')
     end
 
     protected
 
-    def get(uri, options = {:user_id => 'default'})
-      response = access_token(options[:user_id]).get("#{BASE_URL}#{uri}")
+    def get(uri)
+      response = access_token.get("#{BASE_URL}#{uri}")
       {:response_code => response.code, :response => parse_xml(response.body)}
     end
 
-    def post(uri, message, options = {})
-      response = access_token(options[:user_id]).post("#{BASE_URL}#{uri}", message, {'Content-Type' => 'application/xml'})
+    def post(uri, message)
+      response = access_token.post("#{BASE_URL}#{uri}", message, {'Content-Type' => 'application/xml'})
       result = {:response_code => response.code, :response => parse_xml(response.body)}
       if response['challengeSessionId']
         result[:challenge_session_id] = response['challengeSessionId']
@@ -68,8 +69,8 @@ module Aggcat
       result
     end
 
-    def delete(uri, options = {:user_id => 'default'})
-      response = access_token(options[:user_id]).delete("#{BASE_URL}#{uri}")
+    def delete(uri)
+      response = access_token.delete("#{BASE_URL}#{uri}")
       {:response_code => response.code, :response => parse_xml(response.body)}
     end
 
@@ -78,7 +79,7 @@ module Aggcat
     def validate(args)
       args.each do |name, value|
         if value.nil? || value.to_s.empty?
-          raise ArgumentError, "#{name} is required"
+          raise ArgumentError.new("#{name} is required")
         end
       end
     end

data/lib/aggcat/configurable.rb

@@ -1,9 +1,9 @@
 module Aggcat
   module Configurable
 
-    attr_writer :issuer_id, :consumer_key, :consumer_secret, :certificate_path
+    attr_writer :issuer_id, :consumer_key, :consumer_secret, :certificate_path, :customer_id
 
-    KEYS = [:issuer_id, :consumer_key, :consumer_secret, :certificate_path]
+    KEYS = [:issuer_id, :consumer_key, :consumer_secret, :certificate_path, :customer_id]
 
     def configure
       yield self

data/lib/aggcat/version.rb

@@ -1,3 +1,3 @@
 module Aggcat
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

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