active_rest_client 0.9.71 → 0.9.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3b9e60fbe7fcac66d2abb8fdfca13ffc67a4af
-  data.tar.gz: 7193b387bb571a86de67db438a993357571490d6
+  metadata.gz: 979311b6e72a88f984bed1b34c1c3fd07dde2a9d
+  data.tar.gz: 327b472ac5851bff68e3d74dbc7b0e127a2b85ca
 SHA512:
-  metadata.gz: d1fcb9dd01cc0a5bd476fcb1733a421ee8a490e94bb695593469c1cfc9675a5285ad43f946b557d6ec064d5dc2d1f643504cbae03b45fa88b12a2bc823515f58
-  data.tar.gz: 1ce2d5a2bcbe5ff8ffd2ea4fcace14f25c98c234b5c8cfffd90828b4304a3e365611986994607e6412ebd70313ea7737ad539d18ea4dca638f3fd5db726b35e9
+  metadata.gz: 9e9fa00e1d9530c2da3b2783fdb6c02db11c10ad251dc0e6d242d4f11a4d95418583a0e1e2d24784f9487a85e0f12b381fc04f492976b6e5f9fccb6b4445c70b
+  data.tar.gz: 1f0d887ec3337ee7fb414f8788e36faa96eaf05fb9a9b9cc17991e3fdd8b1cebdfb7cee808d63dcd6ab63f35cc633dd6c1e6c7f83f9491a00dc88d1ac35de5ca

data/lib/active_rest_client/connection.rb

@@ -24,13 +24,13 @@ module ActiveRestClient
     def make_safe_request(path, &block)
       block.call
     rescue Faraday::TimeoutError
-      raise ActiveRestClient::TimeoutException.new("Timed out getting #{@base_url}#{path}")
+      raise ActiveRestClient::TimeoutException.new("Timed out getting #{full_url(path)}")
     rescue Faraday::ConnectionFailed
       begin
         reconnect
         block.call
       rescue Faraday::ConnectionFailed
-        raise ActiveRestClient::ConnectionFailedException.new("Unable to connect to #{@base_url}#{path}")
+        raise ActiveRestClient::ConnectionFailedException.new("Unable to connect to #{full_url(path)}")
       end
     end
 
@@ -74,5 +74,9 @@ module ActiveRestClient
       Faraday.new({url: @base_url}, &ActiveRestClient::Base.faraday_config)
     end
 
+
+    def full_url(path)
+      @session.build_url(path).to_s
+    end
   end
 end

data/lib/active_rest_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveRestClient
-  VERSION = "0.9.71"
+  VERSION = "0.9.72"
 end

data/spec/lib/connection_spec.rb

@@ -108,4 +108,13 @@ describe ActiveRestClient::Connection do
     expect { @connection.get("/foo") }.to raise_error(ActiveRestClient::TimeoutException)
   end
 
+  it "should raise an exception on timeout" do
+    stub_request(:get, "www.example.com/foo").to_timeout
+    begin
+      @connection.get("foo")
+      fail
+    rescue ActiveRestClient::TimeoutException => timeout
+      expect(timeout.message).to eq("Timed out getting http://www.example.com/foo")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_rest_client
 version: !ruby/object:Gem::Version
-  version: 0.9.71
+  version: 0.9.72
 platform: ruby
 authors:
 - Which Ltd