excon 0.88.0 → 0.90.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4833043db3796214dc4c5e339db701b609f0664fe5e3dd24f9c0c69a4e94d3ca
-  data.tar.gz: 6a2cba5d185ded99cffbf4057ed141ca15993ed409a5bb8059aef83b6d26c680
+  metadata.gz: 6514f6e331e286e8c6c8f022eee9e79a9483b28ff9e218aa10ea9e0dd63a1f5c
+  data.tar.gz: b58f6111c8f93dd0c5f625e727b065830467d8c61b6880767e878b88642e63bf
 SHA512:
-  metadata.gz: 5dc2124ca9454071c435b814a70dff35c2eee0ed7f7f0e90f5cbd7b5705863c7bd8c69ab40f86d626c83672cd94117a7f6b4bf581101d699034bde70be96d93e
-  data.tar.gz: a9048686e48a21fa494dc09394881fa11ff7a6786bb216e06ceb95530d251e3c04c331f5a2b24e04e60cb08e4a5e7003f6ece127c01dc5a4c71df27361d27a66
+  metadata.gz: eb9ca062b32869a3c1ea826f3888f310a4dde0bff6a1bfb85a7c12f7b8efe349027961f0d44ca4f1f67e12711ba586a1c866c70bd45dbf6cad8e99c407312a1d
+  data.tar.gz: 0e8897cd518e4e0153681e2e8f05baceb6c4186ce52d8c4bc9128d0622a15506c225505dd4d7cd1252a05d8d000833c44a2a06c5bde7494e30f8a721ac6cf659

data/CONTRIBUTING.md

@@ -19,5 +19,4 @@ New contributors are always welcome, when it doubt please ask questions. We stri
 * Write and help edit [documentation](https://github.com/excon/excon.github.com).
 * Translate [documentation](https://github.com/excon/excon.github.com) in to other languages.
 * Organize or volunteer at events.
-* [Donate](https://www.gittip.com/geemus/)!
 * Discuss other ideas for contribution with [geemus](mailto:geemus+excon@gmail.com).

data/excon.gemspec

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), 'lib', 'excon', 'version')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
+require 'excon/version'
 
 Gem::Specification.new do |s|
   s.name             = 'excon'

data/lib/excon/middlewares/decompress.rb

@@ -2,6 +2,10 @@
 module Excon
   module Middleware
     class Decompress < Excon::Middleware::Base
+
+      INFLATE_ZLIB_OR_GZIP  = 47 # Zlib::MAX_WBITS + 32
+      INFLATE_RAW           = -15 # Zlib::MAX_WBITS * -1
+
       def request_call(datum)
         unless datum.has_key?(:response_block)
           key = datum[:headers].keys.detect {|k| k.to_s.casecmp('Accept-Encoding') == 0 } || 'Accept-Encoding'
@@ -19,8 +23,11 @@ module Excon
             encodings = Utils.split_header_value(datum[:response][:headers][key])
             if (encoding = encodings.last)
               if encoding.casecmp('deflate') == 0
-                # assume inflate omits header
-                datum[:response][:body] = Zlib::Inflate.new(-Zlib::MAX_WBITS).inflate(body)
+                datum[:response][:body] = begin
+                  Zlib::Inflate.new(INFLATE_ZLIB_OR_GZIP).inflate(body)
+                rescue Zlib::DataError # fallback to raw on error
+                  Zlib::Inflate.new(INFLATE_RAW).inflate(body)
+                end
                 encodings.pop
               elsif encoding.casecmp('gzip') == 0 || encoding.casecmp('x-gzip') == 0
                 datum[:response][:body] = Zlib::GzipReader.new(StringIO.new(body)).read

data/lib/excon/ssl_socket.rb

@@ -54,11 +54,13 @@ module Excon
           ssl_context.cert_store = cert_store
         end
 
-        # no defaults, fallback to bundled
-        unless ca_file || ca_path || cert_store
+        if cert_store.nil?
           ssl_context.cert_store = OpenSSL::X509::Store.new
           ssl_context.cert_store.set_default_paths
+        end
 
+        # no defaults, fallback to bundled
+        unless ca_file || ca_path || cert_store
           # workaround issue #257 (JRUBY-6970)
           ca_file = DEFAULT_CA_FILE
           ca_file = ca_file.gsub(/^jar:/, '') if ca_file =~ /^jar:file:\//

data/lib/excon/test/plugin/server/puma.rb

@@ -4,7 +4,7 @@ module Excon
       module Server
         module Puma
           def start(app_str = app, bind_uri = bind)
-            open_process('puma', '-b', bind_uri.to_s, app_str)
+            open_process(RbConfig.ruby, '-S', 'puma', '-b', bind_uri.to_s, app_str)
             process_stderr = ""
             line = ''
             until line =~ /Use Ctrl-C to stop/

data/lib/excon/test/plugin/server/unicorn.rb

@@ -13,6 +13,8 @@ module Excon
               bind_str = "#{host}:#{bind_uri.port}"
             end
             args = [ 
+              RbConfig.ruby,
+              '-S',
               'unicorn', 
               '--no-default-middleware', 
               '-l',

data/lib/excon/test/plugin/server/webrick.rb

@@ -7,7 +7,7 @@ module Excon
             bind_uri = URI.parse(bind_uri) unless bind_uri.is_a? URI::Generic
             host = bind_uri.host.gsub(/[\[\]]/, '')
             port = bind_uri.port.to_s
-            open_process('rackup', '-s', 'webrick', '--host', host, '--port', port, app_str)
+            open_process(RbConfig.ruby, '-S', 'rackup', '-s', 'webrick', '--host', host, '--port', port, app_str)
             process_stderr = ""
             line = ''
             until line =~ /HTTPServer#start/

data/lib/excon/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Excon
-  VERSION = '0.88.0'
+  VERSION = '0.90.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.88.0
+  version: 0.90.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec