orientdb_client 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f790f7d0f994bd626bff6f95c180024a2fbcd7c
-  data.tar.gz: 46f3386fef71ef7736be02b7b92e59254f1d62b2
+  metadata.gz: c3b7e8eed23a652cb9e3b2011164a7327ef5c554
+  data.tar.gz: 9f567cb1117ad35b8ffbf656f3e1767e0f7dedbb
 SHA512:
-  metadata.gz: 7765f03411f6491a02751d05bf2bb0d3c5fa7c744a4c7290775e0fc376c709103d9c2bc4c4cc01a04cd45e766394d02cf3171ebcdff62d44f21ef82c09afa0fd
-  data.tar.gz: 9e42dc627c9e01792cbce92a16e9259efaac17f4ccae3d82220d48783eecf66b593f9bb0ed2f02e869f09fbbae244d7a3995d9c42c43f1af0d0fdfda404fe26c
+  metadata.gz: fc6cd1274f0452ea61b90bee9ddfcf4c8a6aa65f80ca408820074310e658ba0b3e51d3b5a861829c24aaf150c1bc442868ee5eb031129436af90cc32da56ed1e
+  data.tar.gz: 9923fe4d47c09552ae309c82cf0bc90bdcb501d0cbd41dfe7ce1ad51fd0966e64434ef4a52053e2346b0e1408bf1a84a873d963dcd12b7e73833013a21842fdf

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Master
 
+## 0.0.5
+
+* Differentiate between Typhoeus adapter timeouts and connection failures.
+* Prevent Curb errors from bubbling up to gem user; convert some of them to native
+OrientdbClient errors.
+
+## 0.0.4
+
 * Added support for timeouts.
 
 ## 0.0.3

data/lib/orientdb_client/errors.rb

@@ -37,4 +37,10 @@ module OrientdbClient
   class NotFoundError < OrientdbError; end
 
   class NegativeArraySizeException < OrientdbError; end
+
+  # Some adapters, e.g. Curb, have many different errors they may raise, and we don't
+  # want to have to worry about rescuing each individual one (e.g. FTPError), so if
+  # we get an exception from an adapter for which we don't have a clear mapping to a native
+  # OrientdbClient error, just wrap it in HttpAdapterError.
+  class HttpAdapterError < OrientdbError; end
 end

data/lib/orientdb_client/http_adapters/curb_adapter.rb

@@ -10,6 +10,12 @@ module OrientdbClient
         req
       rescue Curl::Err::TimeoutError
         timed_out!(method, url)
+      rescue Curl::Err::ConnectionFailedError, Curl::Err::HostResolutionError
+        raise ConnectionError
+      rescue Curl::Err::MalformedURLError
+        raise ClientError
+      rescue Curl::Err::CurlError
+        raise HttpAdapterError
       end
 
       private

data/lib/orientdb_client/http_adapters/typhoeus_adapter.rb

@@ -7,7 +7,9 @@ module OrientdbClient
       def request(method, url, options = {})
         req = prepare_request(method, url, options)
         response = run_request(req)
-        if response.timed_out?
+        if response.return_message == "Couldn't connect to server".freeze
+          raise ConnectionError
+        elsif response.timed_out?
           timed_out!(method, url)
         else
           return response

data/lib/orientdb_client/version.rb

@@ -1,3 +1,3 @@
 module OrientdbClient
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/curb_adapter_spec.rb

@@ -5,4 +5,29 @@ RSpec.describe OrientdbClient::HttpAdapters::CurbAdapter do
   it_behaves_like 'http adapter' do
     let(:adapter_klass) { OrientdbClient::HttpAdapters::CurbAdapter }
   end
+
+  describe '#request' do
+    let(:adapter) { OrientdbClient::HttpAdapters::CurbAdapter.new }
+    subject { adapter.request(:get, 'http://localhost/foo') }
+
+    it 'converts Curl::Err::ConnectionFailedError into a ConnectionError' do
+      allow(adapter).to receive(:run_request) { raise Curl::Err::ConnectionFailedError }
+      expect { subject }.to raise_exception(OrientdbClient::ConnectionError)
+    end
+
+    it 'converts Curl::Err::HostResolutionError into a ConnectionError' do
+      allow(adapter).to receive(:run_request) { raise Curl::Err::HostResolutionError }
+      expect { subject }.to raise_exception(OrientdbClient::ConnectionError)
+    end
+
+    it 'converts Curl::Err::MalformedURLError into a ClientError' do
+      allow(adapter).to receive(:run_request) { raise Curl::Err::MalformedURLError }
+      expect { subject }.to raise_exception(OrientdbClient::ClientError)
+    end
+
+    it 'converts other Curl errors into HttpAdapaterError' do
+      allow(adapter).to receive(:run_request) { raise Curl::Err::HTTPFailedError }
+      expect { subject }.to raise_exception(OrientdbClient::HttpAdapterError)
+    end
+  end
 end

data/spec/typhoeus_adapter_spec.rb

@@ -5,4 +5,13 @@ RSpec.describe OrientdbClient::HttpAdapters::TyphoeusAdapter do
   it_behaves_like 'http adapter' do
     let(:adapter_klass) { OrientdbClient::HttpAdapters::TyphoeusAdapter }
   end
+
+  describe '#request' do
+    let(:adapter) { OrientdbClient::HttpAdapters::TyphoeusAdapter.new }
+    subject { adapter.request(:get, 'http://localhost/noodbhere') }
+
+    it 'raises a connection failure if it cannot connect' do
+      expect { subject }.to raise_exception(OrientdbClient::ConnectionError)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb_client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Luke Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus