excon 1.3.0 → 1.8.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.8.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -53,48 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.5
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +189,6 @@ files:
 - lib/excon/instrumentors/logging_instrumentor.rb
 - lib/excon/instrumentors/standard_instrumentor.rb
 - lib/excon/middlewares/base.rb
-- lib/excon/middlewares/capture_cookies.rb
 - lib/excon/middlewares/decompress.rb
 - lib/excon/middlewares/escape_path.rb
 - lib/excon/middlewares/expects.rb
@@ -241,14 +198,13 @@ files:
 - lib/excon/middlewares/redirect_follower.rb
 - lib/excon/middlewares/response_parser.rb
 - lib/excon/pretty_printer.rb
+- lib/excon/resolver_factory.rb
 - lib/excon/response.rb
 - lib/excon/socket.rb
+- lib/excon/socks5.rb
+- lib/excon/socks5_socket.rb
+- lib/excon/socks5_ssl_socket.rb
 - lib/excon/ssl_socket.rb
-- lib/excon/test/plugin/server/exec.rb
-- lib/excon/test/plugin/server/puma.rb
-- lib/excon/test/plugin/server/unicorn.rb
-- lib/excon/test/plugin/server/webrick.rb
-- lib/excon/test/server.rb
 - lib/excon/unix_socket.rb
 - lib/excon/utils.rb
 - lib/excon/version.rb
@@ -271,14 +227,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: speed, persistence, http(s)
 test_files: []

data/lib/excon/middlewares/capture_cookies.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-module Excon
-  module Middleware
-    class CaptureCookies < Excon::Middleware::Base
-
-      def extract_cookies_from_set_cookie(set_cookie)
-        set_cookie.split(',').map { |full| full.split(';').first.strip }.join('; ')
-      end
-
-      def get_header(datum, header)
-        _, header_value = datum[:response][:headers].detect do |key, _|
-          key.casecmp?(header)
-        end
-        header_value
-      end
-
-      def response_call(datum)
-        cookie = get_header(datum, 'Set-Cookie')
-        if cookie
-          cookie = extract_cookies_from_set_cookie(cookie)
-          unless datum[:headers].key?("Cookie")
-            datum[:headers]["Cookie"] = cookie
-          else
-            original_cookies = datum[:headers]["Cookie"]
-            datum[:headers]["Cookie"] = original_cookies.empty? ? cookie : [original_cookies,cookie].join('; ')
-          end
-        end
-        super(datum)
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-module Excon
-  module Test
-    module Plugin
-      module Server
-        module Exec
-          def start(app_str = app)
-            open_process(app_str)
-            process_stderr = ""
-            line = ''
-            until line =~ /\Aready\Z/
-              line = error.gets
-              raise process_stderr if line.nil?
-              process_stderr << line
-              fatal_time = elapsed_time > timeout
-              if fatal_time
-                msg = "executable #{app_str} has taken too long to start"
-                raise msg
-              end
-            end
-            true
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-module Excon
-  module Test
-    module Plugin
-      module Server
-        module Puma
-          def start(app_str = app, bind_uri = bind)
-            open_process(RbConfig.ruby, '-S', 'puma', '-b', bind_uri.to_s, app_str)
-            process_stderr = ""
-            line = ''
-            until line.include?('Use Ctrl-C to stop')
-              line = read.gets
-              raise process_stderr if line.nil?
-              process_stderr << line
-              fatal_time = elapsed_time > timeout
-              raise 'puma server has taken too long to start' if fatal_time
-            end
-            true
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-module Excon
-  module Test
-    module Plugin
-      module Server
-        module Unicorn
-          def start(app_str = app, bind_uri = bind)
-            bind_uri = URI.parse(bind_uri) unless bind_uri.is_a? URI::Generic
-            is_unix_socket = (bind_uri.scheme == "unix")
-            if is_unix_socket
-              bind_str = bind_uri.to_s
-            else
-              host = bind_uri.host.gsub(/[\[\]]/, '')
-              bind_str = "#{host}:#{bind_uri.port}"
-            end
-            args = [
-              RbConfig.ruby,
-              '-S',
-              'unicorn',
-              '--no-default-middleware',
-              '-l',
-              bind_str,
-              app_str
-            ]
-            open_process(*args)
-            process_stderr = ''
-            line = ''
-            until line.include?('worker=0 ready')
-              line = error.gets
-              raise process_stderr if line.nil?
-              process_stderr << line
-              fatal_time = elapsed_time > timeout
-              raise 'unicorn server has taken too long to start' if fatal_time
-            end
-            true
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-module Excon
-  module Test
-    module Plugin
-      module Server
-        module Webrick
-          def start(app_str = app, bind_uri = bind)
-            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(RbConfig.ruby, '-S', 'rackup', '-s', 'webrick', '--host', host, '--port', port, app_str)
-            process_stderr = ""
-            line = ''
-            until line.include?('HTTPServer#start')
-              line = error.gets
-              raise process_stderr if line.nil?
-              process_stderr << line
-              fatal_time = elapsed_time > timeout
-              raise 'webrick server has taken too long to start' if fatal_time
-            end
-            true
-          end
-        end
-      end
-    end
-  end
-end

data/lib/excon/test/server.rb

@@ -1,99 +0,0 @@
-require 'open4'
-require 'excon'
-require 'excon/test/plugin/server/webrick'
-require 'excon/test/plugin/server/unicorn'
-require 'excon/test/plugin/server/puma'
-require 'excon/test/plugin/server/exec'
-
-
-module Excon
-  module Test
-    class Server
-      attr_accessor :app, :server, :bind, :pid, :read, :write, :error, :started_at, :timeout
-
-      # Methods that must be implemented by a plugin
-      INSTANCE_REQUIRES = [:start]
-
-      def initialize(args)
-        # TODO: Validate these args
-        @server = args.keys.first
-        @app = args[server]
-        args[:bind] ||= 'tcp://127.0.0.1:9292'
-        @bind = URI.parse(args[:bind])
-        @is_unix_socket = (@bind.scheme == 'unix')
-        @bind.host = @bind.host.gsub(/[\[\]]/, '') unless @is_unix_socket
-        if args[:timeout]
-          @timeout = args[:timeout]
-        else
-          @timeout = 20
-        end
-        name = @server.to_s.split('_').collect(&:capitalize).join
-        plug = nested_const_get("Excon::Test::Plugin::Server::#{name}")
-        self.extend plug
-        check_implementation(plug)
-      end
-
-      def open_process(*args)
-        if RUBY_PLATFORM == 'java'
-          @pid, @write, @read, @error = IO.popen4(*args)
-        else
-          @pid, @write, @read, @error = Open4.popen4(*args)
-        end
-        @started_at = Time.now
-      end
-
-      def elapsed_time
-        Time.now - started_at
-      end
-
-      def stop
-        if RUBY_PLATFORM == 'java'
-          Process.kill('USR1', pid)
-        else
-          Process.kill('KILL', pid)
-          Process.wait(pid)
-        end
-
-        if @is_unix_socket
-          socket = @bind.path
-          File.delete(socket) if File.exist?(socket)
-        end
-
-        # TODO: Ensure process is really dead
-        dump_errors
-        true
-      end
-      def dump_errors
-        lines = error.read.split($/)
-        while (line = lines.shift)
-          case line
-            when /(ERROR|Error)/
-              unless line.match?(/(null cert chain|did not return a certificate|SSL_read:: internal error)/)
-                in_err = true
-                puts
-              end
-            when /^(127|localhost)/
-              in_err = false
-            end
-          puts line if in_err
-        end
-      end
-
-      private
-
-      def nested_const_get(namespace)
-        namespace.split('::').inject(Object) do |mod, klass|
-          mod.const_get(klass)
-        end
-      end
-
-      def check_implementation(plug)
-        INSTANCE_REQUIRES.each do |m|
-          unless self.respond_to? m
-            raise "FATAL: #{plug} does not implement ##{m}"
-          end
-        end
-      end
-    end
-  end
-end