octoparts 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9c0489fcb40ffc84c23c381544c54eb5f9b7fa
-  data.tar.gz: f5859dfaffceaa5a020beeae377b63b094d99403
+  metadata.gz: d357c756c7189991f8e42f464d5bd0044c98ff11
+  data.tar.gz: 5480b9895ae46584b71cadf3c9ef01f621f6644d
 SHA512:
-  metadata.gz: ca03ed6a4484042a147b8faf8fa25cd7b2876819203aeaf5e05bd94395857e1b7850cb0285fc59c133782aa2d7cfdd6ab732b6cbc0d4e199ede84e3ed29a3733
-  data.tar.gz: 5c92e83194b68abde9ddc8e85964039a1e5d0f25642c594dd01572b0519e4fa8324fc58ec91ad671d7a27691799cc7a602a3a36099fa114f44e5e329959c252f
+  metadata.gz: 555e75e2ead8be1973592df46200d6d96d59b8d6264250c68f6f1c9186f3c9357821b828c50c8114826239be32de927a5e57abd6b99e2ef713527b76890c43d7
+  data.tar.gz: 4120fd06b6a82ce4c231b677fb76e9395b84ca5dabbe82937906b07e90f5bea1fb8c74e19827255d654cf77183386a9910096bffa83d5287f54621c77c4cf299

data/.travis.yml

@@ -1,3 +1,10 @@
 language: ruby
 rvm:
+  - 2.0.0-p598
   - 2.1.5
+  - 2.2.0
+gemfile:
+  - Gemfile
+  - gemfiles/faraday-0_8_8.gemfile
+sudo: false
+cache: bundler

data/gemfiles/faraday-0_8_8.gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'faraday', '~> 0.8.8'
+gemspec path: '../'

data/lib/octoparts/client.rb

@@ -73,8 +73,8 @@ module Octoparts
         request.url(path, params)
         request.body = body if body
         request.headers.merge!(headers)
-        request.options.timeout = @timeout_sec if @timeout_sec
-        request.options.open_timeout = @open_timeout_sec if @open_timeout_sec
+        request.options[:timeout] = @timeout_sec if @timeout_sec
+        request.options[:open_timeout] = @open_timeout_sec if @open_timeout_sec
       end
       if error = Octoparts::ResponseError.from_response(response)
         raise error

data/lib/octoparts/version.rb

@@ -1,3 +1,3 @@
 module Octoparts
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/test_client.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'active_support/core_ext/string/inflections'
 
 class TestClient < Test::Unit::TestCase
   def setup
@@ -109,14 +110,25 @@ class TestClient < Test::Unit::TestCase
   end
 
   sub_test_case "timeout" do
+    setup do
+      @endpoint = Octoparts.configuration.endpoint
+      Octoparts.configure do |c|
+        # avoiding connection failed error, sorry heroku...
+        # we should find other way
+        c.endpoint = 'http://octoparts.herokuapp.com'
+      end
+      @exception_class = defined?(Faraday::TimeoutError) ? Faraday::TimeoutError : Faraday::Error::TimeoutError
+    end
+
     teardown do
       Octoparts.configure do |c|
+        c.endpoint = @endpoint
         c.timeout_sec = nil
       end
     end
 
     test "timeout_sec option" do
-      assert_raise Faraday::TimeoutError do
+      assert_raise @exception_class do
         Octoparts::Client.new(timeout_sec: 0).get('/')
       end
     end
@@ -125,7 +137,7 @@ class TestClient < Test::Unit::TestCase
       Octoparts.configure do |c|
         c.timeout_sec = 0
       end
-      assert_raise Faraday::TimeoutError do
+      assert_raise @exception_class do
         Octoparts::Client.new.get('/')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octoparts
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Takayuki Matsubara
@@ -163,6 +163,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/faraday-0_8_8.gemfile
 - lib/octoparts.rb
 - lib/octoparts/builder.rb
 - lib/octoparts/client.rb