ae_network_connection_exception 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd0753dcb7f0a1ee3c16fb466e38634f8b24e4ad
-  data.tar.gz: b35ab554e22841ad7471514da0f8b8c2dd33b4bd
+SHA256:
+  metadata.gz: 5b7cafe89fcbcdaf9925c573d2634a2bb132c1e455410a58eb37aec03ee2f08d
+  data.tar.gz: f78429a43ab640d0ebb3c957b35a111811fa6e34a715904bcf9881b06b4a093e
 SHA512:
-  metadata.gz: d5b9fd6ee16871e2da071b8488e8b28845de354824de6ea08de51e55c1185e2e5038b2f7b4188d769458ea1a72594ba82a05cfb51d8d3a5efa65c5d56b78f8c1
-  data.tar.gz: 4766a393b3f12df852a9154fc8627fc4c81d49f4020fe259be28a0b8cc384612e3f3ac82d7ccedf6b74ab05cee16a884643bc5326cd561c4eca1eabc57723130
+  metadata.gz: a571e1b3cc34c30bde269b5a3fcf756e2cd74eeef8d1399b6cc76b22404932d2a87a5988a72c5e20d6f2d7a1c07a02f6018bd5fadc02dfb0387034b7e4456175
+  data.tar.gz: 7b5cab2ccc00495417184b0dbbd7c3a42fd639d8051584273daef29e37f581bfa3004156b36483e6492cb89c9063911021d188559c0f81c44730e181f2a9e765

data/.circleci/config.yml

@@ -0,0 +1,30 @@
+defaults: &defaults
+  working_directory: ~/repo
+
+  steps:
+    - checkout
+    - run: bundle install
+    - run: bundle exec appraisal install
+    - run: bundle exec appraisal rake test
+
+version: 2
+jobs:
+  test-ruby-2.3.3:
+    <<: *defaults
+    docker:
+      - image: circleci/ruby:2.3.3
+
+  test-ruby-2.5.3:
+    <<: *defaults
+    docker:
+      - image: circleci/ruby:2.5.3-stretch
+
+workflows:
+  version: 2
+  rc:
+    jobs:
+      - test-ruby-2.3.3:
+          context: appfolio_test_context
+      - test-ruby-2.5.3:
+          context: appfolio_test_context
+

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 .idea
 mkmf.log
+gemfiles/*lock

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.3

data/Appraisals

@@ -0,0 +1,11 @@
+case(RUBY_VERSION)
+
+  when '2.3.3', '2.5.3' then
+
+    appraise "ruby-#{RUBY_VERSION}" do
+    end
+
+  else
+    raise "Unsupported Ruby version #{RUBY_VERSION}"
+
+end

data/Gemfile

@@ -5,3 +5,8 @@ gemspec
 
 gem 'minitest', '~> 5.0'
 
+source 'https://gemini.atl.appfolio.net' do
+  gem 'af_gems'
+end
+
+gem 'rest-client', '~> 2.0', require: false

data/Rakefile

@@ -1,11 +1,24 @@
-require "bundler/gem_tasks"
-require 'rake'
-require 'rake/testtask'
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+require 'af_gems/gem_tasks'
+require 'af_gems/appraisal'
 
-Rake::TestTask.new do |test|
+Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/unit/**/*_test.rb'
   test.verbose = true
 end
 
+task :default => :test
 
+namespace :test do
+  AfGems::RubyAppraisalTask.new(:all, [ 'ruby-2.3.3', 'ruby-2.5.3' ])
+end

data/gemfiles/ruby_2.3.3.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "minitest", "~> 5.0"
+
+source "https://gemini.atl.appfolio.net" do
+  gem "af_gems"
+end
+
+gemspec path: "../"

data/gemfiles/ruby_2.5.3.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "minitest", "~> 5.0"
+
+source "https://gemini.atl.appfolio.net" do
+  gem "af_gems"
+end
+
+gemspec path: "../"

data/lib/ae_network_connection_exception.rb

@@ -1,15 +1,22 @@
 require "ae_network_connection_exception/version"
+require "net/http"
 require "socket"
 
 module AeNetworkConnectionException
-  
   class ConnectionNotEstablished < StandardError
   end
 
+  OTHER_EXCEPTIONS = []
+  if defined?(RestClient::Exceptions::OpenTimeout)
+    puts "here"
+    OTHER_EXCEPTIONS << RestClient::Exceptions::OpenTimeout
+  end
+  OTHER_EXCEPTIONS.freeze
+
   class << self
     def try
       yield
-    rescue SocketError, Net::OpenTimeout => e
+    rescue SocketError, Net::OpenTimeout, *OTHER_EXCEPTIONS => e
       # SocketError happens when we fail to connect to a socket. Common problems here are DNS resolution (i.e. getaddrinfo)
       # Net::OpenTimeout happens when we are unable to establish an HTTP connection before the open_timeout
 
@@ -25,25 +32,25 @@ module AeNetworkConnectionException
       raise_if_exception_message_matches(e, /connect\(2\)/)
     rescue Errno::ECONNRESET => e
       # Errno::ECONNRESET happens when the connection is reset. This can happen during ssl negotiation
-      
+
       raise_if_exception_message_matches(e, /SSL_connect/)
     end
-    
+
     # An array of examples for all the exceptions that we will catch
     def exception_signatures
       [
-          SocketError.new('getaddrinfo: Name or service not known'),
-          Errno::ECONNREFUSED.new('Connection refused - connect(2) for "example.com" port 443'),
-          Errno::ETIMEDOUT.new('Connection timed out - connect(2) for "example.com" port 443'),
-          Net::OpenTimeout.new('message'),
-          Errno::ECONNRESET.new('Connection reset by peer - SSL_connect', Errno::ECONNREFUSED.new('Connection refused - connect(2) for "example.com" port 443')),
-          Errno::EHOSTUNREACH.new('No route to host - connect(2) for "example.com" port 443'),
-          Errno::ENETUNREACH.new('Network is unreachable - connect(2) for "example.com" port 443')
+        SocketError.new('getaddrinfo: Name or service not known'),
+        Errno::ECONNREFUSED.new('Connection refused - connect(2) for "example.com" port 443'),
+        Errno::ETIMEDOUT.new('Connection timed out - connect(2) for "example.com" port 443'),
+        Net::OpenTimeout.new('message'),
+        Errno::ECONNRESET.new('Connection reset by peer - SSL_connect', Errno::ECONNREFUSED.new('Connection refused - connect(2) for "example.com" port 443')),
+        Errno::EHOSTUNREACH.new('No route to host - connect(2) for "example.com" port 443'),
+        Errno::ENETUNREACH.new('Network is unreachable - connect(2) for "example.com" port 443')
       ]
     end
-    
+
     private
-    
+
     def raise_if_exception_message_matches(exception, pattern)
       if exception.message =~ pattern
         raise ConnectionNotEstablished

data/lib/ae_network_connection_exception/version.rb

@@ -1,3 +1,3 @@
 module AeNetworkConnectionException
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/test/test_helper.rb

@@ -2,3 +2,31 @@ require 'rubygems'
 require 'minitest/autorun'
 require 'ae_network_connection_exception'
 
+private
+
+class Minitest::Test
+  def assert_connection_not_established_thrown_for(exception)
+    e = return_raised_error do
+      AeNetworkConnectionException.try do
+        raise exception
+      end
+    end
+    assert_equal AeNetworkConnectionException::ConnectionNotEstablished, e.class
+    assert_equal exception, e.cause
+  end
+
+  def assert_connection_not_established_not_thrown_for(exception)
+    e = return_raised_error do
+      AeNetworkConnectionException.try do
+        raise exception
+      end
+    end
+    assert_equal exception, e
+  end
+
+  def return_raised_error
+    yield
+  rescue => e
+    return e
+  end
+end

data/test/unit/ae_network_connection_exception_test.rb

@@ -1,3 +1,4 @@
+require 'rest-client'
 require 'test_helper'
 
 module AeNetworkConnectionException
@@ -5,10 +6,10 @@ module AeNetworkConnectionException
     def test_connection_not_established_exception
       # Exception Causes are standard with ruby 2.1
       # http://devblog.avdi.org/2013/12/25/exception-causes-in-ruby-2-1
-      
+
       parent_exception = AeNetworkConnectionException::ConnectionNotEstablished.new('Parent Message')
 
-      assert_equal nil, parent_exception.cause
+      assert_nil parent_exception.cause
       assert_equal 'Parent Message', parent_exception.message
 
       begin
@@ -36,16 +37,20 @@ module AeNetworkConnectionException
       end
       assert_equal exception, e
     end
-    
+
     def test_ae_network_connection_exception_try__raises_connection_not_establised_exception
       AeNetworkConnectionException.exception_signatures.each do |e|
         assert_connection_not_established_thrown_for(e)
       end
-      
+
       assert_connection_not_established_not_thrown_for(Errno::ECONNRESET.new('Connection timed out - connect(2) for "example.com" port 443'))
       assert_connection_not_established_not_thrown_for(Errno::ETIMEDOUT.new('Connection timed out - recvfrom(2) for "example.com" port 443'))
     end
-    
+
+    def test_ae_network_connection_exception_try__raises_connection_not_establised_exception_for_rest_client_open_timeout
+      assert_connection_not_established_thrown_for(RestClient::Exceptions::OpenTimeout.new)
+    end
+
     def test_exception_signatures
       expected_signatures = [
         SocketError.new('getaddrinfo: Name or service not known'),
@@ -56,39 +61,12 @@ module AeNetworkConnectionException
         Errno::EHOSTUNREACH.new('No route to host - connect(2) for "example.com" port 443'),
         Errno::ENETUNREACH.new('Network is unreachable - connect(2) for "example.com" port 443')
       ]
-      
+
       assert_equal expected_signatures.size, AeNetworkConnectionException.exception_signatures.size
-      
-      expected_signatures.each do |e|
-        assert_includes AeNetworkConnectionException.exception_signatures, e 
-      end
-    end
 
-    private
-    
-    def assert_connection_not_established_thrown_for(exception)
-      e = return_raised_error do
-        AeNetworkConnectionException.try do
-          raise exception
-        end
-      end
-      assert_equal AeNetworkConnectionException::ConnectionNotEstablished, e.class
-      assert_equal exception, e.cause
-    end
-    
-    def assert_connection_not_established_not_thrown_for(exception)
-      e = return_raised_error do
-        AeNetworkConnectionException.try do
-          raise exception
-        end
+      expected_signatures.each do |e|
+        assert_includes AeNetworkConnectionException.exception_signatures, e
       end
-      assert_equal exception, e
-    end
-
-    def return_raised_error
-      yield
-    rescue => e
-      return e
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_network_connection_exception
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Steven Boyd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,12 +46,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- ".ruby-version"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - ae_network_connection_exception.gemspec
+- gemfiles/ruby_2.3.3.gemfile
+- gemfiles/ruby_2.5.3.gemfile
 - lib/ae_network_connection_exception.rb
 - lib/ae_network_connection_exception/version.rb
 - test/test_helper.rb
@@ -75,8 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Provides sane exceptions for network failures