active_utils 2.2.3 → 3.0.0.pre1

data/lib/active_utils/validateable.rb

@@ -0,0 +1,81 @@
+module ActiveUtils #:nodoc:
+  module Validateable #:nodoc:
+    def valid?
+      errors.clear
+
+      before_validate if respond_to?(:before_validate, true)
+      validate if respond_to?(:validate, true)
+
+      errors.empty?
+    end
+
+    def initialize(attributes = {})
+      self.attributes = attributes
+    end
+
+    def errors
+      @errors ||= Errors.new(self)
+    end
+
+    private
+
+    def attributes=(attributes)
+      unless attributes.nil?
+        for key, value in attributes
+          send("#{key}=", value )
+        end
+      end
+    end
+
+    # This hash keeps the errors of the object
+    class Errors < HashWithIndifferentAccess
+
+      def initialize(base)
+        super() { |h, k|  h[k] = [] ; h[k] }
+        @base = base
+      end
+
+      def count
+        size
+      end
+
+      def empty?
+        all? { |k, v| v && v.empty? }
+      end
+
+      # returns a specific fields error message.
+      # if more than one error is available we will only return the first. If no error is available
+      # we return an empty string
+      def on(field)
+        self[field].to_a.first
+      end
+
+      def add(field, error)
+        self[field] << error
+      end
+
+      def add_to_base(error)
+        add(:base, error)
+      end
+
+      def each_full
+        full_messages.each { |msg| yield msg }
+      end
+
+      def full_messages
+        result = []
+
+        self.each do |key, messages|
+          next if messages.blank?
+          if key == 'base'
+            result << "#{messages.first}"
+          else
+            result << "#{key.to_s.humanize} #{messages.first}"
+          end
+        end
+
+        result
+      end
+    end
+  end
+end

data/lib/active_utils/version.rb

@@ -1,3 +1,3 @@
 module ActiveUtils
-  VERSION = "2.2.3"
+  VERSION = "3.0.0.pre1"
 end

data/lib/active_utils.rb

@@ -1,21 +1,26 @@
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/conversions'
+require 'active_support/deprecation'
 require 'active_support/core_ext/class/attribute'
 
-module ActiveMerchant
-  autoload :NetworkConnectionRetries,  'active_utils/common/network_connection_retries'
-  autoload :Connection,                'active_utils/common/connection'
-  autoload :Country,                   'active_utils/common/country'
-  autoload :CountryCode,               'active_utils/common/country'
-  autoload :ActiveMerchantError,       'active_utils/common/error'
-  autoload :ConnectionError,           'active_utils/common/error'
-  autoload :RetriableConnectionError,  'active_utils/common/error'
-  autoload :ResponseError,             'active_utils/common/error'
-  autoload :ClientCertificateError,    'active_utils/common/error'
-  autoload :PostData,                  'active_utils/common/post_data'
-  autoload :PostsData,                 'active_utils/common/posts_data'
-  autoload :RequiresParameters,        'active_utils/common/requires_parameters'
-  autoload :Utils,                     'active_utils/common/utils'
-  autoload :Validateable,              'active_utils/common/validateable'
-  autoload :CurrencyCode,              'active_utils/common/currency_code'
+module ActiveUtils
+  autoload :NetworkConnectionRetries,  'active_utils/network_connection_retries'
+  autoload :Connection,                'active_utils/connection'
+  autoload :Country,                   'active_utils/country'
+  autoload :CountryCode,               'active_utils/country'
+  autoload :InvalidCountryCodeError,   'active_utils/country'
+  autoload :CountryCodeFormatError,    'active_utils/country'
+  autoload :ActiveUtilsError,          'active_utils/error'
+  autoload :ConnectionError,           'active_utils/error'
+  autoload :RetriableConnectionError,  'active_utils/error'
+  autoload :ResponseError,             'active_utils/error'
+  autoload :ClientCertificateError,    'active_utils/error'
+  autoload :InvalidResponseError,      'active_utils/error'
+  autoload :PostData,                  'active_utils/post_data'
+  autoload :PostsData,                 'active_utils/posts_data'
+  autoload :RequiresParameters,        'active_utils/requires_parameters'
+  autoload :Utils,                     'active_utils/utils'
+  autoload :Validateable,              'active_utils/validateable'
+  autoload :CurrencyCode,              'active_utils/currency_code'
+  autoload :InvalidCurrencyCodeError,  'active_utils/currency_code'
 end

data/test/test_helper.rb

@@ -1,8 +1,19 @@
 require 'active_utils'
-
 require 'minitest/autorun'
+require 'mocha/setup'
+
+include ActiveUtils
 
-require 'mocha'
-require 'mocha/mini_test'
+def suppress_warnings
+  original_verbosity, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = original_verbosity
+end
 
-include ActiveMerchant
+class Minitest::Test
+  def assert_deprecation_warning(message=nil)
+    ActiveUtils::Utils.expects(:deprecated).with(message ? message : anything)
+    yield
+  end
+end

data/test/unit/connection_test.rb

@@ -6,7 +6,7 @@ class ConnectionTest < Minitest::Test
     @ok = stub(:code => 200, :message => 'OK', :body => 'success')
 
     @endpoint   = 'https://example.com/tx.php'
-    @connection = ActiveMerchant::Connection.new(@endpoint)
+    @connection = ActiveUtils::Connection.new(@endpoint)
     @connection.logger = stub(:info => nil, :debug => nil, :error => nil)
   end
 
@@ -16,13 +16,13 @@ class ConnectionTest < Minitest::Test
 
   def test_connection_endpoint_accepts_uri
     endpoint = URI.parse(@endpoint)
-    connection = ActiveMerchant::Connection.new(endpoint)
+    connection = ActiveUtils::Connection.new(endpoint)
     assert_equal endpoint, connection.endpoint
   end
 
   def test_connection_endpoint_raises_uri_error
     assert_raises URI::InvalidURIError do
-      ActiveMerchant::Connection.new("not a URI")
+      ActiveUtils::Connection.new("not a URI")
     end
   end
 
@@ -34,7 +34,7 @@ class ConnectionTest < Minitest::Test
   end
 
   def test_successful_post_request
-    Net::HTTP.any_instance.expects(:post).with('/tx.php', 'data', ActiveMerchant::Connection::RUBY_184_POST_HEADERS).returns(@ok)
+    Net::HTTP.any_instance.expects(:post).with('/tx.php', 'data', ActiveUtils::Connection::RUBY_184_POST_HEADERS).returns(@ok)
     response = @connection.request(:post, 'data', {})
     assert_equal 'success', response.body
   end
@@ -76,7 +76,7 @@ class ConnectionTest < Minitest::Test
   end
 
   def test_default_read_timeout
-    assert_equal ActiveMerchant::Connection::READ_TIMEOUT, @connection.read_timeout
+    assert_equal ActiveUtils::Connection::READ_TIMEOUT, @connection.read_timeout
   end
 
   def test_override_read_timeout
@@ -90,7 +90,7 @@ class ConnectionTest < Minitest::Test
   end
 
   def test_default_verify_peer
-    assert_equal ActiveMerchant::Connection::VERIFY_PEER, @connection.verify_peer
+    assert_equal ActiveUtils::Connection::VERIFY_PEER, @connection.verify_peer
   end
 
   def test_override_verify_peer
@@ -99,8 +99,8 @@ class ConnectionTest < Minitest::Test
   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
+    assert_equal ActiveUtils::Connection::CA_FILE, @connection.ca_file
+    assert_equal ActiveUtils::Connection::CA_FILE, @connection.send(:http).ca_file
   end
 
   def test_override_ca_file
@@ -110,8 +110,8 @@ class ConnectionTest < Minitest::Test
   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
+    assert_equal ActiveUtils::Connection::CA_PATH, @connection.ca_path
+    assert_equal ActiveUtils::Connection::CA_PATH, @connection.send(:http).ca_path
   end
 
   def test_override_ca_path
@@ -124,7 +124,7 @@ class ConnectionTest < Minitest::Test
     @connection.logger.expects(:info).once
     Net::HTTP.any_instance.expects(:post).raises(EOFError)
 
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       @connection.request(:post, '')
     end
   end
@@ -138,9 +138,9 @@ class ConnectionTest < Minitest::Test
 
   def test_failure_limit_reached
     @connection.logger.expects(:info).once
-    Net::HTTP.any_instance.expects(:post).times(ActiveMerchant::Connection::MAX_RETRIES).raises(Errno::ECONNREFUSED)
+    Net::HTTP.any_instance.expects(:post).times(ActiveUtils::Connection::MAX_RETRIES).raises(Errno::ECONNREFUSED)
 
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       @connection.request(:post, '')
     end
   end
@@ -160,7 +160,7 @@ class ConnectionTest < Minitest::Test
 
     @connection.retry_safe = true
 
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       @connection.request(:post, '')
     end
   end
@@ -169,7 +169,7 @@ class ConnectionTest < Minitest::Test
     @connection.logger.expects(:error).once
     Net::HTTP.any_instance.expects(:post).raises(OpenSSL::X509::CertificateError)
 
-    assert_raises(ActiveMerchant::ClientCertificateError) do
+    assert_raises(ActiveUtils::ClientCertificateError) do
       @connection.request(:post, '')
     end
   end

data/test/unit/network_connection_retries_test.rb

@@ -15,15 +15,66 @@ class NetworkConnectionRetriesTest < Minitest::Test
   end
 
   def test_unrecoverable_exception
-    assert_raises(ActiveMerchant::ConnectionError) do
+    raised = assert_raises(ActiveUtils::ConnectionError) do
       retry_exceptions do
         raise EOFError
       end
     end
+    assert_equal "The remote server dropped the connection", raised.message
+  end
+
+  def test_econnreset_raises_correctly
+    raised = assert_raises(ActiveUtils::ConnectionError) do
+      retry_exceptions do
+        raise Errno::ECONNRESET
+      end
+    end
+    assert_equal "The remote server reset the connection", raised.message
+  end
+
+  def test_timeout_errors_raise_correctly
+    exceptions = [Timeout::Error, Errno::ETIMEDOUT]
+    if RUBY_VERSION >= '2.0.0'
+      exceptions += [Net::ReadTimeout, Net::OpenTimeout]
+    end
+
+    exceptions.each do |exception|
+      raised = assert_raises(ActiveUtils::ConnectionError) do
+        retry_exceptions do
+          raise exception
+        end
+      end
+      assert_equal "The connection to the remote server timed out", raised.message
+    end
+  end
+
+  def test_socket_error_raises_correctly
+    raised = assert_raises(ActiveUtils::ConnectionError) do
+      retry_exceptions do
+        raise SocketError
+      end
+    end
+    assert_equal "The connection to the remote server could not be established", raised.message
+  end
+
+  def test_ssl_errors_raise_correctly
+    exceptions = [OpenSSL::SSL::SSLError]
+    if RUBY_VERSION >= '2.1.0'
+      exceptions += [OpenSSL::SSL::SSLErrorWaitWritable, OpenSSL::SSL::SSLErrorWaitReadable]
+    end
+
+    exceptions.each do |exception|
+      raised = assert_raises(ActiveUtils::ConnectionError) do
+        retry_exceptions do
+          raise exception
+        end
+      end
+      assert_equal "The SSL connection to the remote server could not be established", raised.message
+    end
   end
 
   def test_invalid_response_error
-    assert_raises(ActiveMerchant::InvalidResponseError) do
+    assert_raises(ActiveUtils::InvalidResponseError) do
       retry_exceptions do
         raise Zlib::BufError
       end
@@ -32,7 +83,7 @@ class NetworkConnectionRetriesTest < Minitest::Test
 
   def test_unrecoverable_exception_logged_if_logger_provided
     @logger.expects(:info).once
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       retry_exceptions :logger => @logger do
         raise EOFError
       end
@@ -48,9 +99,9 @@ class NetworkConnectionRetriesTest < Minitest::Test
   end
 
   def test_failure_limit_reached
-    @requester.expects(:post).times(ActiveMerchant::NetworkConnectionRetries::DEFAULT_RETRIES).raises(Errno::ECONNREFUSED)
+    @requester.expects(:post).times(ActiveUtils::NetworkConnectionRetries::DEFAULT_RETRIES).raises(Errno::ECONNREFUSED)
 
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       retry_exceptions do
         @requester.post
       end
@@ -59,9 +110,9 @@ class NetworkConnectionRetriesTest < Minitest::Test
 
   def test_failure_limit_reached_logs_final_error
     @logger.expects(:info).times(3)
-    @requester.expects(:post).times(ActiveMerchant::NetworkConnectionRetries::DEFAULT_RETRIES).raises(Errno::ECONNREFUSED)
+    @requester.expects(:post).times(ActiveUtils::NetworkConnectionRetries::DEFAULT_RETRIES).raises(Errno::ECONNREFUSED)
 
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       retry_exceptions(:logger => @logger) do
         @requester.post
       end
@@ -91,7 +142,7 @@ class NetworkConnectionRetriesTest < Minitest::Test
                                        raises(Errno::ECONNREFUSED).
                                        raises(EOFError)
 
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       retry_exceptions :retry_safe => true do
         @requester.post
       end
@@ -101,7 +152,7 @@ class NetworkConnectionRetriesTest < Minitest::Test
   def test_failure_with_ssl_certificate
     @requester.expects(:post).raises(OpenSSL::X509::CertificateError)
 
-    assert_raises(ActiveMerchant::ClientCertificateError) do
+    assert_raises(ActiveUtils::ClientCertificateError) do
       retry_exceptions do
         @requester.post
       end
@@ -112,7 +163,7 @@ class NetworkConnectionRetriesTest < Minitest::Test
     @logger.expects(:error).once
     @requester.expects(:post).raises(OpenSSL::X509::CertificateError)
 
-    assert_raises(ActiveMerchant::ClientCertificateError) do
+    assert_raises(ActiveUtils::ClientCertificateError) do
       retry_exceptions :logger => @logger do
         @requester.post
       end
@@ -122,7 +173,7 @@ class NetworkConnectionRetriesTest < Minitest::Test
   def test_failure_with_additional_exceptions_specified
     @requester.expects(:post).raises(MyNewError)
 
-    assert_raises(ActiveMerchant::ConnectionError) do
+    assert_raises(ActiveUtils::ConnectionError) do
       retry_exceptions :connection_exceptions => {MyNewError => "my message"} do
         @requester.post
       end

data/test/unit/post_data_test.rb

@@ -1,24 +1,24 @@
 require 'test_helper'
 
-class MyPost < ActiveMerchant::PostData
+class MyPost < ActiveUtils::PostData
   self.required_fields = [ :ccnumber, :ccexp, :firstname, :lastname, :username, :password, :order_id, :key, :time ]
 end
 
 class PostDataTest < Minitest::Test
   def teardown
-    ActiveMerchant::PostData.required_fields = []
+    ActiveUtils::PostData.required_fields = []
   end
 
   def test_element_assignment
     name = 'Cody Fauser'
-    post = ActiveMerchant::PostData.new
+    post = ActiveUtils::PostData.new
 
     post[:name] = name
     assert_equal name, post[:name]
   end
 
   def test_ignore_blank_fields
-    post = ActiveMerchant::PostData.new
+    post = ActiveUtils::PostData.new
     assert_equal 0, post.keys.size
 
     post[:name] = ''
@@ -29,8 +29,8 @@ class PostDataTest < Minitest::Test
   end
 
   def test_dont_ignore_required_blank_fields
-    ActiveMerchant::PostData.required_fields = [ :name ]
-    post = ActiveMerchant::PostData.new
+    ActiveUtils::PostData.required_fields = [ :name ]
+    post = ActiveUtils::PostData.new
 
     assert_equal 0, post.keys.size
 

data/test/unit/posts_data_test.rb

@@ -18,7 +18,7 @@ class PostsDataTest < Minitest::Test
     requester.expects(:post).raises(Errno::ECONNREFUSED).times(3)
     Connection.any_instance.stubs(:http => requester)
 
-    assert_raises ActiveMerchant::ConnectionError do
+    assert_raises ActiveUtils::ConnectionError do
       @poster.raw_ssl_request(:post, "https://shopify.com", "", {})
     end
   end
@@ -29,11 +29,11 @@ class PostsDataTest < Minitest::Test
     requester.expects(:post).raises(Errno::ECONNREFUSED).times(1)
     Connection.any_instance.stubs(:http => requester)
 
-    assert_raises ActiveMerchant::ConnectionError do
+    assert_raises ActiveUtils::ConnectionError do
       @poster.raw_ssl_request(:post, "https://shopify.com", "", {})
     end
   ensure
-    SSLPoster.max_retries = ActiveMerchant::Connection::MAX_RETRIES
+    SSLPoster.max_retries = ActiveUtils::Connection::MAX_RETRIES
   end
 
   def test_logger_warns_if_ssl_strict_disabled
@@ -54,5 +54,5 @@ class PostsDataTest < Minitest::Test
     SSLPoster.ssl_strict = true
     @poster.raw_ssl_request(:post, "https://shopify.com", "", {})
   end
-  
+
 end

data/test/unit/utils_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 class UtilsTest < Minitest::Test
   def test_unique_id_should_be_32_chars_and_alphanumeric
-    assert_match /^\w{32}$/, ActiveMerchant::Utils.generate_unique_id
+    assert_match /^\w{32}$/, ActiveUtils::Utils.generate_unique_id
   end
 end

data/test/unit/validateable_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class Dood
-  include ActiveMerchant::Validateable
+  include ActiveUtils::Validateable
 
   attr_accessor :name, :email, :country
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_utils
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 3.0.0.pre1
 platform: ruby
 authors:
 - Shopify
@@ -30,7 +30,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +112,10 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Gemfile.activesupport32
+- Gemfile.activesupport40
+- Gemfile.activesupport41
+- Gemfile.activesupport42
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -113,6 +131,17 @@ files:
 - lib/active_utils/common/requires_parameters.rb
 - lib/active_utils/common/utils.rb
 - lib/active_utils/common/validateable.rb
+- lib/active_utils/common/version.rb
+- lib/active_utils/connection.rb
+- lib/active_utils/country.rb
+- lib/active_utils/currency_code.rb
+- lib/active_utils/error.rb
+- lib/active_utils/network_connection_retries.rb
+- lib/active_utils/post_data.rb
+- lib/active_utils/posts_data.rb
+- lib/active_utils/requires_parameters.rb
+- lib/active_utils/utils.rb
+- lib/active_utils/validateable.rb
 - lib/active_utils/version.rb
 - lib/certs/cacert.pem
 - shipit.rubygems.yml
@@ -141,9 +170,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: active_utils
 rubygems_version: 2.2.2