Support httprb 4.0

httprb/http#446
Eric-Guo · Jan 22, 2019 · 40aa9ee · 40aa9ee
1 parent 37be629
commit 40aa9ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/wechat/http_client.rb b/lib/wechat/http_client.rb
@@ -6,7 +6,11 @@ class HttpClient
 
     def initialize(base, timeout, skip_verify_ssl)
       @base = base
-      @httprb = HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
+      @httprb = if HTTP::VERSION.to_i >= 4
+                  HTTP.timeout(write: timeout, connect: timeout, read: timeout)
+                else
+                  HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
+                end
       @ssl_context = OpenSSL::SSL::SSLContext.new
       @ssl_context.ssl_version = :TLSv1
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl

diff --git a/wechat.gemspec b/wechat.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME.end_with?('gem')
 
   s.add_runtime_dependency 'activesupport', '>= 3.2', '< 6'
-  s.add_runtime_dependency 'http', '>= 1.0.4', '< 4'
+  s.add_runtime_dependency 'http', '>= 1.0.4', '< 5'
   s.add_runtime_dependency 'nokogiri', '>=1.6.0'
   s.add_runtime_dependency 'thor'
   s.add_development_dependency 'rails', '>= 5.1'