active_utils 1.0.2 → 1.0.3

data/lib/active_utils/common/connection.rb

@@ -72,6 +72,7 @@ module ActiveMerchant
         rescue Errno::ECONNREFUSED => e
           raise RetriableConnectionError, "The remote server refused the connection"
         rescue OpenSSL::X509::CertificateError => e
+          error(e.message, tag)
           raise ClientCertificateError, "The remote server did not accept the provided SSL certificate"
         rescue Timeout::Error, Errno::ETIMEDOUT => e
           raise ConnectionError, "The connection to the remote server timed out"
@@ -130,10 +131,12 @@ module ActiveMerchant
       rescue RetriableConnectionError => e
         retries -= 1
         retry unless retries.zero?
+        error(e.message, tag)
         raise ConnectionError, e.message
-      rescue ConnectionError
+      rescue ConnectionError => e
         retries -= 1
         retry if retry_safe && !retries.zero?
+        error(e.message, tag)
         raise
       end
     end
@@ -159,6 +162,10 @@ module ActiveMerchant
       log(:info, message, tag)
     end
 
+    def error(message, tag = nil)
+      log(:error, message, tag)
+    end
+
     def log(level, message, tag)
       message = "[#{tag}] #{message}" if tag
       logger.send(level, message) if logger

data/lib/active_utils/version.rb

@@ -1,3 +1,3 @@
 module ActiveUtils
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/unit/connection_test.rb

@@ -7,6 +7,7 @@ class ConnectionTest < Test::Unit::TestCase
 
     @endpoint   = 'https://example.com/tx.php'
     @connection = ActiveMerchant::Connection.new(@endpoint)
+    @connection.logger = stub(:info => nil, :debug => nil, :error => nil)
   end
 
   def test_connection_endpoint_parses_string_to_uri
@@ -26,6 +27,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_successful_get_request
+    @connection.logger.expects(:info).twice
     Net::HTTP.any_instance.expects(:get).with('/tx.php', {}).returns(@ok)
     response = @connection.request(:get, nil, {})
     assert_equal 'success', response.body
@@ -87,6 +89,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_unrecoverable_exception
+    @connection.logger.expects(:error).once
     Net::HTTP.any_instance.expects(:post).raises(EOFError)
 
     assert_raises(ActiveMerchant::ConnectionError) do
@@ -95,6 +98,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_failure_then_success_with_recoverable_exception
+    @connection.logger.expects(:error).never
     Net::HTTP.any_instance.expects(:post).times(2).raises(Errno::ECONNREFUSED).then.returns(@ok)
 
     assert_nothing_raised do
@@ -103,6 +107,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_failure_limit_reached
+    @connection.logger.expects(:error).once
     Net::HTTP.any_instance.expects(:post).times(ActiveMerchant::Connection::MAX_RETRIES).raises(Errno::ECONNREFUSED)
 
     assert_raises(ActiveMerchant::ConnectionError) do
@@ -133,6 +138,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_failure_with_ssl_certificate
+    @connection.logger.expects(:error).once
     Net::HTTP.any_instance.expects(:post).raises(OpenSSL::X509::CertificateError)
 
     assert_raises(ActiveMerchant::ClientCertificateError) do

metadata

@@ -1,91 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_utils
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.3
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-16 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164858760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 3
-        - 11
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.11
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164858760
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2164856640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2164856640
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2164854980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2164854980
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2164870020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2164870020
 description: 
-email: 
+email:
 - developers@jadedpixel.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -110,41 +86,31 @@ files:
 - test/unit/post_data_test.rb
 - test/unit/utils_test.rb
 - test/unit/validateable_test.rb
-has_rdoc: true
 homepage: http://github.com/shopify/active_utils
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: active_utils
-rubygems_version: 1.5.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Common utils used by active_merchant, active_fulfillment, and active_shipping
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/unit/connection_test.rb
 - test/unit/country_code_test.rb