active_utils 2.2.3 → 3.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: def25d8c6aeca09233b68a4e1d6e5748215d0d50
-  data.tar.gz: 778d5f3ff833254e76024bc5e5b45bb439cda634
+SHA256:
+  metadata.gz: 3c236e83dc0c4b35da1b23d174deee446185fa5ba2eebd342bf28f329c33823d
+  data.tar.gz: 0cbc00453c11d9fde11335b86c62413d41bd4b29998922875a0c34de844e47c7
 SHA512:
-  metadata.gz: 843e2ba1585d9ce106af3ab0fa782665afdd82c2819fd3105986a93d42bb94d207e09e0210f40f3b01bb813fd75bdefe09911e766a489402734b69fd1bcb83d5
-  data.tar.gz: 7497572318783cb10d8f3eaacdbbb153ed8e5703d36260724d6b3e69d2afe224e337b25d5b9323ba8a71ef0178c31483b68315d786b1791fe574b98b0a93a3f6
+  metadata.gz: f8b71761d493d48d0a774bfaeab6d9ad06a608cc4188307070bcdba77ede74ff4ab16bac8a4bad04f29dc74280864034eaba9c1f3008b173ccb300a86a792ac8
+  data.tar.gz: d744cab2ae63bff0abcee7e4b1f627d87bc5836f9e8df7483d7b3da9e2693311177406bac67c4dc9399b045074baaa10325ae58f4c05ca817bc67b45d899fc4a

data/.github/probots.yml

@@ -0,0 +1,2 @@
+enabled:
+  - cla

data/.travis.yml

@@ -1,5 +1,41 @@
 language: ruby
-rvm:
-  - 1.9.3
-  - 2.1.2
 script: bundle exec rake test
+sudo: false
+
+rvm:
+- "2.0"
+- "2.1"
+- "2.2"
+- "2.3"
+- "2.4"
+- "2.5"
+
+before_install:
+- gem update bundler
+
+gemfile:
+- gemfiles/Gemfile.activesupport42
+- gemfiles/Gemfile.activesupport50
+- gemfiles/Gemfile.activesupport52
+- gemfiles/Gemfile.activesupport-master
+
+matrix:
+  exclude:
+    - rvm: "2.0"
+      gemfile: gemfiles/Gemfile.activesupport50
+    - rvm: "2.0"
+      gemfile: gemfiles/Gemfile.activesupport52
+    - rvm: "2.0"
+      gemfile: gemfiles/Gemfile.activesupport-master
+    - rvm: "2.1"
+      gemfile: gemfiles/Gemfile.activesupport50
+    - rvm: "2.1"
+      gemfile: gemfiles/Gemfile.activesupport52
+    - rvm: "2.1"
+      gemfile: gemfiles/Gemfile.activesupport-master
+    - rvm: "2.2"
+      gemfile: gemfiles/Gemfile.activesupport-master
+    - rvm: "2.3"
+      gemfile: gemfiles/Gemfile.activesupport-master
+    - rvm: "2.4"
+      gemfile: gemfiles/Gemfile.activesupport-master

data/CHANGELOG.md

@@ -0,0 +1,92 @@
+# ActiveUtils changelog
+
+### Version 3.3.19 (February 24, 2020)
+- Support `net/http` default proxy settings from `ENV['http_proxy']`
+- Support usage of custom ssl certificate with `ENV['SSL_CERT_FILE']`, default variable for Ruby
+
+### Version 3.3.17 (February 24, 2020)
+- Add support for PATCH HTTP method in `ActiveUtils#Connection`
+
+### Version 3.3.16 (December 18, 2018)
+- Add `VU` to `ActiveUtils::Country::COUNTRIES_THAT_DO_NOT_USE_POSTALCODES`
+
+### Version 3.3.15 (November 29, 2018)
+- Remove support to Ruby 1.9 and ActiveSupport `< 4`
+- Remove the upperbound constraint on ActiveSupport
+
+### Version 3.3.14 (November 28, 2018)
+- Add `MW` to `ActiveUtils::Country::COUNTRIES_THAT_DO_NOT_USE_POSTALCODES`
+
+### Version 3.3.13 (November 26, 2018)
+- Add support for custom retriable exceptions in `NetworkConnectionRetries#retry_exceptions`
+
+### Version 3.3.12 (July 11, 2018)
+- Update CA bundle
+
+### Version 3.3.11 (March 14, 2018)
+- Add the DigiCert Global Root G2 to the CA bundle
+
+### Version 3.3.10 (February 28, 2018)
+- Support ActiveSupport 5.2
+
+### Version 3.3.9 (September 28, 2017)
+- Add remaining currencies to `ActiveUtils::CurrencyCode::ISO_CURRENCIES`
+- Update bundler in `travis.yml`
+
+### Version 3.3.8 (August 15, 2017)
+- Add `BO` to `ActiveUtils::Country::COUNTRIES_THAT_DO_NOT_USE_POSTALCODES`
+
+### Version 3.3.7 (June 26, 2017)
+- Add `CVE` to `ActiveUtils::CurrencyCode::ISO_CURRENCIES`
+
+### Version 3.3.6 (May 23, 2017)
+- Add `South Sudan` country in `ActiveUtils::Country::COUNTRIES_THAT_DO_NOT_USE_POSTALCODES`
+
+### Version 3.3.5 (May 18, 2017)
+- Add `South Sudan` and `Antarctica` countries in `ActiveUtils::Country::COUNTRIES`
+
+### Version 3.3.4 (Apr. 18, 2017)
+- Add `Ghana` country in `ActiveUtils::Country::COUNTRIES_THAT_DO_NOT_USE_POSTALCODES`
+
+### Version 3.3.3 (Apr. 7, 2017)
+- Add the `Aland Islands` country in `ActiveUtils::Country::COUNTRIES`
+
+### Version 3.3.2 (Mar. 28, 2017)
+- Changed country name of "Libyan Arab Jamahiriya" to Libya, as per country name change in 2011.
+
+### Version 3.3.1 (Mar. 28, 2017)
+- Bump ActiveSupport requirement to **< 5.2.0**.
+
+### Version 3.3.0 (Mar. 10, 2017)
+- Reduced default PostsData open_timeout from 60 seconds to 2, and read_timeout from 60 seconds to 10. Subclasses can and should override those values.
+- Replace Kosovo's alpha 2 and alpha 3 ISO codes from `KV` to `XK` and from `KSV` to `XKX`.
+
+### Version 3.2.5 (Feb. 2, 2017)
+- Add the `TMT` currency in the supported currency codes
+
+### Version 3.2.4 (Dec. 16, 2016)
+- Add the `Bonaire` country in `ActiveUtils::Country::COUNTRIES`
+
+### Version 3.2.3 (Nov. 21, 2016)
+- Add the `:delay` option in `ActiveUtils::NetworkConnectionRetries`
+
+### Version 3.2.2 (Jul. 4, 2016)
+- Add tests for Rails 5 support
+
+### Version 3.2.1 (Oct. 26, 2015)
+- Add the malaysian currency code "RM" in `ActiveUtils::CurrencyCode`
+
+### Version 3.2.0 (Oct. 13, 2015)
+- Add #uses_postal_codes? to `ActiveUtils::Country`
+
+### Version 3.1.0 (Sept. 30, 2015)
+- Use ActiveUtils::HTTPRequestError as base exception class
+- Add proxy address and port configuration
+- Add support for Sin Maarten
+
+### Version 3.0.0 (Jan. 16, 2015)
+
+- Fully decoupled from ActiveMerchant: no longer uses `ActiveMerchant::` as namespace, but uses `ActiveUtils::` instead.
+- Bump ActiveSupport requirement to **>= 3.2**.
+- The `Utils` module to generate unique identifiers has been removed. Use `SecureRandom` instead.
+- Improved test setup.

data/CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# Contributing to ActiveUtils
+
+We gladly accept bugfixes to this library. Please read the guidelines for reporting issues and submitting pull requests below.
+
+### Reporting issues
+
+- Include the version of ActiveUtils, Ruby, and ActiveSupport you are using.
+- If you run into an unexpected exception, please include a stacktrace.
+- Try to include a code snippet that demonstrates the problem.
+
+### Pull request guidelines
+
+1. [Fork it](http://github.com/Shopify/active_utils/fork) and clone your new repo
+2. Create a branch (`git checkout -b my_awesome_feature`)
+3. Commit your changes (`git add my/awesome/file.rb; git commit -m "Added my awesome feature"`)
+4. Push your changes to your fork (`git push origin my_awesome_feature`)
+5. Open a [Pull Request](https://github.com/shopify/active_utils/pulls)
+
+The most important guidelines:
+
+- All changes should be covered by tests.
+- Your code should support all the Ruby versions and ActiveSupport versions we have enabled on Travis CI.
+- Do not update the CHANGELOG, or the `ActiveUtils::VERSION` constant.
+
+Final note: maybe you should also update the mirrored version in ActiveMerchant.
+
+### Releasing
+
+1. Check the [semantic versioning page](http://semver.org) for info on how to version the new release.
+2. Update the  `ActiveUtils::VERSION` constant in **lib/active_utils/version.rb**.
+3. Add a `CHANGELOG.md` entry for the new release with the date.
+4. Release the gem to rubygems using ShipIt (this will create tag/push during deploy)

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -1,16 +1,30 @@
-# Active Utils
-
-Active Utils extracts commonly used modules and classes used by [Active Merchant](http://github.com/Shopify/active_merchant), [Active Shipping](http://github.com/Shopify/active_shipping), and [Active Fulfillment](http://github.com/Shopify/active_fulfillment).
-
-### Includes
-
-* Connection - base class for making HTTP requests
-* Country - find countries mapped by name, country codes, and numeric values
-* Error - common error classes used throughout the Active projects
-* PostData - helper class for managing required fields that are to be POST-ed
-* PostsData - making SSL HTTP requests
-* RequiresParameters - helper method to ensure the required parameters are passed in
-* Utils - common utils such as uid generator
-* Validateable - module used for making models validateable
-* NetworkConnectionRetries - module for retrying network connections when connection errors occur
-* CurrencyCode - ensure currency codes are ISO, and convert colloquial codes to ISO.
+# ActiveUtils [![Build Status](https://travis-ci.org/Shopify/active_utils.svg?branch=master)](https://travis-ci.org/Shopify/active_utils)
+
+ActiveUtils extracts commonly used modules and classes extracted from [Active Merchant](http://github.com/Shopify/active_merchant), to be used for other integration libraries.
+
+### Included modules and classes
+
+* `Connection` - base class for making HTTP requests
+* `Country` - find countries mapped by name, country codes, and numeric values
+* `Error` - common error classes used throughout the Active projects
+* `PostData` - helper class for managing required fields that are to be POST-ed
+* `PostsData` - making SSL HTTP requests
+* `RequiresParameters` - helper method to ensure the required parameters are passed in
+* `Validateable` - module used for making models validateable
+* `NetworkConnectionRetries` - module for retrying network connections when connection errors occur
+* `CurrencyCode` - ensure currency codes are ISO, and convert colloquial codes to ISO.
+
+### Libraries that depend on ActiveUtils
+
+- [ActiveShipping](https://github.com/Shopify/active_shipping)
+- [ActiveFulfillment](https://github.com/Shopify/active_fulfillment)
+- [OffsitePayments](https://github.com/Shopify/offsite_payments)
+
+### ActiveMerchant link
+
+While most of the code in this library was extracted from ActiveMerchant, ActiveMerchant itself doesn't use this library anymore. For PCI compliance reasons, we aim to keep the number of dependencies of ActiveMerchant as low as possible. For this reason, many of these classes and modules are mirrored in ActiveMerchant (e.g. `ActiveUtils::Connection` vs. `ActiveMerchant::Connection`. When making changes to this library, you may want to mirror those changes in ActiveMerchant.
+
+### Misc
+
+- This project is MIT licensed.
+- Contributions are gladly accepted! See `CONTRIBUTING.md` for more information.

data/active_utils.gemspec

@@ -14,12 +14,15 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "active_utils"
 
-  s.add_dependency('activesupport', '>= 2.3.11')
+  s.add_dependency('activesupport', '>= 4.2')
   s.add_dependency('i18n')
 
   s.add_development_dependency('rake')
+  s.add_development_dependency('minitest')
   s.add_development_dependency('mocha')
 
+  s.metadata['allowed_push_host'] = 'https://rubygems.org'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/gemfiles/Gemfile.activesupport-master

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'activesupport', github: 'rails/rails'

data/gemfiles/Gemfile.activesupport42

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'activesupport', '~> 4.2.0'

data/gemfiles/Gemfile.activesupport50

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'activesupport', '~> 5.0.0'

data/gemfiles/Gemfile.activesupport52

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'activesupport', github: 'rails/rails', branch: '5-2-stable'

data/lib/active_utils/{common/connection.rb → connection.rb}

@@ -3,7 +3,7 @@ require 'net/http'
 require 'net/https'
 require 'benchmark'
 
-module ActiveMerchant
+module ActiveUtils
   class Connection
     include NetworkConnectionRetries
 
@@ -11,9 +11,12 @@ module ActiveMerchant
     OPEN_TIMEOUT = 60
     READ_TIMEOUT = 60
     VERIFY_PEER = true
-    CA_FILE = (File.dirname(__FILE__) + '/../../certs/cacert.pem')
+    # allow using proxy for https calls by pointing to it's certificate
+    # SSL_CERT_FILE is variable used by Ruby to look for certificate for net/http
+    CA_FILE = ENV.fetch('SSL_CERT_FILE', File.dirname(__FILE__) + '/../certs/cacert.pem')
     CA_PATH = nil
     RETRY_SAFE = false
+    PROXY_ADDRESS = :ENV
     RUBY_184_POST_HEADERS = { "Content-Type" => "application/x-www-form-urlencoded" }
 
     attr_accessor :endpoint
@@ -45,7 +48,7 @@ module ActiveMerchant
       @max_retries  = MAX_RETRIES
       @ignore_http_status = false
       @ssl_version = nil
-      @proxy_address = nil
+      @proxy_address = PROXY_ADDRESS
       @proxy_port = nil
     end
 
@@ -69,6 +72,9 @@ module ActiveMerchant
             when :put
               debug body
               http.put(endpoint.request_uri, body, headers)
+            when :patch
+              debug body
+              http.patch(endpoint.request_uri, body, headers)
             when :delete
               # It's kind of ambiguous whether the RFC allows bodies
               # for DELETE requests. But Net::HTTP's delete method

data/lib/active_utils/{common/country.rb → country.rb}

@@ -1,7 +1,7 @@
 #!ruby19
 # encoding: utf-8
 
-module ActiveMerchant #:nodoc:
+module ActiveUtils #:nodoc:
   class InvalidCountryCodeError < StandardError
   end
 
@@ -64,12 +64,14 @@ module ActiveMerchant #:nodoc:
 
     COUNTRIES = [
       { :alpha2 => 'AF', :name => 'Afghanistan', :alpha3 => 'AFG', :numeric => '004' },
+      { :alpha2 => 'AX', :name => 'Aland Islands', :alpha3 => 'ALA', :numeric => '248' },
       { :alpha2 => 'AL', :name => 'Albania', :alpha3 => 'ALB', :numeric => '008' },
       { :alpha2 => 'DZ', :name => 'Algeria', :alpha3 => 'DZA', :numeric => '012' },
       { :alpha2 => 'AS', :name => 'American Samoa', :alpha3 => 'ASM', :numeric => '016' },
       { :alpha2 => 'AD', :name => 'Andorra', :alpha3 => 'AND', :numeric => '020' },
       { :alpha2 => 'AO', :name => 'Angola', :alpha3 => 'AGO', :numeric => '024' },
       { :alpha2 => 'AI', :name => 'Anguilla', :alpha3 => 'AIA', :numeric => '660' },
+      { :alpha2 => 'AQ', :name => 'Antarctica', :alpha3 => 'ATA', :numeric => '010' },
       { :alpha2 => 'AG', :name => 'Antigua and Barbuda', :alpha3 => 'ATG', :numeric => '028' },
       { :alpha2 => 'AR', :name => 'Argentina', :alpha3 => 'ARG', :numeric => '032' },
       { :alpha2 => 'AM', :name => 'Armenia', :alpha3 => 'ARM', :numeric => '051' },
@@ -88,6 +90,7 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'BM', :name => 'Bermuda', :alpha3 => 'BMU', :numeric => '060' },
       { :alpha2 => 'BT', :name => 'Bhutan', :alpha3 => 'BTN', :numeric => '064' },
       { :alpha2 => 'BO', :name => 'Bolivia', :alpha3 => 'BOL', :numeric => '068' },
+      { :alpha2 => 'BQ', :name => 'Bonaire, Sint Eustatius and Saba', :alpha3 => 'BES', :numeric => '535' },
       { :alpha2 => 'BA', :name => 'Bosnia and Herzegovina', :alpha3 => 'BIH', :numeric => '070' },
       { :alpha2 => 'BW', :name => 'Botswana', :alpha3 => 'BWA', :numeric => '072' },
       { :alpha2 => 'BV', :name => 'Bouvet Island', :alpha3 => 'BVD', :numeric => '074' },
@@ -179,7 +182,7 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'KI', :name => 'Kiribati', :alpha3 => 'KIR', :numeric => '296' },
       { :alpha2 => 'KP', :name => 'Korea, Democratic People\'s Republic of', :alpha3 => 'PRK', :numeric => '408' },
       { :alpha2 => 'KR', :name => 'Korea, Republic of', :alpha3 => 'KOR', :numeric => '410' },
-      { :alpha2 => 'KV', :name => 'Kosovo', :alpha3 => 'KSV', :numeric => '377' },
+      { :alpha2 => 'XK', :name => 'Kosovo', :alpha3 => 'XKX', :numeric => '377' },
       { :alpha2 => 'KW', :name => 'Kuwait', :alpha3 => 'KWT', :numeric => '414' },
       { :alpha2 => 'KG', :name => 'Kyrgyzstan', :alpha3 => 'KGZ', :numeric => '417' },
       { :alpha2 => 'LA', :name => 'Lao People\'s Democratic Republic', :alpha3 => 'LAO', :numeric => '418' },
@@ -187,7 +190,7 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'LB', :name => 'Lebanon', :alpha3 => 'LBN', :numeric => '422' },
       { :alpha2 => 'LS', :name => 'Lesotho', :alpha3 => 'LSO', :numeric => '426' },
       { :alpha2 => 'LR', :name => 'Liberia', :alpha3 => 'LBR', :numeric => '430' },
-      { :alpha2 => 'LY', :name => 'Libyan Arab Jamahiriya', :alpha3 => 'LBY', :numeric => '434' },
+      { :alpha2 => 'LY', :name => 'Libya', :alpha3 => 'LBY', :numeric => '434' },
       { :alpha2 => 'LI', :name => 'Liechtenstein', :alpha3 => 'LIE', :numeric => '438' },
       { :alpha2 => 'LT', :name => 'Lithuania', :alpha3 => 'LTU', :numeric => '440' },
       { :alpha2 => 'LU', :name => 'Luxembourg', :alpha3 => 'LUX', :numeric => '442' },
@@ -262,12 +265,14 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'SC', :name => 'Seychelles', :alpha3 => 'SYC', :numeric => '690' },
       { :alpha2 => 'SL', :name => 'Sierra Leone', :alpha3 => 'SLE', :numeric => '694' },
       { :alpha2 => 'SG', :name => 'Singapore', :alpha3 => 'SGP', :numeric => '702' },
+      { :alpha2 => 'SX', :name => 'Sint Maarten (Netherlands Part)', :alpha3 => 'SXM', :numeric => '534' },
       { :alpha2 => 'SK', :name => 'Slovakia', :alpha3 => 'SVK', :numeric => '703' },
       { :alpha2 => 'SI', :name => 'Slovenia', :alpha3 => 'SVN', :numeric => '705' },
       { :alpha2 => 'SB', :name => 'Solomon Islands', :alpha3 => 'SLB', :numeric => '090' },
       { :alpha2 => 'SO', :name => 'Somalia', :alpha3 => 'SOM', :numeric => '706' },
       { :alpha2 => 'ZA', :name => 'South Africa', :alpha3 => 'ZAF', :numeric => '710' },
       { :alpha2 => 'GS', :name => 'South Georgia and the South Sandwich Islands', :alpha3 => 'SGS', :numeric => '239' },
+      { :alpha2 => 'SS', :name => 'South Sudan', :alpha3 => 'SSD', :numeric => '728' },
       { :alpha2 => 'ES', :name => 'Spain', :alpha3 => 'ESP', :numeric => '724' },
       { :alpha2 => 'LK', :name => 'Sri Lanka', :alpha3 => 'LKA', :numeric => '144' },
       { :alpha2 => 'SD', :name => 'Sudan', :alpha3 => 'SDN', :numeric => '736' },
@@ -312,6 +317,16 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'AX', :name => 'Åland Islands', :alpha3 => 'ALA', :numeric => '248' }
     ]
 
+    COUNTRIES_THAT_DO_NOT_USE_POSTALCODES = %w(
+      QA BZ BS BF BJ AG AE AI AO AW HK
+      FJ ML MW JM ZW YE UG TV TT TG TD PA
+      CW GH SS BO VU DJ SL TO
+    )
+
+    def uses_postal_codes?
+      !COUNTRIES_THAT_DO_NOT_USE_POSTALCODES.include?(code(:alpha2).value)
+    end
+
     def self.find(name)
       raise InvalidCountryCodeError, "Cannot lookup country for an empty name" if name.blank?
 

data/lib/active_utils/currency_code.rb

@@ -0,0 +1,56 @@
+module ActiveUtils
+  class InvalidCurrencyCodeError < StandardError
+  end
+
+  class CurrencyCode
+    ISO_CURRENCIES = [
+      "AED", "AFN", "ALL", "AMD", "ANG", "AOA", "ARS", "AUD", "AWG", "AZN", "BAM", "BBD", "BDT", "BGN",
+      "BHD", "BIF", "BMD", "BND", "BOB", "BOV", "BRL", "BSD", "BTN", "BWP", "BYR", "BYN", "BZD", "CAD",
+      "CDF", "CHE", "CHF", "CHW", "CLP", "CLF", "CNY", "COP", "COU", "CRC", "CUC", "CUP", "CVE", "CZK",
+      "DKK", "DJF", "DOP", "DZD", "EGP", "ERN", "ETB", "EUR", "FJD", "FKP", "GBP", "GEL", "GHS", "GIP",
+      "GMD", "GNF", "GTQ", "GYD", "HKD", "HNL", "HRK", "HTG", "HUF", "IDR", "ILS", "INR", "IRR", "ISK",
+      "IQD", "JEP", "JMD", "JOD", "JPY", "KES", "KGS", "KHR", "KMF", "KPY", "KRW", "KWD", "KYD", "KZT",
+      "LAK", "LBP", "LKR", "LRD", "LSL", "LTL", "LVL", "LYD", "MAD", "MDL", "MGA", "MKD", "MMK", "MNT",
+      "MOP", "MRO", "MUR", "MVR", "MWK", "MXN", "MXV", "MYR", "MZN", "NAD", "NGN", "NIO", "NOK", "NPR",
+      "NZD", "OMR", "PAB", "PEN", "PGK", "PHP", "PKR", "PLN", "PYG", "QAR", "RON", "RSD", "RUB", "RWF",
+      "SAR", "SBD", "SCR", "SDG", "SEK", "SGD", "SHP", "SLL", "SOS", "SRD", "SSP", "STD", "SVC", "SYP",
+      "SZL", "THB", "TJS", "TMT", "TND", "TOP", "TRY", "TTD", "TWD", "TZS", "UAH", "UGX", "USD", "USN",
+      "UYI", "UYU", "UZS", "VEF", "VND", "VUV", "WST", "XAF", "XAG", "XAU", "XBA", "XBB", "XBC", "XBD",
+      "XCD", "XDR", "XOF", "XPD", "XPF", "XPT", "XSU", "XTS", "XUA", "XXX", "YER", "ZAR", "ZMW", "ZWL"
+    ]
+
+    NON_ISO_TO_ISO = {
+      "ARN" => "ARS", # Argentinian Pesos
+      "AZM" => "AZN", # Azerbaijan New Manat
+      "CHP" => "CLP", # Chilean Pesos
+      "DHS" => "AED", # UAE Dirhams
+      "ECD" => "XCD", # East Caribbean Dollars
+      "GHC" => "GHS", # Ghana Cedi
+      "JAD" => "JMD", # Jamaican Dollars
+      "JYE" => "JPY", # Japanese Yen
+      "KUD" => "KWD", # Kuwaiti Dinars
+      "MZM" => "MZN", # Mozambique Metical
+      "NMP" => "MXN", # Mexican Pesos
+      "NTD" => "TWD", # New Taiwan Dollars / Taiwan New Dollars
+      "RDD" => "DOP", # Dominican Pesos
+      "RM" => "MYR",  # Malaysia Ringgit
+      "RMB" => "CNY", # Chinese Renminbi
+      "SFR" => "CHF", # Swiss Francs
+      "SID" => "SGD", # Singapore Dollars
+      "SOL" => "PES", # Peruvian Sol
+      "UKL" => "GBP", # Great Britain Pounds
+      "WON" => "KRW"  # South Korean Won
+    }
+
+    def self.standardize(code)
+      code = code.upcase unless code.nil?
+
+      return code if is_iso?(code)
+      NON_ISO_TO_ISO[code] || raise(InvalidCurrencyCodeError, "#{code} is not an ISO currency, nor can it be converted to one.")
+    end
+
+    def self.is_iso?(code)
+      ISO_CURRENCIES.include? code
+    end
+  end
+end

data/lib/active_utils/{common/error.rb → error.rb}

@@ -1,14 +1,16 @@
-module ActiveMerchant #:nodoc:
-  class ActiveMerchantError < StandardError #:nodoc:
+module ActiveUtils #:nodoc:
+  class HTTPRequestError < StandardError #:nodoc:
   end
 
-  class ConnectionError < ActiveMerchantError # :nodoc:
+  ActiveUtilsError = HTTPRequestError #:nodoc:
+
+  class ConnectionError < HTTPRequestError # :nodoc:
   end
 
   class RetriableConnectionError < ConnectionError # :nodoc:
   end
 
-  class ResponseError < ActiveMerchantError # :nodoc:
+  class ResponseError < HTTPRequestError # :nodoc:
     attr_reader :response
 
     def initialize(response, message = nil)
@@ -21,9 +23,9 @@ module ActiveMerchant #:nodoc:
     end
   end
 
-  class ClientCertificateError < ActiveMerchantError # :nodoc
+  class ClientCertificateError < HTTPRequestError # :nodoc
   end
 
-  class InvalidResponseError < ActiveMerchantError # :nodoc
+  class InvalidResponseError < HTTPRequestError # :nodoc
   end
 end

data/lib/active_utils/{common/network_connection_retries.rb → network_connection_retries.rb}

@@ -1,4 +1,4 @@
-module ActiveMerchant
+module ActiveUtils
   module NetworkConnectionRetries
     DEFAULT_RETRIES = 3
     DEFAULT_CONNECTION_ERRORS = {
@@ -10,25 +10,30 @@ module ActiveMerchant
       OpenSSL::SSL::SSLError => "The SSL connection to the remote server could not be established"
     }
 
+    DEFAULT_RETRY_ERRORS = {
+      Errno::ECONNREFUSED => "The remote server refused the connection"
+    }
+
     def self.included(base)
       base.send(:attr_accessor, :retry_safe)
     end
 
     def retry_exceptions(options={})
       connection_errors = DEFAULT_CONNECTION_ERRORS.merge(options[:connection_exceptions] || {})
+      retry_errors = DEFAULT_RETRY_ERRORS.merge(options[:retriable_exceptions] || {})
 
       retry_network_exceptions(options) do
         begin
           yield
-        rescue Errno::ECONNREFUSED => e
-          raise ActiveMerchant::RetriableConnectionError, "The remote server refused the connection"
+        rescue *retry_errors.keys => e
+          raise ActiveUtils::RetriableConnectionError, derived_error_message(retry_errors, e.class)
         rescue OpenSSL::X509::CertificateError => e
           NetworkConnectionRetries.log(options[:logger], :error, e.message, options[:tag])
-          raise ActiveMerchant::ClientCertificateError, "The remote server did not accept the provided SSL certificate"
+          raise ActiveUtils::ClientCertificateError, "The remote server did not accept the provided SSL certificate"
         rescue Zlib::BufError => e
-          raise ActiveMerchant::InvalidResponseError, "The remote server replied with an invalid response"
+          raise ActiveUtils::InvalidResponseError, "The remote server replied with an invalid response"
         rescue *connection_errors.keys => e
-          raise ActiveMerchant::ConnectionError, connection_errors[e.class]
+          raise ActiveUtils::ConnectionError, derived_error_message(connection_errors, e.class)
         end
       end
     end
@@ -45,16 +50,22 @@ module ActiveMerchant
         result = yield
         log_with_retry_details(options[:logger], initial_retries-retries + 1, Time.now.to_f - request_start, "success", options[:tag])
         result
-      rescue ActiveMerchant::RetriableConnectionError => e
+      rescue ActiveUtils::RetriableConnectionError => e
         retries -= 1
 
         log_with_retry_details(options[:logger], initial_retries-retries, Time.now.to_f - request_start, e.message, options[:tag])
-        retry unless retries.zero?
-        raise ActiveMerchant::ConnectionError, e.message
-      rescue ActiveMerchant::ConnectionError, ActiveMerchant::InvalidResponseError => e
+        unless retries.zero?
+          Kernel.sleep(options[:delay]) if options[:delay]
+          retry
+        end
+        raise ActiveUtils::ConnectionError, e.message
+      rescue ActiveUtils::ConnectionError, ActiveUtils::InvalidResponseError => e
         retries -= 1
         log_with_retry_details(options[:logger], initial_retries-retries, Time.now.to_f - request_start, e.message, options[:tag])
-        retry if (options[:retry_safe] || retry_safe) && !retries.zero?
+        if (options[:retry_safe] || retry_safe) && !retries.zero?
+          Kernel.sleep(options[:delay]) if options[:delay]
+          retry
+        end
         raise
       end
     end
@@ -69,5 +80,10 @@ module ActiveMerchant
     def log_with_retry_details(logger, attempts, time, message, tag)
       NetworkConnectionRetries.log(logger, :info, "connection_attempt=%d connection_request_time=%.4fs connection_msg=\"%s\"" % [attempts, time, message], tag)
     end
+
+    def derived_error_message(errors, klass)
+      key = (errors.keys & klass.ancestors).first
+      key ? errors[key] : nil
+    end
   end
 end

data/lib/active_utils/{common/post_data.rb → post_data.rb}

@@ -1,6 +1,6 @@
 require 'cgi'
 
-module ActiveMerchant
+module ActiveUtils
   class PostData < Hash
     class_attribute :required_fields, :instance_writer => false
     self.required_fields = []

data/lib/active_utils/{common/posts_data.rb → posts_data.rb}

@@ -1,27 +1,32 @@
-module ActiveMerchant #:nodoc:
+module ActiveUtils #:nodoc:
   module PostsData  #:nodoc:
 
     def self.included(base)
-      base.superclass_delegating_accessor :ssl_strict
+      base.class_attribute :ssl_strict
       base.ssl_strict = true
 
-      base.superclass_delegating_accessor :ssl_version
+      base.class_attribute :ssl_version
       base.ssl_version = nil
 
       base.class_attribute :retry_safe
       base.retry_safe = false
 
-      base.superclass_delegating_accessor :open_timeout
-      base.open_timeout = 60
+      base.class_attribute :open_timeout
+      base.open_timeout = 2
 
-      base.superclass_delegating_accessor :read_timeout
-      base.read_timeout = 60
+      base.class_attribute :read_timeout
+      base.read_timeout = 10
 
-      base.superclass_delegating_accessor :max_retries
+      base.class_attribute :max_retries
       base.max_retries = Connection::MAX_RETRIES
 
-      base.superclass_delegating_accessor :logger
-      base.superclass_delegating_accessor :wiredump_device
+      base.class_attribute :logger
+      base.class_attribute :wiredump_device
+
+      base.class_attribute :proxy_address
+      base.proxy_address = Connection::PROXY_ADDRESS
+
+      base.class_attribute :proxy_port
     end
 
     def ssl_get(endpoint, headers={})
@@ -38,6 +43,7 @@ module ActiveMerchant #:nodoc:
 
     def raw_ssl_request(method, endpoint, data, headers = {})
       logger.warn "#{self.class} using ssl_strict=false, which is insecure" if logger unless ssl_strict
+      logger.warn "#{self.class} posting to plaintext endpoint, which is insecure" if logger unless endpoint =~ /^https:/
 
       connection = new_connection(endpoint)
       connection.open_timeout = open_timeout
@@ -55,6 +61,9 @@ module ActiveMerchant #:nodoc:
 
       connection.ignore_http_status = @options[:ignore_http_status] if @options
 
+      connection.proxy_address = proxy_address
+      connection.proxy_port = proxy_port
+
       connection.request(method, data, headers)
     end