RubyGems - http - Versions diffs - 0.8.0.pre4 → 0.8.0.pre5 - Mend

http 0.8.0.pre4 → 0.8.0.pre5

Files changed (28) hide show

checksums.yaml +4 -4
data/.rubocop.yml +3 -0
data/CHANGES.md +1 -1
data/Gemfile +1 -0
data/README.md +1 -0
data/Rakefile +42 -0
data/lib/http/chainable.rb +1 -1
data/lib/http/client.rb +17 -10
data/lib/http/connection.rb +81 -52
data/lib/http/options.rb +11 -1
data/lib/http/redirector.rb +60 -32
data/lib/http/response/status/reasons.rb +13 -7
data/lib/http/timeout/global.rb +14 -29
data/lib/http/timeout/null.rb +0 -2
data/lib/http/timeout/per_operation.rb +16 -68
data/lib/http/version.rb +1 -1
data/spec/lib/http/client_spec.rb +24 -28
data/spec/lib/http/options/merge_spec.rb +2 -0
data/spec/lib/http/redirector_spec.rb +338 -57
data/spec/lib/http/response/status_spec.rb +0 -6
data/spec/lib/http_spec.rb +2 -2
data/spec/spec_helper.rb +0 -7
data/spec/support/dummy_server.rb +13 -24
data/spec/support/http_handling_shared.rb +19 -45
data/spec/support/servers/config.rb +0 -4
data/spec/support/ssl_helper.rb +102 -0
metadata +4 -4
data/spec/support/create_certs.rb +0 -57

data/spec/lib/http/response/status_spec.rb CHANGED Viewed

@@ -68,12 +68,6 @@ RSpec.describe HTTP::Response::Status do
     # "Bad Request"
     its([400]) { is_expected.to be :bad_request }
-    # "Request-URI Too Long"
-    its([414]) { is_expected.to be :request_uri_too_long }
-    # "I'm a Teapot"
-    its([418]) { is_expected.to be :im_a_teapot }
   end
   described_class::SYMBOLS.each do |code, symbol|

data/spec/lib/http_spec.rb CHANGED Viewed

@@ -106,12 +106,12 @@ RSpec.describe HTTP do
   context "with redirects" do
     it "is easy for 301" do
-      response = HTTP.with_follow(true).get("#{dummy.endpoint}/redirect-301")
+      response = HTTP.follow.get("#{dummy.endpoint}/redirect-301")
       expect(response.to_s).to match(/<!doctype html>/)
     end
     it "is easy for 302" do
-      response = HTTP.with_follow(true).get("#{dummy.endpoint}/redirect-302")
+      response = HTTP.follow.get("#{dummy.endpoint}/redirect-302")
       expect(response.to_s).to match(/<!doctype html>/)
     end
   end

data/spec/spec_helper.rb CHANGED Viewed

@@ -17,13 +17,6 @@ require "http"
 require "rspec/its"
 require "support/capture_warning"
-# Allow testing against a SSL server
-def certs_dir
-  Pathname.new File.expand_path("../../tmp/certs", __FILE__)
-end
-require "support/create_certs"
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

data/spec/support/dummy_server.rb CHANGED Viewed

@@ -5,6 +5,7 @@ require "support/black_hole"
 require "support/dummy_server/servlet"
 require "support/servers/config"
 require "support/servers/runner"
+require "support/ssl_helper"
 class DummyServer < WEBrick::HTTPServer
   include ServerConfig
@@ -16,37 +17,25 @@ class DummyServer < WEBrick::HTTPServer
     :Logger       => BlackHole
   }.freeze
-  def initialize(options = {})
-    if options[:ssl]
-      override_config = {
-        :SSLEnable            => true,
-        :SSLStartImmediately  => true
-      }
-    else
-      override_config = {}
-    end
-    super CONFIG.merge(override_config)
+  SSL_CONFIG = CONFIG.merge(
+    :SSLEnable            => true,
+    :SSLStartImmediately  => true
+  ).freeze
+  def initialize(options = {})
+    super(options[:ssl] ? SSL_CONFIG : CONFIG)
     mount("/", Servlet)
   end
   def endpoint
-    "#{ssl? ? 'https' : 'http'}://#{addr}:#{port}"
+    "#{scheme}://#{addr}:#{port}"
+  end
+  def scheme
+    config[:SSLEnable] ? "https" : "http"
   end
   def ssl_context
-    @ssl_context ||= begin
-      context = OpenSSL::SSL::SSLContext.new
-      context.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      context.key = OpenSSL::PKey::RSA.new(
-        File.read(File.join(certs_dir, "server.key"))
-      )
-      context.cert = OpenSSL::X509::Certificate.new(
-        File.read(File.join(certs_dir, "server.crt"))
-      )
-      context.ca_file = File.join(certs_dir, "ca.crt")
-      context
-    end
+    @ssl_context ||= SSLHelper.server_context
   end
 end

data/spec/support/http_handling_shared.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-RSpec.shared_context "HTTP handling" do |ssl = false|
+RSpec.shared_context "HTTP handling" do
   describe "timeouts" do
     let(:conn_timeout) { 1 }
     let(:read_timeout) { 1 }
@@ -73,56 +73,18 @@ RSpec.shared_context "HTTP handling" do |ssl = false|
       let(:response) { client.get(server.endpoint).body.to_s }
-      context "with localhost" do
-        let(:endpoint) { server.endpoint.sub("127.0.0.1", "localhost") }
-        it "errors if DNS takes too long" do
-          # Block the localhost lookup
-          expect(timeout_class::HostResolver)
-            .to receive(:getaddress).with("localhost").and_return(nil)
-          # Request
-          expect(Resolv::DNS).to receive(:open).with(:timeout => 1) do |_|
-            sleep 1.25
-            "127.0.0.1"
-          end
-          expect { client.get(server.endpoint.sub("127.0.0.1", "localhost")) }
-            .to raise_error(HTTP::TimeoutError, /Timed out/)
-        end
-      end
       it "errors if connecting takes too long" do
-        socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-        fake_socket = double(:to_io => socket)
-        expect(fake_socket).to receive(:connect_nonblock) do |*args|
+        expect(TCPSocket).to receive(:open) do
           sleep 1.25
-          socket.connect_nonblock(*args)
         end
-        allow_any_instance_of(timeout_class).to receive(:socket).and_return(fake_socket)
-        expect { response }.to raise_error(HTTP::TimeoutError, /Timed out/)
+        expect { response }.to raise_error(HTTP::TimeoutError, /execution/)
       end
       it "errors if reading takes too long" do
         expect { client.get("#{server.endpoint}/sleep").body.to_s }
           .to raise_error(HTTP::TimeoutError, /Timed out/)
       end
-      unless ssl
-        it "errors if writing takes too long" do
-          socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-          allow_any_instance_of(timeout_class).to receive(:socket).and_return(socket)
-          expect(socket).to receive(:<<) do |*|
-            sleep 1.25
-          end
-          expect { response }.to raise_error(HTTP::TimeoutError, /Timed out/)
-        end
-      end
     end
   end
@@ -148,6 +110,18 @@ RSpec.shared_context "HTTP handling" do |ssl = false|
         expect(sockets_used.uniq.length).to eq(1)
       end
+      context "on a mixed state" do
+        it "re-opens the connection" do
+          first_socket_id = client.get("#{server.endpoint}/socket/1").body.to_s
+          client.instance_variable_set(:@state, :dirty)
+          second_socket_id = client.get("#{server.endpoint}/socket/2").body.to_s
+          expect(first_socket_id).to_not eq(second_socket_id)
+        end
+      end
       context "when trying to read a stale body" do
         it "errors" do
           client.get("#{server.endpoint}/not-found")
@@ -169,8 +143,8 @@ RSpec.shared_context "HTTP handling" do |ssl = false|
       context "with a socket issue" do
         it "transparently reopens" do
-          first_socket = client.get("#{server.endpoint}/socket").body.to_s
-          expect(first_socket).to_not eq("")
+          first_socket_id = client.get("#{server.endpoint}/socket").body.to_s
+          expect(first_socket_id).to_not eq("")
           # Kill off the sockets we used
           # rubocop:disable Style/RescueModifier
           DummyServer::Servlet.sockets.each do |socket|
@@ -183,8 +157,8 @@ RSpec.shared_context "HTTP handling" do |ssl = false|
           expect { client.get("#{server.endpoint}/socket").body.to_s }.to raise_error(IOError)
           # Should succeed since we create a new socket
-          second_socket = client.get("#{server.endpoint}/socket").body.to_s
-          expect(second_socket).to_not eq(first_socket)
+          second_socket_id = client.get("#{server.endpoint}/socket").body.to_s
+          expect(second_socket_id).to_not eq(first_socket_id)
         end
       end

data/spec/support/servers/config.rb CHANGED Viewed

@@ -1,8 +1,4 @@
 module ServerConfig
-  def ssl?
-    !!config[:SSLEnable]
-  end
   def addr
     config[:BindAddress]
   end

data/spec/support/ssl_helper.rb ADDED Viewed

@@ -0,0 +1,102 @@
+require "pathname"
+require "certificate_authority"
+module SSLHelper
+  CERTS_PATH = Pathname.new File.expand_path("../../../tmp/certs", __FILE__)
+  class RootCertificate < ::CertificateAuthority::Certificate
+    EXTENSIONS = {"keyUsage" => {"usage" => %w(critical keyCertSign)}}
+    def initialize
+      super()
+      subject.common_name  = "honestachmed.com"
+      serial_number.number = 1
+      key_material.generate_key
+      self.signing_entity = true
+      sign!("extensions" => EXTENSIONS)
+    end
+    def file
+      return @file if defined? @file
+      CERTS_PATH.mkpath
+      cert_file = CERTS_PATH.join("ca.crt")
+      cert_file.open("w") { |io| io << to_pem }
+      @file = cert_file.to_s
+    end
+  end
+  class ChildCertificate < ::CertificateAuthority::Certificate
+    def initialize(parent)
+      super()
+      subject.common_name  = "127.0.0.1"
+      serial_number.number = 1
+      key_material.generate_key
+      self.parent = parent
+      sign!
+    end
+    def cert
+      OpenSSL::X509::Certificate.new to_pem
+    end
+    def key
+      OpenSSL::PKey::RSA.new key_material.private_key.to_pem
+    end
+  end
+  class << self
+    def server_context
+      context = OpenSSL::SSL::SSLContext.new
+      context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      context.key         = server_cert.key
+      context.cert        = server_cert.cert
+      context.ca_file     = ca.file
+      context
+    end
+    def client_context
+      context = OpenSSL::SSL::SSLContext.new
+      context.options     = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options]
+      context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      context.key         = client_cert.key
+      context.cert        = client_cert.cert
+      context.ca_file     = ca.file
+      context
+    end
+    def client_params
+      {
+        :key => client_cert.key,
+        :cert => client_cert.cert,
+        :ca_file => ca.file
+      }
+    end
+    %w(server client).each do |side|
+      class_eval <<-RUBY, __FILE__, __LINE__
+        def #{side}_cert
+          @#{side}_cert ||= ChildCertificate.new ca
+        end
+      RUBY
+    end
+    def ca
+      @ca ||= RootCertificate.new
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre4
+  version: 0.8.0.pre5
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -138,13 +138,13 @@ files:
 - spec/support/black_hole.rb
 - spec/support/capture_warning.rb
 - spec/support/connection_reuse_shared.rb
-- spec/support/create_certs.rb
 - spec/support/dummy_server.rb
 - spec/support/dummy_server/servlet.rb
 - spec/support/http_handling_shared.rb
 - spec/support/proxy_server.rb
 - spec/support/servers/config.rb
 - spec/support/servers/runner.rb
+- spec/support/ssl_helper.rb
 homepage: https://github.com/httprb/http.rb
 licenses:
 - MIT
@@ -199,11 +199,11 @@ test_files:
 - spec/support/black_hole.rb
 - spec/support/capture_warning.rb
 - spec/support/connection_reuse_shared.rb
-- spec/support/create_certs.rb
 - spec/support/dummy_server.rb
 - spec/support/dummy_server/servlet.rb
 - spec/support/http_handling_shared.rb
 - spec/support/proxy_server.rb
 - spec/support/servers/config.rb
 - spec/support/servers/runner.rb
+- spec/support/ssl_helper.rb
 has_rdoc:

data/spec/support/create_certs.rb DELETED Viewed

@@ -1,57 +0,0 @@
-require "fileutils"
-require "certificate_authority"
-FileUtils.mkdir_p(certs_dir)
-#
-# Certificate Authority
-#
-ca = CertificateAuthority::Certificate.new
-ca.subject.common_name  = "honestachmed.com"
-ca.serial_number.number = 1
-ca.key_material.generate_key
-ca.signing_entity = true
-ca.sign! "extensions" => {"keyUsage" => {"usage" => %w(critical keyCertSign)}}
-ca_cert_path = File.join(certs_dir, "ca.crt")
-ca_key_path  = File.join(certs_dir, "ca.key")
-File.write ca_cert_path, ca.to_pem
-File.write ca_key_path,  ca.key_material.private_key.to_pem
-#
-# Server Certificate
-#
-server_cert = CertificateAuthority::Certificate.new
-server_cert.subject.common_name  = "127.0.0.1"
-server_cert.serial_number.number = 1
-server_cert.key_material.generate_key
-server_cert.parent = ca
-server_cert.sign!
-server_cert_path = File.join(certs_dir, "server.crt")
-server_key_path  = File.join(certs_dir, "server.key")
-File.write server_cert_path, server_cert.to_pem
-File.write server_key_path,  server_cert.key_material.private_key.to_pem
-#
-# Client Certificate
-#
-client_cert = CertificateAuthority::Certificate.new
-client_cert.subject.common_name  = "127.0.0.1"
-client_cert.serial_number.number = 1
-client_cert.key_material.generate_key
-client_cert.parent = ca
-client_cert.sign!
-client_cert_path = File.join(certs_dir, "client.crt")
-client_key_path  = File.join(certs_dir, "client.key")
-File.write client_cert_path, client_cert.to_pem
-File.write client_key_path,  client_cert.key_material.private_key.to_pem