invoiced 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110fedfb4c7cae791aba433214d0f8d5ce08c322
-  data.tar.gz: fc4acd0b415091216c3d83291cbea330cc5f7619
+  metadata.gz: 2ac4d832ff168090c18ef76f0454c0f74917cca4
+  data.tar.gz: e4a6826d457f078a188fdd0628c37db49cef27dc
 SHA512:
-  metadata.gz: ec0bb6d4d38e029afd787bd7e115d27e1c486d1fa13ae4af5f8ee0ff8e87e96fbc9b58bae272decb58c27a9638b88015513ae0a832137be7be3b791fac625a9d
-  data.tar.gz: d6ad87477c2c50e44a9df3b7ae3417729d8da78832b97e6d20815d98b9583bacadda9e7cbd694994cbe569762290711c537ac6d7e9f09797989d852e5d0682af
+  metadata.gz: 06dbb02d3ea0e8fcfe8cf8fecc8fac3ac7c9baac4a084de8bf21a87d63b47282a4fdebac85393e840d14c65408e04ddd5595d7659db552b974916ddcd1dac5e6
+  data.tar.gz: 0549855a16c9189e7bd44d4a1e604c93f8713708ca43a175cd1cea85920d78ebbb913af16093d402cc82f6a56d2e5ce904d619c6e644ff280e1aee9d1b87064a

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
-  - 2.2  
+  - 2.2
 
 sudo: false
 

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 gemspec
 
 gem 'json', '~> 1.8.3'
-gem 'rest-client', '~> 1.8.0'
+gem 'rest-client', '~> 2.0.0'
 gem 'activesupport', '~> 4.2.3'
 gem 'coveralls', :require => false, :group => :test
 gem 'simplecov', '~> 0.10.0', :require => false, :group => :test

data/README.md

@@ -24,7 +24,7 @@ gem 'invoiced'
 
 ## Requirements
 
-- Ruby 1.9.3+
+- Ruby 2.0+
 - rest_client, json, and active_support gems
 
 ## Usage

data/invoiced.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://invoiced.com/docs/dev'
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency('rest-client', '~> 1.8.0')
+  s.add_dependency('rest-client', '~> 2.0.0')
   s.add_dependency('json', '~> 1.8.3')
   s.add_dependency('activesupport', '~> 4.2.3')
 

data/lib/invoiced/version.rb

@@ -1,3 +1,3 @@
 module Invoiced
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/lib/invoiced.rb

@@ -38,6 +38,9 @@ module Invoiced
         ApiBase = 'https://api.invoiced.com'
         ApiBaseSandbox = 'https://api.sandbox.invoiced.com'
 
+        OpenTimeout = 30
+        ReadTimeout = 80
+
         attr_reader :api_key, :api_url, :sandbox
         attr_reader :CatalogItem, :CreditNote, :Customer, :Estimate, :Event, :File, :Invoice, :Plan, :Subscription, :Transaction
 
@@ -82,13 +85,15 @@ module Invoiced
                         :content_type => "application/json",
                         :user_agent => "Invoiced Ruby/#{Invoiced::VERSION}"
                     },
-                    :payload => payload
+                    :payload => payload,
+                    :open_timeout => OpenTimeout,
+                    :timeout => ReadTimeout
                 )
             rescue RestClient::Exception => e
                 if e.response
-                    rescue_api_error(e.response)
+                    handle_api_error(e.response)
                 else
-                    rescue_rest_client_error(e)
+                    handle_network_error(e)
                 end
             end
 
@@ -111,7 +116,7 @@ module Invoiced
             }
         end
 
-        def rescue_api_error(response)
+        def handle_api_error(response)
             begin
                 error = JSON.parse(response.body)
             rescue JSON::ParserError
@@ -128,8 +133,21 @@ module Invoiced
             end
         end
 
-        def rescue_rest_client_error(error)
-            raise ApiConnectionError.new("There was an error connecting to Invoiced.")
+        def handle_network_error(error)
+            case error
+            when RestClient::Exceptions::OpenTimeout
+                message = "Timeed out while connecting to Invoiced. Please check your internet connection or status.invoiced.com for service outages."
+            when RestClient::Exceptions::ReadTimeout
+                message = "The request timed out reading data from the server."
+            when RestClient::ServerBrokeConnection
+                message = "Connection with the server was broken while receiving the response."
+            when RestClient::SSLCertificateNotVerified
+                message = "Failed to verify the Invoiced SSL certificate. Please verify that you have a recent version of OpenSSL installed."
+            else
+                message = "There was an error connecting to Invoiced: #{error.message}"
+            end
+
+            raise ApiConnectionError.new(message)
         end
 
         def authentication_error(error, response)

data/test/invoiced/invoiced_test.rb

@@ -93,7 +93,7 @@ module Invoiced
       assert_equal(expectedResponse, response)
     end
 
-    should "handle a request exception" do
+    should "handle a generic network error" do
       RestClient::Request.any_instance.expects(:execute).raises(RestClient::Exception.new)
 
       client = Invoiced::Client.new('test')
@@ -103,6 +103,46 @@ module Invoiced
       end
     end
 
+    should "handle an invalid SSL certificate" do
+      RestClient::Request.any_instance.expects(:execute).raises(RestClient::SSLCertificateNotVerified.new('invalid ssl cert'))
+
+      client = Invoiced::Client.new('test')
+
+      assert_raise Invoiced::ApiConnectionError do
+        client.request("POST", "/invoices")
+      end
+    end
+
+    should "handle a connection timeout" do
+      RestClient::Request.any_instance.expects(:execute).raises(RestClient::Exceptions::OpenTimeout.new)
+
+      client = Invoiced::Client.new('test')
+
+      assert_raise Invoiced::ApiConnectionError do
+        client.request("POST", "/invoices")
+      end
+    end
+
+    should "handle a read timeout" do
+      RestClient::Request.any_instance.expects(:execute).raises(RestClient::Exceptions::ReadTimeout.new)
+
+      client = Invoiced::Client.new('test')
+
+      assert_raise Invoiced::ApiConnectionError do
+        client.request("POST", "/invoices")
+      end
+    end
+
+    should "handle an unfinished request" do
+      RestClient::Request.any_instance.expects(:execute).raises(RestClient::ServerBrokeConnection.new)
+
+      client = Invoiced::Client.new('test')
+
+      assert_raise Invoiced::ApiConnectionError do
+        client.request("POST", "/invoices")
+      end
+    end
+
     should "handle an invalid request error" do
       mockResponse = mock('RestClient::Response')
       mockResponse.stubs(:code).returns(400)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoiced
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jared King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement