active_utils 1.0.5 → 2.0.0

data/test/unit/connection_test.rb

@@ -63,7 +63,17 @@ class ConnectionTest < Test::Unit::TestCase
     end
   end
 
+  def test_override_max_retries
+    assert_not_equal 1, @connection.max_retries
+    @connection.max_retries = 1
+    assert_equal 1, @connection.max_retries
+  end
 
+  def test_override_ssl_version
+    assert_not_equal :SSLv3, @connection.ssl_version
+    @connection.ssl_version = :SSLv3
+    assert_equal :SSLv3, @connection.ssl_version
+  end
 
   def test_default_read_timeout
     assert_equal ActiveMerchant::Connection::READ_TIMEOUT, @connection.read_timeout
@@ -88,8 +98,30 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal false, @connection.verify_peer
   end
 
+  def test_default_ca_file
+    assert_equal ActiveMerchant::Connection::CA_FILE, @connection.ca_file
+    assert_equal ActiveMerchant::Connection::CA_FILE, @connection.send(:http).ca_file
+  end
+
+  def test_override_ca_file
+    @connection.ca_file = "/bogus"
+    assert_equal "/bogus", @connection.ca_file
+    assert_equal "/bogus", @connection.send(:http).ca_file
+  end
+
+  def test_default_ca_path
+    assert_equal ActiveMerchant::Connection::CA_PATH, @connection.ca_path
+    assert_equal ActiveMerchant::Connection::CA_PATH, @connection.send(:http).ca_path
+  end
+
+  def test_override_ca_path
+    @connection.ca_path = "/bogus"
+    assert_equal "/bogus", @connection.ca_path
+    assert_equal "/bogus", @connection.send(:http).ca_path
+  end
+
   def test_unrecoverable_exception
-    @connection.logger.expects(:error).once
+    @connection.logger.expects(:info).once
     Net::HTTP.any_instance.expects(:post).raises(EOFError)
 
     assert_raises(ActiveMerchant::ConnectionError) do
@@ -98,7 +130,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_failure_then_success_with_recoverable_exception
-    @connection.logger.expects(:error).never
+    @connection.logger.expects(:info).never
     Net::HTTP.any_instance.expects(:post).times(2).raises(Errno::ECONNREFUSED).then.returns(@ok)
 
     assert_nothing_raised do
@@ -107,7 +139,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_failure_limit_reached
-    @connection.logger.expects(:error).once
+    @connection.logger.expects(:info).once
     Net::HTTP.any_instance.expects(:post).times(ActiveMerchant::Connection::MAX_RETRIES).raises(Errno::ECONNREFUSED)
 
     assert_raises(ActiveMerchant::ConnectionError) do

data/test/unit/network_connection_retries_test.rb

@@ -23,7 +23,7 @@ class NetworkConnectionRetriesTest < Test::Unit::TestCase
   end
 
   def test_unrecoverable_exception_logged_if_logger_provided
-    @logger.expects(:error).once
+    @logger.expects(:info).once
     assert_raises(ActiveMerchant::ConnectionError) do
       retry_exceptions :logger => @logger do
         raise EOFError
@@ -52,7 +52,7 @@ class NetworkConnectionRetriesTest < Test::Unit::TestCase
   end
 
   def test_failure_limit_reached_logs_final_error
-    @logger.expects(:error).once
+    @logger.expects(:info).times(3)
     @requester.expects(:post).times(ActiveMerchant::NetworkConnectionRetries::DEFAULT_RETRIES).raises(Errno::ECONNREFUSED)
 
     assert_raises(ActiveMerchant::ConnectionError) do
@@ -72,6 +72,18 @@ class NetworkConnectionRetriesTest < Test::Unit::TestCase
     end
   end
 
+  def test_failure_then_success_logs_success
+    @logger.expects(:info).with(regexp_matches(/dropped/))
+    @logger.expects(:info).with(regexp_matches(/success/))
+    @requester.expects(:post).times(2).raises(EOFError).then.returns(@ok)
+
+    assert_nothing_raised do
+      retry_exceptions(:logger => @logger, :retry_safe => true) do
+        @requester.post
+      end
+    end
+  end
+
   def test_mixture_of_failures_with_retry_safe_enabled
     @requester.expects(:post).times(3).raises(Errno::ECONNRESET).
                                        raises(Errno::ECONNREFUSED).

data/test/unit/posts_data_test.rb

@@ -13,6 +13,29 @@ class PostsDataTest < Test::Unit::TestCase
     @poster = SSLPoster.new
   end
 
+  def test_ssl_request_retried_three_times_by_default
+    requester = stubs(:requester)
+    requester.expects(:post).raises(Errno::ECONNREFUSED).times(3)
+    Connection.any_instance.stubs(:http => requester)
+
+    assert_raises ActiveMerchant::ConnectionError do
+      @poster.raw_ssl_request(:post, "https://shopify.com", "", {})
+    end
+  end
+
+  def test_ssl_request_never_retried_if_max_retries_set
+    SSLPoster.max_retries = 1
+    requester = stubs(:requester)
+    requester.expects(:post).raises(Errno::ECONNREFUSED).times(1)
+    Connection.any_instance.stubs(:http => requester)
+
+    assert_raises ActiveMerchant::ConnectionError do
+      @poster.raw_ssl_request(:post, "https://shopify.com", "", {})
+    end
+  ensure
+    SSLPoster.max_retries = ActiveMerchant::Connection::MAX_RETRIES
+  end
+
   def test_logger_warns_if_ssl_strict_disabled
     @poster.logger = stub()
     @poster.logger.expects(:warn).with("PostsDataTest::SSLPoster using ssl_strict=false, which is insecure")

metadata

@@ -1,60 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: active_utils
 version: !ruby/object:Gem::Version
-  version: 1.0.5
   prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70097925445800 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.11
+    none: false
+  name: activesupport
   type: :runtime
   prerelease: false
-  version_requirements: *70097925445800
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70097925445380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.11
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: i18n
   type: :runtime
   prerelease: false
-  version_requirements: *70097925445380
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70097925444920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: *70097925444920
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70097925444500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: mocha
   type: :development
   prerelease: false
-  version_requirements: *70097925444500
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: 
 email:
 - developers@jadedpixel.com
@@ -96,20 +116,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: active_utils
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Common utils used by active_merchant, active_fulfillment, and active_shipping