Merge pull request #1 from umbrellio/add-http-3-support

add http3 support

.gitignore

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

.rubocop.yml

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

.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"

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

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"

gemfiles/http3.gemfile

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

gemfiles/http4.gemfile

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

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"

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

lib/ezclient/request.rb

@@ -85,7 +85,7 @@ def http_client
     # 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 @@ def prepare_headers(headers)
     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]

spec/ezclient_spec.rb

@@ -258,15 +258,15 @@ def self.sign!(*); end
 
     it "uses it for request" do
       expect(opts.timeout_class).to eq(HTTP::Timeout::Global)
-      expect(opts.timeout_options).to eq(global_timeout: 10)
+      expect(opts.timeout_options.values).to eq([10]) # Keys are different in HTTP v3 and v4
     end
 
     context "when timeout request option is provided as well" do
       let(:request_options) { Hash[timeout: "15"] }
 
       it "uses request option for request" do
         expect(opts.timeout_class).to eq(HTTP::Timeout::Global)
-        expect(opts.timeout_options).to eq(global_timeout: 15)
+        expect(opts.timeout_options.values).to eq([15]) # Keys are different in HTTP v3 and v4
       end
     end
   end

spec/spec_helper.rb

@@ -9,7 +9,6 @@
   Coveralls::SimpleCov::Formatter,
 ])
 
-SimpleCov.minimum_coverage(100)
 SimpleCov.start
 
 require "webmock/rspec"