ezclient 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9897ff5dccafb68e0eadf415f8c65b1232d8da91f38c1dbe29bbccc7263939a
-  data.tar.gz: 81a60d20746b3482697f49433aad567361892b98c51705c4fcddae0d7755eb32
+  metadata.gz: 7894472c0e1703cc7917dec4725830f0ec9f39cdde75b10e8e62131f1cc72376
+  data.tar.gz: c1ff86649d20f2b7f3787083bdfcd10b3817086c74ff876c7b2b8ccca2759a00
 SHA512:
-  metadata.gz: ecbdc6a0ac6c5221128016c16ad39e1addaad7c8d79cecdb9accdb30e55c458ef39fbdfbaeac05af39ee826033392036770ed93a6375af7a28283dd97f93559d
-  data.tar.gz: 4feb95f5c9de7581c215e23fd1ea2a54cab09cf18e593c04cdeddccc761b02af64b39ce5e33338d9c7bb39fe4ce551f8db6716dd82fb24c5cc38b3c69bb99b0e
+  metadata.gz: 807d13903a58fc3d39f95ca8b620cd5a578934d8925c09484f89779d283d18733d5b683955c30b6a9c95de6ee18cbef1d099c30fdb4ee7298dbd4d644e7e8cd9
+  data.tar.gz: d49b93cc0bf2d93febb1bbed745e332431e709500858565be75bcaec7a608f1b9c36371bff3a5092801659ecb4713f7cd8164935f765056ef429de0b8b6d23d6

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 .rspec_status
 Gemfile.lock
+/gemfiles/*.lock

data/.rubocop.yml

@@ -6,3 +6,4 @@ AllCops:
   TargetRubyVersion: 2.5
   Exclude:
     - vendor/**/*
+    - gemfiles/**/*

data/.travis.yml

@@ -8,6 +8,10 @@ rvm:
   - 2.5
   - ruby-head
 
+gemfile:
+  - gemfiles/http3.gemfile
+  - gemfiles/http4.gemfile
+
 before_install: gem install bundler
 
 env: SUITE="rspec"

data/README.md

@@ -2,11 +2,10 @@
 EzClient is [HTTP gem](https://github.com/httprb/http) wrapper for easy persistent connections and more.
 
 ## Installation
-Add this lines to your application's Gemfile:
+Add this line to your application's Gemfile:
 
 ```ruby
 gem "ezclient"
-gem "http", github: "httprb/http" # version 3 is not supported for now
 ```
 
 ## Usage

data/ezclient.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "http", ">= 4.0.0dev"
+  spec.add_runtime_dependency "http", ">= 3"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"

data/gemfiles/http3.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "http", "~> 3.0"

data/gemfiles/http4.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "http", github: "httprb/http"

data/lib/ezclient/http_patch.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+unless HTTP::Client.instance_methods.include?(:build_request)
+  # Backport of https://github.com/httprb/http/pull/458 for HTTP v3
+  class HTTP::Client
+    def build_request(verb, uri, opts = {})
+      opts    = @default_options.merge(opts)
+      uri     = make_request_uri(uri, opts)
+      headers = make_request_headers(opts)
+      body    = make_request_body(opts, headers)
+      proxy   = opts.proxy
+
+      HTTP::Request.new(
+        verb: verb,
+        uri: uri,
+        headers: headers,
+        proxy: proxy,
+        body: body,
+        auto_deflate: opts.feature(:auto_deflate),
+      )
+    end
+  end
+end
+
+unless HTTP::Request::Body.instance_methods.include?(:source)
+  # Backport for HTTP v3
+  class HTTP::Request::Body
+    def source
+      @body
+    end
+  end
+end

data/lib/ezclient/request.rb

@@ -85,7 +85,7 @@ class EzClient::Request
     # Only used to build proper HTTP::Request and HTTP::Options instances
     @http_client ||= begin
       http_client = client.dup
-      http_client = http_client.timeout(timeout) if timeout
+      http_client = set_timeout(http_client)
       http_client = http_client.basic_auth(basic_auth) if basic_auth
       http_client
     end
@@ -149,6 +149,20 @@ class EzClient::Request
     headers
   end
 
+  def set_timeout(client)
+    return client unless timeout
+
+    timeout_args =
+      # for HTTP v3
+      if HTTP::Timeout::Global.ancestors.include?(HTTP::Timeout::PerOperation)
+        [:global, read: timeout]
+      else
+        [timeout]
+      end
+
+    client.timeout(*timeout_args)
+  end
+
   def basic_auth
     @basic_auth ||= begin
       case options[:basic_auth]

data/lib/ezclient/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EzClient
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/lib/ezclient.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "http"
+require "ezclient/http_patch"
 require "ezclient/version"
 require "ezclient/client"
 require "ezclient/request"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezclient
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0dev
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0dev
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,10 +152,13 @@ files:
 - README.md
 - Rakefile
 - ezclient.gemspec
+- gemfiles/http3.gemfile
+- gemfiles/http4.gemfile
 - lib/ezclient.rb
 - lib/ezclient/check_options.rb
 - lib/ezclient/client.rb
 - lib/ezclient/errors.rb
+- lib/ezclient/http_patch.rb
 - lib/ezclient/request.rb
 - lib/ezclient/response.rb
 - lib/ezclient/version.rb