http 5.0.0.pre → 5.0.0.pre2

data/spec/lib/http_spec.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "json"
 
@@ -307,6 +307,15 @@ RSpec.describe HTTP do
       end
     end
 
+    context "specifying per operation timeouts as frozen hash" do
+      let(:frozen_options) { {:read => 123}.freeze }
+      subject(:client) { HTTP.timeout(frozen_options) }
+
+      it "does not raise an error" do
+        expect { client }.not_to raise_error
+      end
+    end
+
     context "specifying a global timeout" do
       subject(:client) { HTTP.timeout 123 }
 
@@ -430,6 +439,26 @@ RSpec.describe HTTP do
         expect(response.to_s).to eq("#{body}-deflated")
       end
     end
+
+    context "with :normalize_uri" do
+      it "normalizes URI" do
+        response = HTTP.get "#{dummy.endpoint}/hello world"
+        expect(response.to_s).to eq("hello world")
+      end
+
+      it "uses the custom URI Normalizer method" do
+        client = HTTP.use(:normalize_uri => {:normalizer => :itself.to_proc})
+        response = client.get("#{dummy.endpoint}/hello world")
+        expect(response.status).to eq(400)
+      end
+
+      it "uses the default URI normalizer" do
+        client = HTTP.use :normalize_uri
+        expect(HTTP::URI::NORMALIZER).to receive(:call).and_call_original
+        response = client.get("#{dummy.endpoint}/hello world")
+        expect(response.to_s).to eq("hello world")
+      end
+    end
   end
 
   it "unifies socket errors into HTTP::ConnectionError" do

data/spec/support/black_hole.rb

@@ -2,7 +2,7 @@
 
 module BlackHole
   class << self
-    def method_missing(*) # rubocop: disable Style/MethodMissing
+    def method_missing(*) # rubocop:disable Style/MethodMissingSuper
       self
     end
 

data/spec/support/dummy_server.rb

@@ -13,15 +13,15 @@ class DummyServer < WEBrick::HTTPServer
   include ServerConfig
 
   CONFIG = {
-    :BindAddress  => "127.0.0.1",
-    :Port         => 0,
-    :AccessLog    => BlackHole,
-    :Logger       => BlackHole
+    :BindAddress => "127.0.0.1",
+    :Port        => 0,
+    :AccessLog   => BlackHole,
+    :Logger      => BlackHole
   }.freeze
 
   SSL_CONFIG = CONFIG.merge(
-    :SSLEnable            => true,
-    :SSLStartImmediately  => true
+    :SSLEnable           => true,
+    :SSLStartImmediately => true
   ).freeze
 
   def initialize(options = {}) # rubocop:disable Style/OptionHash

data/spec/support/dummy_server/servlet.rb

@@ -1,9 +1,8 @@
-# frozen_string_literal: true
 # encoding: UTF-8
+# frozen_string_literal: true
 
 class DummyServer < WEBrick::HTTPServer
-  # rubocop:disable Metrics/ClassLength
-  class Servlet < WEBrick::HTTPServlet::AbstractServlet
+  class Servlet < WEBrick::HTTPServlet::AbstractServlet # rubocop:disable Metrics/ClassLength
     def self.sockets
       @sockets ||= []
     end
@@ -18,7 +17,7 @@ class DummyServer < WEBrick::HTTPServer
     end
 
     %w[get post head].each do |method|
-      class_eval <<-RUBY, __FILE__, __LINE__
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def self.#{method}(path, &block)
           handlers["#{method}:\#{path}"] = block
         end
@@ -148,6 +147,11 @@ class DummyServer < WEBrick::HTTPServer
       res.body   = req.body
     end
 
+    get "/hello world" do |_req, res|
+      res.status = 200
+      res.body   = "hello world"
+    end
+
     post "/encoded-body" do |req, res|
       res.status = 200
 

data/spec/support/http_handling_shared.rb

@@ -14,11 +14,11 @@ RSpec.shared_context "HTTP handling" do
 
     let(:options) do
       {
-        :timeout_class => HTTP::Timeout::PerOperation,
+        :timeout_class   => HTTP::Timeout::PerOperation,
         :timeout_options => {
           :connect_timeout => conn_timeout,
-          :read_timeout => read_timeout,
-          :write_timeout => write_timeout
+          :read_timeout    => read_timeout,
+          :write_timeout   => write_timeout
         }
       }
     end
@@ -62,7 +62,7 @@ RSpec.shared_context "HTTP handling" do
   context "with a global timeout" do
     let(:options) do
       {
-        :timeout_class => HTTP::Timeout::Global,
+        :timeout_class   => HTTP::Timeout::Global,
         :timeout_options => {
           :global_timeout => global_timeout
         }

data/spec/support/ssl_helper.rb

@@ -5,7 +5,7 @@ require "pathname"
 require "certificate_authority"
 
 module SSLHelper
-  CERTS_PATH = Pathname.new File.expand_path("../../../tmp/certs", __FILE__)
+  CERTS_PATH = Pathname.new File.expand_path("../../tmp/certs", __dir__)
 
   class RootCertificate < ::CertificateAuthority::Certificate
     EXTENSIONS = {"keyUsage" => {"usage" => %w[critical keyCertSign]}}.freeze
@@ -83,14 +83,14 @@ module SSLHelper
 
     def client_params
       {
-        :key => client_cert.key,
-        :cert => client_cert.cert,
+        :key     => client_cert.key,
+        :cert    => client_cert.cert,
         :ca_file => ca.file
       }
     end
 
     %w[server client].each do |side|
-      class_eval <<-RUBY, __FILE__, __LINE__
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{side}_cert
           @#{side}_cert ||= ChildCertificate.new ca
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre
+  version: 5.0.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,64 +11,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: http-parser
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: http-form_data
+  name: http-cookie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: http-cookie
+  name: http-form_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: http-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ files:
 - lib/http/features/auto_inflate.rb
 - lib/http/features/instrumentation.rb
 - lib/http/features/logging.rb
+- lib/http/features/normalize_uri.rb
 - lib/http/headers.rb
 - lib/http/headers/known.rb
 - lib/http/headers/mixin.rb
@@ -162,6 +163,7 @@ files:
 - spec/lib/http/request/writer_spec.rb
 - spec/lib/http/request_spec.rb
 - spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/parser_spec.rb
 - spec/lib/http/response/status_spec.rb
 - spec/lib/http/response_spec.rb
 - spec/lib/http/uri_spec.rb
@@ -181,7 +183,11 @@ files:
 homepage: https://github.com/httprb/http
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/httprb/http
+  wiki_uri: https://github.com/httprb/http/wiki
+  bug_tracker_uri: https://github.com/httprb/http/issues
+  changelog_uri: https://github.com/httprb/http/blob/v5.0.0.pre2/CHANGES.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -197,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
@@ -225,6 +231,7 @@ test_files:
 - spec/lib/http/request/writer_spec.rb
 - spec/lib/http/request_spec.rb
 - spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/parser_spec.rb
 - spec/lib/http/response/status_spec.rb
 - spec/lib/http/response_spec.rb
 - spec/lib/http/uri_spec.rb