aggcat 0.1.9 → 0.2.1

data/.travis.yml

@@ -4,7 +4,6 @@ before_install:
   - gem install bundler
 rvm:
   - jruby-19mode
-  - rbx-19mode
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/lib/aggcat/base.rb

@@ -21,7 +21,8 @@ module Aggcat
     TIME_FORMAT = '%Y-%m-%dT%T.%LZ'
     DATE_FORMAT = '%Y-%m-%d'
 
-    TIMEOUT = 120
+    OPEN_TIMEOUT = 15
+    READ_TIMEOUT = 120
 
     protected
 
@@ -30,12 +31,12 @@ module Aggcat
     end
 
     def oauth_consumer
-      @oauth_consumer ||= OAuth::Consumer.new(@consumer_key, @consumer_secret, {:timeout => TIMEOUT})
+      @oauth_consumer ||= OAuth::Consumer.new(@consumer_key, @consumer_secret, {timeout: READ_TIMEOUT, open_timeout: OPEN_TIMEOUT, verbose: @verbose})
     end
 
-    def oauth_token
+    def oauth_token(force=false)
       now = Time.now
-      if @oauth_token.nil? || @oauth_token_expire_at <= now
+      if force || @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
       end
@@ -50,7 +51,7 @@ module Aggcat
       request.set_form_data({:saml_assertion => message})
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      #http.set_debug_output($stdout)
+      http.set_debug_output($stdout) if @verbose
       response = http.request(request)
       params = CGI::parse(response.body)
       [params['oauth_token'][0], params['oauth_token_secret'][0]]
@@ -63,7 +64,7 @@ module Aggcat
       digest = Base64.encode64(OpenSSL::Digest::SHA1.digest(assertion)).strip
       signed_info = %[<ds:SignedInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod><ds:Reference URI="#_#{reference_id}"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod><ds:DigestValue>#{digest}</ds:DigestValue></ds:Reference></ds:SignedInfo>]
       key = OpenSSL::PKey::RSA.new(File.read(@certificate_path))
-      signature_value = Base64.encode64(key.sign(OpenSSL::Digest::SHA1.new, signed_info)).gsub(/\n/, '')
+      signature_value = Base64.encode64(key.sign(OpenSSL::Digest::SHA1.new(nil), signed_info)).gsub(/\n/, '')
       signature = %[<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference URI="#_#{reference_id}"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>#{digest}</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>#{signature_value}</ds:SignatureValue></ds:Signature>]
       assertion_with_signature = assertion.sub(/saml2:Issuer\>\<saml2:Subject/, "saml2:Issuer>#{signature}<saml2:Subject")
       Base64.encode64(assertion_with_signature)

data/lib/aggcat/client.rb

@@ -5,8 +5,9 @@ module Aggcat
 
     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?
+      options[:verbose] ||= false
       Aggcat::Configurable::KEYS.each do |key|
-        instance_variable_set(:"@#{key}", options[key] || Aggcat.instance_variable_get(:"@#{key}"))
+        instance_variable_set(:"@#{key}", !options[key].nil? ? options[key] : Aggcat.instance_variable_get(:"@#{key}"))
       end
     end
 
@@ -90,14 +91,22 @@ module Aggcat
 
     private
 
-    def request(method, path, *options)
-      response = oauth_client.send(method.to_sym, BASE_URL + path, *options)
-      result = {:status_code => response.code, :result => parse_xml(response.body)}
-      if response['challengeSessionId']
-        result[:challenge_session_id] = response['challengeSessionId']
-        result[:challenge_node_id] = response['challengeNodeId']
-      end
-      result
+    def request(http_method, path, *options)
+      tries = 0
+      begin
+        response = oauth_client.send(http_method, BASE_URL + path, *options)
+        result = {:status_code => response.code, :result => parse_xml(response.body)}
+        if response['challengeSessionId']
+          result[:challenge_session_id] = response['challengeSessionId']
+          result[:challenge_node_id] = response['challengeNodeId']
+        end
+        return result
+      rescue => e
+        raise e if tries >= 1
+        puts "failed to make API call - #{e.message}, retrying"
+        oauth_token(true)
+        tries += 1
+      end while tries == 1
     end
 
     def validate(args)

data/lib/aggcat/configurable.rb

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

data/lib/aggcat/version.rb

@@ -1,3 +1,3 @@
 module Aggcat
-  VERSION = '0.1.9'
+  VERSION = '0.2.1'
 end

data/test/aggcat/client_test.rb

@@ -14,6 +14,15 @@ class ClientTest < Test::Unit::TestCase
     )
   end
 
+  def test_arguments
+    assert_equal 'issuer_id', @client.instance_variable_get(:'@issuer_id')
+    assert_equal 'consumer_key', @client.instance_variable_get(:'@consumer_key')
+    assert_equal 'consumer_secret', @client.instance_variable_get(:'@consumer_secret')
+    assert_equal "#{fixture_path}/cert.key", @client.instance_variable_get(:'@certificate_path')
+    assert_equal 'default', @client.instance_variable_get(:'@customer_id')
+    assert_equal false, @client.instance_variable_get(:'@verbose')
+  end
+
   def test_institutions
     stub_get('/institutions').to_return(:body => fixture('institutions.xml'), :headers => {:content_type => 'application/xml; charset=utf-8'})
     response = @client.institutions
@@ -191,4 +200,17 @@ class ClientTest < Test::Unit::TestCase
     @client.update_login_confirmation(login_id, challenge_session_id, challenge_node_id, answer)
   end
 
+  def test_retry_success
+    institution_id = '100000'
+    stub_get("/institutions/#{institution_id}").to_timeout.times(1).then.to_return(:body => fixture('institution.xml'), :headers => {:content_type => 'application/xml; charset=utf-8'})
+    response = @client.institution(institution_id)
+    assert_equal institution_id, response[:result][:institution_detail][:institution_id]
+  end
+
+  def test_retry_failure
+    institution_id = '100000'
+    stub_get("/institutions/#{institution_id}").to_timeout.times(2)
+    assert_raise(Timeout::Error) { @client.institution(institution_id) }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggcat
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth