http 1.0.4 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a554e4ac3df247f5abcf5fc5af7707604576e23
-  data.tar.gz: 04e6c88e86d14fbbfaa6af5db48ba28e83cf02ab
+  metadata.gz: 528cd808cd0cf04d196ac3459063496777a46736
+  data.tar.gz: a3a4cf179068d8f5c48bc803118075e5e71331d5
 SHA512:
-  metadata.gz: 064656c4992d84ffe71bebe1cbcb83e1f32b8b33dc350a1d87e3fdc4893288697503bf36f0f27ea95cdbb4d0788aa3dd96cb69f9b3029fa4d99336d78aa12a45
-  data.tar.gz: 920dfb6d29655e9147d22e6f8f0ccad6075c8c77c0cde3ee3bc4ad0d8dcc3120fb387f59909d60c3a142bf6c0744b0138a81c40e2bea9ef105e1583c229f9c3c
+  metadata.gz: 1774996540d80f6f08866f5bee7d632baa72a33bd31122485f15fdb97d695de7645c0f9131a5e52188ef4706005c96c74bcc175ee3b5182a9a7b7b4597f07274
+  data.tar.gz: 9cc27b2c73fee256c61409ce41069588e780c41df32d27662eea5c1d7de116e820c8843b3e08b670a84cfbb695b64d126c1f1b6e7b43de599cb84cad91f09d73

data/.travis.yml

@@ -4,12 +4,11 @@ env:
     - JRUBY_OPTS="$JRUBY_OPTS --debug"
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
   - 2.3.0
-  - jruby
+  - jruby-9.0.5.0
   - jruby-head
   - ruby-head
   - rbx-2

data/CHANGES.md

@@ -1,3 +1,10 @@
+## master (unreleased)
+
+* [#319](https://github.com/httprb/http/pull/319)
+  Drop Ruby 1.9.x support.
+  ([@ixti])
+
+
 ## 1.0.4 (2016-03-19)
 
 * [#320](https://github.com/httprb/http/pull/320)

data/Gemfile

@@ -2,8 +2,6 @@ source "https://rubygems.org"
 
 gem "rake"
 
-gem "rack-cache", "~> 1.2"
-
 group :development do
   gem "celluloid-io"
   gem "guard"

data/README.md

@@ -151,13 +151,11 @@ In practice you'll want to bind the HTTP::Response::Body to a local variable (e.
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
-* Ruby 1.9.3
 * Ruby 2.0.0
 * Ruby 2.1.x
 * Ruby 2.2.x
 * Ruby 2.3.x
-* JRuby 1.7.x
-* JRuby 9000+
+* JRuby 9.0.5.0
 
 If something doesn't work on one of these versions, it's a bug.
 

data/lib/http/chainable.rb

@@ -141,7 +141,7 @@ module HTTP
       return p_client unless block_given?
       yield p_client
     ensure
-      p_client.close
+      p_client.close if p_client
     end
 
     # Make a request through an HTTP proxy

data/lib/http/client.rb

@@ -161,8 +161,9 @@ module HTTP
         headers[Headers::CONTENT_LENGTH] ||= form.content_length
         form.to_s
       when opts.json
-        headers[Headers::CONTENT_TYPE] ||= "application/json"
-        MimeType[:json].encode opts.json
+        body = MimeType[:json].encode opts.json
+        headers[Headers::CONTENT_TYPE] ||= "application/json; charset=#{body.encoding.name}"
+        body
       end
     end
   end

data/lib/http/connection.rb

@@ -37,8 +37,8 @@ module HTTP
       send_proxy_connect_request(req)
       start_tls(req, options)
       reset_timer
-    rescue SocketError, SystemCallError => e
-      raise ConnectionError, "failed to connect: #{e}"
+    rescue IOError, SocketError, SystemCallError => ex
+      raise ConnectionError, "failed to connect: #{ex}", ex.backtrace
     end
 
     # @see (HTTP::Response::Parser#status_code)
@@ -94,7 +94,7 @@ module HTTP
     def read_headers!
       loop do
         if read_more(BUFFER_SIZE) == :eof
-          fail EOFError unless @parser.headers?
+          fail ConnectionError, "couldn't read response headers" unless @parser.headers?
           break
         elsif @parser.headers?
           break
@@ -102,8 +102,6 @@ module HTTP
       end
 
       set_keep_alive
-    rescue IOError, Errno::ECONNRESET, Errno::EPIPE => e
-      raise ConnectionError, "failed to read headers: #{e}"
     end
 
     # Callback for when we've reached the end of a response
@@ -213,6 +211,8 @@ module HTTP
       elsif value
         @parser << value
       end
+    rescue IOError, SocketError, SystemCallError => ex
+      raise ConnectionError, "error reading from socket: #{ex}", ex.backtrace
     end
   end
 end

data/lib/http/timeout/global.rb

@@ -1,4 +1,5 @@
 require "timeout"
+require "io/wait"
 
 require "http/timeout/per_operation"
 
@@ -32,13 +33,13 @@ module HTTP
         reset_timer
 
         begin
-          socket.connect_nonblock
+          @socket.connect_nonblock
         rescue IO::WaitReadable
-          IO.select([socket], nil, nil, time_left)
+          IO.select([@socket], nil, nil, time_left)
           log_time
           retry
         rescue IO::WaitWritable
-          IO.select(nil, [socket], nil, time_left)
+          IO.select(nil, [@socket], nil, time_left)
           log_time
           retry
         end
@@ -59,7 +60,6 @@ module HTTP
       private
 
       if RUBY_VERSION < "2.1.0"
-
         def read_nonblock(size)
           @socket.read_nonblock(size)
         end
@@ -67,9 +67,7 @@ module HTTP
         def write_nonblock(data)
           @socket.write_nonblock(data)
         end
-
       else
-
         def read_nonblock(size)
           @socket.read_nonblock(size, :exception => false)
         end
@@ -77,7 +75,6 @@ module HTTP
         def write_nonblock(data)
           @socket.write_nonblock(data, :exception => false)
         end
-
       end
 
       # Perform the given I/O operation with the given argument
@@ -106,13 +103,13 @@ module HTTP
 
       # Wait for a socket to become readable
       def wait_readable_or_timeout
-        IO.select([@socket], nil, nil, time_left)
+        @socket.to_io.wait_readable(time_left)
         log_time
       end
 
       # Wait for a socket to become writable
       def wait_writable_or_timeout
-        IO.select(nil, [@socket], nil, time_left)
+        @socket.to_io.wait_writable(time_left)
         log_time
       end
 

data/lib/http/timeout/null.rb

@@ -1,4 +1,5 @@
 require "forwardable"
+require "io/wait"
 
 module HTTP
   module Timeout
@@ -56,7 +57,7 @@ module HTTP
       def rescue_readable
         yield
       rescue IO::WaitReadable
-        retry if IO.select([socket], nil, nil, read_timeout)
+        retry if @socket.to_io.wait_readable(read_timeout)
         raise TimeoutError, "Read timed out after #{read_timeout} seconds"
       end
 
@@ -64,7 +65,7 @@ module HTTP
       def rescue_writable
         yield
       rescue IO::WaitWritable
-        retry if IO.select(nil, [socket], nil, write_timeout)
+        retry if @socket.to_io.wait_writable(write_timeout)
         raise TimeoutError, "Write timed out after #{write_timeout} seconds"
       end
     end

data/lib/http/timeout/per_operation.rb

@@ -29,7 +29,7 @@ module HTTP
       def connect_ssl
         rescue_readable do
           rescue_writable do
-            socket.connect_nonblock
+            @socket.connect_nonblock
           end
         end
       end
@@ -39,7 +39,7 @@ module HTTP
         # Read data from the socket
         def readpartial(size)
           rescue_readable do
-            socket.read_nonblock(size)
+            @socket.read_nonblock(size)
           end
         rescue EOFError
           :eof
@@ -48,7 +48,7 @@ module HTTP
         # Write data to the socket
         def write(data)
           rescue_writable do
-            socket.write_nonblock(data)
+            @socket.write_nonblock(data)
           end
         rescue EOFError
           :eof
@@ -59,14 +59,14 @@ module HTTP
         # Read data from the socket
         def readpartial(size)
           loop do
-            result = socket.read_nonblock(size, :exception => false)
+            result = @socket.read_nonblock(size, :exception => false)
             if result.nil?
               return :eof
             elsif result != :wait_readable
               return result
             end
 
-            unless IO.select([socket], nil, nil, read_timeout)
+            unless IO.select([@socket], nil, nil, read_timeout)
               fail TimeoutError, "Read timed out after #{read_timeout} seconds"
             end
           end
@@ -75,16 +75,15 @@ module HTTP
         # Write data to the socket
         def write(data)
           loop do
-            result = socket.write_nonblock(data, :exception => false)
+            result = @socket.write_nonblock(data, :exception => false)
             return result unless result == :wait_writable
 
-            unless IO.select(nil, [socket], nil, write_timeout)
-              fail TimeoutError, "Read timed out after #{write_timeout} seconds"
+            unless IO.select(nil, [@socket], nil, write_timeout)
+              fail TimeoutError, "Write timed out after #{write_timeout} seconds"
             end
           end
         end
       end
-      # rubocop:enable Metrics/BlockNesting
     end
   end
 end

data/lib/http/uri.rb

@@ -2,13 +2,103 @@
 require "addressable/uri"
 
 module HTTP
-  class URI < Addressable::URI
+  class URI
+    extend Forwardable
+
+    def_delegators :@uri, :scheme, :normalized_scheme, :scheme=
+    def_delegators :@uri, :user, :normalized_user, :user=
+    def_delegators :@uri, :password, :normalized_password, :password=
+    def_delegators :@uri, :host, :normalized_host, :host=
+    def_delegators :@uri, :authority, :normalized_authority, :authority=
+    def_delegators :@uri, :origin, :origin=
+    def_delegators :@uri, :normalized_port, :port=
+    def_delegators :@uri, :path, :normalized_path, :path=
+    def_delegators :@uri, :query, :normalized_query, :query=
+    def_delegators :@uri, :request_uri, :request_uri=
+    def_delegators :@uri, :fragment, :normalized_fragment, :fragment=
+    def_delegators :@uri, :omit, :join, :normalize
+
     # @private
     HTTP_SCHEME = "http".freeze
 
     # @private
     HTTPS_SCHEME = "https".freeze
 
+    # Parse the given URI string, returning an HTTP::URI object
+    #
+    # @param [HTTP::URI, String, #to_str] :uri to parse
+    #
+    # @return [HTTP::URI] new URI instance
+    def self.parse(uri)
+      return uri if uri.is_a?(self)
+
+      new(Addressable::URI.parse(uri))
+    end
+
+    # Encodes key/value pairs as application/x-www-form-urlencoded
+    #
+    # @param [#to_hash, #to_ary] :form_values to encode
+    # @param [TrueClass, FalseClass] :sort should key/value pairs be sorted first?
+    #
+    # @return [String] encoded value
+    def self.form_encode(form_values, sort = false)
+      Addressable::URI.form_encode(form_values, sort)
+    end
+
+    # Creates an HTTP::URI instance from the given options
+    #
+    # @option [String, #to_str] :scheme URI scheme
+    # @option [String, #to_str] :user for basic authentication
+    # @option [String, #to_str] :password for basic authentication
+    # @option [String, #to_str] :host name component
+    # @option [String, #to_str] :port network port to connect to
+    # @option [String, #to_str] :path component to request
+    # @option [String, #to_str] :query component distinct from path
+    # @option [String, #to_str] :fragment component at the end of the URI
+    #
+    # @return [HTTP::URI] new URI instance
+    def initialize(options_or_uri = {})
+      case options_or_uri
+      when Hash
+        @uri = Addressable::URI.new(options_or_uri)
+      when Addressable::URI
+        @uri = options_or_uri
+      else fail TypeError, "expected Hash for options, got #{options_or_uri.class}"
+      end
+    end
+
+    # Are these URI objects equal? Normalizes both URIs prior to comparison
+    #
+    # @param [Object] :other URI to compare this one with
+    #
+    # @return [TrueClass, FalseClass] are the URIs equivalent (after normalization)?
+    def ==(other)
+      other.is_a?(URI) && normalize.to_s == other.normalize.to_s
+    end
+
+    # Are these URI objects equal? Does NOT normalizes both URIs prior to comparison
+    #
+    # @param [Object] :other URI to compare this one with
+    #
+    # @return [TrueClass, FalseClass] are the URIs equivalent?
+    def eql?(other)
+      other.is_a?(URI) && to_s == other.to_s
+    end
+
+    # Hash value based off the normalized form of a URI
+    #
+    # @return [Integer] A hash of the URI
+    def hash
+      @hash ||= to_s.hash * -1
+    end
+
+    # Port number, either as specified or the default if unspecified
+    #
+    # @return [Integer] port number
+    def port
+      @uri.port || @uri.default_port
+    end
+
     # @return [True] if URI is HTTP
     # @return [False] otherwise
     def http?
@@ -21,9 +111,17 @@ module HTTP
       HTTPS_SCHEME == scheme
     end
 
+    # Convert an HTTP::URI to a String
+    #
+    # @return [String] URI serialized as a String
+    def to_s
+      @uri.to_s
+    end
+    alias to_str to_s
+
     # @return [String] human-readable representation of URI
     def inspect
-      format("#<%s:%#0x URI:%s>", self.class, object_id, to_s)
+      format("#<%s:0x%014x URI:%s>", self.class.name, object_id << 1, to_s)
     end
   end
 end

data/lib/http/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module HTTP
-  VERSION = "1.0.4".freeze
+  VERSION = "2.0.0.pre".freeze
 end

data/spec/lib/http/uri_spec.rb

@@ -0,0 +1,20 @@
+RSpec.describe HTTP::URI do
+  let(:example_http_uri_string)  { "http://example.com" }
+  let(:example_https_uri_string) { "https://example.com" }
+
+  subject(:http_uri)  { described_class.parse(example_http_uri_string) }
+  subject(:https_uri) { described_class.parse(example_https_uri_string) }
+
+  it "knows URI schemes" do
+    expect(http_uri.scheme).to eq "http"
+    expect(https_uri.scheme).to eq "https"
+  end
+
+  it "sets default ports for HTTP URIs" do
+    expect(http_uri.port).to eq 80
+  end
+
+  it "sets default ports for HTTPS URIs" do
+    expect(https_uri.port).to eq 443
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -150,6 +150,7 @@ files:
 - spec/lib/http/response/body_spec.rb
 - spec/lib/http/response/status_spec.rb
 - spec/lib/http/response_spec.rb
+- spec/lib/http/uri_spec.rb
 - spec/lib/http_spec.rb
 - spec/regression_specs.rb
 - spec/spec_helper.rb
@@ -177,9 +178,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -205,6 +206,7 @@ test_files:
 - spec/lib/http/response/body_spec.rb
 - spec/lib/http/response/status_spec.rb
 - spec/lib/http/response_spec.rb
+- spec/lib/http/uri_spec.rb
 - spec/lib/http_spec.rb
 - spec/regression_specs.rb
 - spec/spec_helper.rb