http 0.8.0.pre5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfd83e5db031e7c10a162574f2c700e879b66ea1
-  data.tar.gz: 3bcb6718bb90463c39ac0170482c86fe04f59da9
+  metadata.gz: ca4f83715e058d0fd9d76333e0acc15ef369ad0c
+  data.tar.gz: c040a30b4733d5438368e83c21bfc7d83ebc20f9
 SHA512:
-  metadata.gz: f1b99fd432ba3b1cb7e0ec555796d86d75029543148d8f1a8f0e7fd3d49f898fef0b0dc2afee46fb7eb38add8aa803266b212cfc5b4941d2aa88ea220c938dae
-  data.tar.gz: 8594e4e915ea23e9646d0b3e335b733bf74be8af488a6fe15ff458c3edc1eb70ac3821abcab551afa4e419e4d301ddc13b1bee2c9623eb293683b694963bb106
+  metadata.gz: f10c3683cb13697bb8be4aa893041cfca2f823d5df98e3259a2cac238ab69721e4d3ddc5e68bd524301f3be6cfbc5c7cf266a36baf356396685fac4f253a56ff
+  data.tar.gz: 67ca53156ac393947f01e3e4e4620856f57751c5a85a64645d621779627a0dcf752e43995ae0ff1d3ee1a19975fa63de0d0573a939912e7971f3609915e17d2c

data/CHANGES.md

@@ -1,9 +1,13 @@
-## 0.8.0.pre5 (2015-03-27)
+## 0.8.0 (2015-04-01)
 
+* Properly handle WaitWritable for SSL. See #199. (@zanker)
+* Add support for non-ASCII URis. See #197. (@ixti)
+* Add configurable connection timeouts. See #187, #194, #195. (@zanker)
+* Refactor requests redirect following logic. See #179. (@ixti)
 * Support for persistent HTTP connections (@zanker)
 * Add caching support. See #77 and #177. (@Asmod4n, @pezra)
 * Improve servers used in specs boot up. Issue was initially raised up
-  by @olegkovalenko. See #176.
+  by @olegkovalenko. See #176. (@ixti)
 * Reflect FormData rename changes (FormData -> HTTP::FormData). (@ixti)
 * `HTTP::Headers` now raises `HTTP::InvalidHeaderNameError` in case of
   (surprise) invalid HTTP header field name (e.g.`"Foo:Bar"`). See #173.

data/http.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |gem|
   gem.version       = HTTP::VERSION
 
   gem.add_runtime_dependency "http_parser.rb", "~> 0.6.0"
-  gem.add_runtime_dependency "http-form_data", "~> 1.0.0"
+  gem.add_runtime_dependency "http-form_data", "~> 1.0.1"
+  gem.add_runtime_dependency "addressable",    "~> 2.3"
 
   gem.add_development_dependency "bundler", "~> 1.0"
 end

data/lib/http/client.rb

@@ -1,9 +1,11 @@
 require "cgi"
 require "uri"
+
 require "http/form_data"
 require "http/options"
 require "http/connection"
 require "http/redirector"
+require "http/uri"
 
 module HTTP
   # Clients make requests and receive responses
@@ -14,6 +16,8 @@ module HTTP
     KEEP_ALIVE         = "Keep-Alive".freeze
     CLOSE              = "close".freeze
 
+    HTTP_OR_HTTPS_RE   = %r{^https?://}i
+
     attr_reader :default_options
 
     def initialize(default_options = {})
@@ -109,33 +113,25 @@ module HTTP
 
     # Strips out query/path to give us a consistent way of comparing hosts
     def base_host(uri)
-      base = uri.dup
-      base.query = nil
-      base.path = ""
-      base.to_s
+      uri.omit(:query, :path).to_s
     end
 
     # Merges query params if needed
+    #
+    # @param [#to_s] uri
+    # @return [URI]
     def make_request_uri(uri, options)
-      uri = normalize_uri uri
+      uri = uri.to_s
 
-      if options.params && !options.params.empty?
-        params    = CGI.parse(uri.query.to_s).merge(options.params || {})
-        uri.query = URI.encode_www_form params
+      if default_options.persistent? && uri !~ HTTP_OR_HTTPS_RE
+        uri = "#{default_options.persistent}#{uri}"
       end
 
-      uri
-    end
+      uri = HTTP::URI.parse uri
 
-    # Normalize URI
-    #
-    # @param [#to_s] uri
-    # @return [URI]
-    def normalize_uri(uri)
-      if default_options.persistent? && uri !~ /^http|https/
-        uri = URI("#{default_options.persistent}#{uri}")
-      else
-        uri = URI(uri.to_s)
+      if options.params && !options.params.empty?
+        params    = CGI.parse(uri.query.to_s).merge(options.params || {})
+        uri.query = ::URI.encode_www_form params
       end
 
       # Some proxies (seen on WEBRick) fail if URL has

data/lib/http/connection.rb

@@ -129,7 +129,7 @@ module HTTP
     # @param (see #initialize)
     # @return [void]
     def start_tls(req, options)
-      return unless req.uri.is_a?(URI::HTTPS) && !req.using_proxy?
+      return unless req.uri.https? && !req.using_proxy?
 
       ssl_context = options[:ssl_context]
 

data/lib/http/request.rb

@@ -1,14 +1,18 @@
+require "forwardable"
+require "base64"
+require "time"
+
 require "http/errors"
 require "http/headers"
 require "http/request/caching"
 require "http/request/writer"
 require "http/version"
-require "base64"
-require "uri"
-require "time"
+require "http/uri"
 
 module HTTP
   class Request
+    extend Forwardable
+
     include HTTP::Headers::Mixin
 
     # The method given was not understood
@@ -70,7 +74,7 @@ module HTTP
     # :nodoc:
     def initialize(verb, uri, headers = {}, proxy = {}, body = nil, version = "1.1") # rubocop:disable ParameterLists
       @verb   = verb.to_s.downcase.to_sym
-      @uri    = uri.is_a?(URI) ? uri : URI(uri.to_s)
+      @uri    = HTTP::URI.parse uri
       @scheme = @uri.scheme && @uri.scheme.to_s.downcase.to_sym
 
       fail(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
@@ -80,14 +84,13 @@ module HTTP
 
       @headers = HTTP::Headers.coerce(headers || {})
 
-      @headers["Host"]        ||= default_host
+      @headers["Host"]        ||= default_host_header_value
       @headers["User-Agent"]  ||= USER_AGENT
     end
 
     # Returns new Request with updated uri
     def redirect(uri, verb = @verb)
-      uri = @uri.merge uri.to_s
-      req = self.class.new(verb, uri, headers, proxy, body, version)
+      req = self.class.new(verb, @uri.join(uri), headers, proxy, body, version)
       req["Host"] = req.uri.host
       req
     end
@@ -116,17 +119,17 @@ module HTTP
 
     # Compute HTTP request header for direct or proxy request
     def request_header
-      "#{verb.to_s.upcase} #{path_for_request_header} HTTP/#{version}"
+      "#{verb.to_s.upcase} #{uri.normalize} HTTP/#{version}"
     end
 
     # Host for tcp socket
     def socket_host
-      using_proxy? ? proxy[:proxy_address] : uri.host
+      using_proxy? ? proxy[:proxy_address] : host
     end
 
     # Port for tcp socket
     def socket_port
-      using_proxy? ? proxy[:proxy_port] : uri.port
+      using_proxy? ? proxy[:proxy_port] : port
     end
 
     # @return [HTTP::Request::Caching]
@@ -136,32 +139,19 @@ module HTTP
 
     private
 
-    def path_for_request_header
-      if using_proxy?
-        uri
-      else
-        uri_path_with_query
-      end
-    end
-
-    def uri_path_with_query
-      path = uri_has_query? ? "#{uri.path}?#{uri.query}" : uri.path
-      path.empty? ? "/" : path
-    end
+    # @!attribute [r] host
+    #   @return [String]
+    def_delegator :@uri, :host
 
-    def uri_has_query?
-      uri.query && !uri.query.empty?
+    # @!attribute [r] port
+    #   @return [Fixnum]
+    def port
+      @uri.port || @uri.default_port
     end
 
-    # Default host (with port if needed) header value.
-    #
-    # @return [String]
-    def default_host
-      if PORTS[@scheme] == @uri.port
-        @uri.host
-      else
-        "#{@uri.host}:#{@uri.port}"
-      end
+    # @return [String] Default host (with port if needed) header value.
+    def default_host_header_value
+      PORTS[@scheme] != port ? "#{host}:#{port}" : host
     end
   end
 end

data/lib/http/uri.rb

@@ -0,0 +1,23 @@
+require "addressable/uri"
+
+module HTTP
+  class URI < Addressable::URI
+    # HTTP scheme
+    HTTP_SCHEME = "http".freeze
+
+    # HTTPS scheme
+    HTTPS_SCHEME = "https".freeze
+
+    # @return [True] if URI is HTTP
+    # @return [False] otherwise
+    def http?
+      HTTP_SCHEME == scheme
+    end
+
+    # @return [True] if URI is HTTPS
+    # @return [False] otherwise
+    def https?
+      HTTPS_SCHEME == scheme
+    end
+  end
+end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.0.pre5"
+  VERSION = "0.8.0"
 end

data/spec/lib/http/client_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require "support/http_handling_shared"
 require "support/dummy_server"
 require "support/ssl_helper"
@@ -9,7 +11,7 @@ RSpec.describe HTTP::Client do
 
   StubbedClient = Class.new(HTTP::Client) do
     def make_request(request, options)
-      stubs.fetch(request.uri.to_s) { super(request, options) }
+      stubs.fetch(request.uri) { super(request, options) }
     end
 
     def stubs
@@ -17,7 +19,10 @@ RSpec.describe HTTP::Client do
     end
 
     def stub(stubs)
-      @stubs = stubs
+      @stubs = stubs.each_with_object({}) do |(k, v), o|
+        o[HTTP::URI.parse k] = v
+      end
+
       self
     end
   end
@@ -73,6 +78,23 @@ RSpec.describe HTTP::Client do
       expect { client.get("http://example.com/") }
         .to raise_error(HTTP::Redirector::TooManyRedirectsError)
     end
+
+    context "with non-ASCII URLs" do
+      it "theoretically works like a charm" do
+        client = StubbedClient.new(:follow => true).stub(
+          "http://example.com/"      => redirect_response("/könig"),
+          "http://example.com/könig" => simple_response("OK")
+        )
+
+        expect { client.get "http://example.com/könig" }.not_to raise_error
+      end
+
+      it "works like a charm in real world" do
+        url    = "http://git.io/jNeY"
+        client = HTTP.follow
+        expect(client.get(url).to_s).to include "support for non-ascii URIs"
+      end
+    end
   end
 
   describe "caching" do
@@ -154,6 +176,19 @@ RSpec.describe HTTP::Client do
   end
 
   describe "#request" do
+    context "with non-ASCII URLs" do
+      it "theoretically works like a charm" do
+        client =  described_class.new
+        expect { client.get "#{dummy.endpoint}/könig" }.not_to raise_error
+      end
+
+      it "works like a charm in real world" do
+        url     = "https://github.com/httprb/http.rb/pull/197/ö無"
+        client  = HTTP.follow
+        expect(client.get(url).to_s).to include "support for non-ascii URIs"
+      end
+    end
+
     context "with explicitly given `Host` header" do
       let(:headers) { {"Host" => "another.example.com"} }
       let(:client)  { described_class.new :headers => headers }

data/spec/lib/http/request_spec.rb

@@ -71,7 +71,7 @@ RSpec.describe HTTP::Request do
 
     subject(:redirected) { request.redirect "http://blog.example.com/" }
 
-    its(:uri)     { is_expected.to eq URI.parse "http://blog.example.com/" }
+    its(:uri)     { is_expected.to eq HTTP::URI.parse "http://blog.example.com/" }
 
     its(:verb)    { is_expected.to eq request.verb }
     its(:body)    { is_expected.to eq request.body }
@@ -84,7 +84,7 @@ RSpec.describe HTTP::Request do
     context "with schema-less absolute URL given" do
       subject(:redirected) { request.redirect "//another.example.com/blog" }
 
-      its(:uri)     { is_expected.to eq URI.parse "http://another.example.com/blog" }
+      its(:uri)     { is_expected.to eq HTTP::URI.parse "http://another.example.com/blog" }
 
       its(:verb)    { is_expected.to eq request.verb }
       its(:body)    { is_expected.to eq request.body }
@@ -98,7 +98,7 @@ RSpec.describe HTTP::Request do
     context "with relative URL given" do
       subject(:redirected) { request.redirect "/blog" }
 
-      its(:uri)     { is_expected.to eq URI.parse "http://example.com/blog" }
+      its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com/blog" }
 
       its(:verb)    { is_expected.to eq request.verb }
       its(:body)    { is_expected.to eq request.body }
@@ -110,14 +110,14 @@ RSpec.describe HTTP::Request do
 
       context "with original URI having non-standard port" do
         let(:request) { HTTP::Request.new(:post, "http://example.com:8080/", headers, proxy, body) }
-        its(:uri)     { is_expected.to eq URI.parse "http://example.com:8080/blog" }
+        its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
       end
     end
 
     context "with relative URL that misses leading slash given" do
       subject(:redirected) { request.redirect "blog" }
 
-      its(:uri)     { is_expected.to eq URI.parse "http://example.com/blog" }
+      its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com/blog" }
 
       its(:verb)    { is_expected.to eq request.verb }
       its(:body)    { is_expected.to eq request.body }
@@ -129,7 +129,7 @@ RSpec.describe HTTP::Request do
 
       context "with original URI having non-standard port" do
         let(:request) { HTTP::Request.new(:post, "http://example.com:8080/", headers, proxy, body) }
-        its(:uri)     { is_expected.to eq URI.parse "http://example.com:8080/blog" }
+        its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
       end
     end
 

data/spec/lib/http_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe HTTP do
 
     context "with URI instance" do
       it "is easy" do
-        response = HTTP.get URI dummy.endpoint
+        response = HTTP.get HTTP::URI.parse dummy.endpoint
         expect(response.to_s).to match(/<!doctype html>/)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre5
+  version: 0.8.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -32,14 +32,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +121,7 @@ files:
 - lib/http/timeout/global.rb
 - lib/http/timeout/null.rb
 - lib/http/timeout/per_operation.rb
+- lib/http/uri.rb
 - lib/http/version.rb
 - logo.png
 - spec/lib/http/cache/headers_spec.rb
@@ -160,50 +175,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
-test_files:
-- spec/lib/http/cache/headers_spec.rb
-- spec/lib/http/cache_spec.rb
-- spec/lib/http/client_spec.rb
-- spec/lib/http/content_type_spec.rb
-- spec/lib/http/headers/mixin_spec.rb
-- spec/lib/http/headers_spec.rb
-- spec/lib/http/options/body_spec.rb
-- spec/lib/http/options/form_spec.rb
-- spec/lib/http/options/headers_spec.rb
-- spec/lib/http/options/json_spec.rb
-- spec/lib/http/options/merge_spec.rb
-- spec/lib/http/options/new_spec.rb
-- spec/lib/http/options/proxy_spec.rb
-- spec/lib/http/options_spec.rb
-- spec/lib/http/redirector_spec.rb
-- spec/lib/http/request/caching_spec.rb
-- spec/lib/http/request/writer_spec.rb
-- spec/lib/http/request_spec.rb
-- spec/lib/http/response/body_spec.rb
-- spec/lib/http/response/caching_spec.rb
-- spec/lib/http/response/io_body_spec.rb
-- spec/lib/http/response/status_spec.rb
-- spec/lib/http/response/string_body_spec.rb
-- spec/lib/http/response_spec.rb
-- spec/lib/http_spec.rb
-- spec/spec_helper.rb
-- spec/support/black_hole.rb
-- spec/support/capture_warning.rb
-- spec/support/connection_reuse_shared.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
+test_files: []
 has_rdoc: