active_rest_client 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b673b275ac742495303d8632a70e7a2425df69bf
-  data.tar.gz: 99edc9e4f9ec9faa7703449685c48b898196ee15
+  metadata.gz: 95a7b0745cf0433d0d39a71335488abf9d5c7db7
+  data.tar.gz: 186afb738e60e270b25dae6963e476cfb97b27f7
 SHA512:
-  metadata.gz: ea15068289c7bedc5faee76611548e342e8ba395f4bb76fb81f99395d5f3fad10e0936a94df5eac5c45236adf137b9ade25c7553a7828c44ad4e83d2d23be3e9
-  data.tar.gz: d201d14a7563791a12885ffb7967f58c938194cd979d06c779b42db11cb0792f336d6f7993ad1e21cd8985cfddc05ff8f4522d098b9b5d733f6ba8c62c41af25
+  metadata.gz: 7638217032e8783304954e8cd3aac40d2bd7df4a0a8ac2d824c24480a544b0a3d1e4255aad45ddeaed8d20d2f408c4abfb01c847d819f62971c8e83737927425
+  data.tar.gz: 458acc1e2864a505f281a194d87dfe70dff2b1415ba72adb5ca3e12246f8ad39b4e5e52f402bd5d2696c39e01a075d0cbe34d4c03470d76fa8873d056f467103

data/active_rest_client.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "multi_json"
   spec.add_runtime_dependency "activesupport"
-  spec.add_runtime_dependency "faraday", "~> 0.9"
+  spec.add_runtime_dependency "faraday"
   spec.add_development_dependency "patron", ">= 0.4.9" # 0.4.18 breaks against Curl v0.7.15 but works with webmock
 end

data/lib/active_rest_client/configuration.rb

@@ -103,8 +103,15 @@ module ActiveRestClient
       def default_faraday_config
         Proc.new do |faraday|
           faraday.adapter(adapter)
-          faraday.options.timeout       = 10
-          faraday.options.open_timeout  = 10
+
+          if faraday.options.respond_to?(:timeout=)
+            faraday.options.timeout         = 10
+            faraday.options.open_timeout    = 10
+          else
+            faraday.options['timeout']      = 10
+            faraday.options['open_timeout'] = 10
+          end
+
           faraday.headers['User-Agent'] = "ActiveRestClient/#{ActiveRestClient::VERSION}"
           faraday.headers['Connection'] = "Keep-Alive"
           faraday.headers['Accept']     = "application/json"

data/lib/active_rest_client/connection.rb

@@ -23,13 +23,13 @@ module ActiveRestClient
 
     def make_safe_request(path, &block)
       block.call
-    rescue Faraday::TimeoutError
+    rescue Faraday::Error::TimeoutError
       raise ActiveRestClient::TimeoutException.new("Timed out getting #{full_url(path)}")
-    rescue Faraday::ConnectionFailed
+    rescue Faraday::Error::ConnectionFailed
       begin
         reconnect
         block.call
-      rescue Faraday::ConnectionFailed
+      rescue Faraday::Error::ConnectionFailed
         raise ActiveRestClient::ConnectionFailedException.new("Unable to connect to #{full_url(path)}")
       end
     end

data/lib/active_rest_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveRestClient
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/lib/connection_spec.rb

@@ -99,7 +99,7 @@ describe ActiveRestClient::Connection do
   end
 
   it "should retry once in the event of a connection failed" do
-    stub_request(:get, "www.example.com/foo").to_raise(Faraday::ConnectionFailed.new("Foo"))
+    stub_request(:get, "www.example.com/foo").to_raise(Faraday::Error::ConnectionFailed.new("Foo"))
     expect { @connection.get("/foo") }.to raise_error(ActiveRestClient::ConnectionFailedException)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_rest_client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Which Ltd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,16 +183,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: patron
   requirement: !ruby/object:Gem::Requirement