http 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb69225fc9d93b71457dbff8784f4b76b91424a
-  data.tar.gz: 7377f42f20a229e2035a7bc648e259aba64a3968
+  metadata.gz: 42fd5a5fec6c2e6448908c9578bf27175a291933
+  data.tar.gz: 03a31ca5372bf0e9e2c5dcae9a8e06d9a7e38c56
 SHA512:
-  metadata.gz: e5652ecf755869765201df754b8642afcb350cf7676561a2487d27741cda036a9702583d903fdfbb22f7bd9da9259d2e10a43ddcc2dc495febc5b59871e317c5
-  data.tar.gz: f5f85cb7a92f0b71a86ff40f2b64cf6a266f7381cbd3da2d12f306f8a2f748e9755bfe52b7ed1b715ace31972dee99829a0687790895fe530bd5bd9f9351e8f2
+  metadata.gz: abc5ea24f0d2eb18022994003ab416bfddaa8976fc58bb41169eac32431b70838255d9956d710581da1ec844e0c85243d7fa937c0603122a8d61211b47bc80ae
+  data.tar.gz: 4b25eb0dac0ad59a5688ec5298253975c8ff186dde6d181cb8276e8e2aeafe235305f3c1717bc8c4171a551bf965215c4e0f05cda30dc79cd1bd03f6a3aa204f

data/CHANGES.md

@@ -1,3 +1,24 @@
+## 3.1.0 (2018-04-22)
+
+This version backports some of the fixes and improvements made to development
+version of the HTTP gem:
+
+* Fix for `#readpartial` to respect max length argument.
+  ([@janko-m], [@marshall-lee])
+
+* Fix for `HTTP::Request#headline` to allow two leading slashes in path.
+  ([@scarfacedeb])
+
+* Fix query string building for string with newlines.
+  ([@mikegee])
+
+* Deallocate temporary strings in `Response::Body#to_s`.
+  ([@janko-m])
+
+* Add `Request::Body#source`.
+  ([@janko-m])
+
+
 ## 3.0.0 (2017-10-01)
 
 * Drop support of Ruby `2.0` and Ruby `2.1`.
@@ -618,3 +639,6 @@ end
 [@janko-m]: https://github.com/janko-m
 [@Bonias]: https://github.com/Bonias
 [@HoneyryderChuck]: https://github.com/HoneyryderChuck
+[@marshall-lee]: https://github.com/marshall-lee
+[@scarfacedeb]: https://github.com/scarfacedeb
+[@mikegee]: https://github.com/mikegee

data/README.md

@@ -6,9 +6,10 @@
 [![Coverage Status](https://coveralls.io/repos/httprb/http/badge.svg?branch=master)](https://coveralls.io/r/httprb/http)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/httprb/http/blob/master/LICENSE.txt)
 
-_NOTE: This is the 3.x **development** branch.  For the 2.x **stable** branch, please see:_
+_NOTE: This is the 3.x **stable** branch.  For the 4.x **development** branch, please see:_
+
+https://github.com/httprb/http/
 
-https://github.com/httprb/http/tree/2-x-stable
 
 ## About
 
@@ -193,5 +194,5 @@ dropped.
 
 ## Copyright
 
-Copyright (c) 2011-2017 Tony Arcieri, Alexey V. Zapparov, Erik Michaels-Ober, Zachary Anker.
+Copyright (c) 2011-2018 Tony Arcieri, Alexey V. Zapparov, Erik Michaels-Ober, Zachary Anker.
 See LICENSE.txt for further details.

data/http.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = HTTP::VERSION
 
-  gem.required_ruby_version = ">= 2.0"
+  gem.required_ruby_version = ">= 2.2"
 
   gem.add_runtime_dependency "http_parser.rb", "~> 0.6.0"
-  gem.add_runtime_dependency "http-form_data", ">= 2.0.0-pre2", "< 3"
+  gem.add_runtime_dependency "http-form_data", "~> 2.0"
   gem.add_runtime_dependency "http-cookie",    "~> 1.0"
   gem.add_runtime_dependency "addressable",    "~> 2.3"
 

data/lib/http/client.rb

@@ -123,7 +123,7 @@ module HTTP
       uri = HTTP::URI.parse uri
 
       if opts.params && !opts.params.empty?
-        uri.query = [uri.query, HTTP::URI.form_encode(opts.params)].compact.join("&")
+        uri.query_values = uri.query_values(Array).to_a.concat(opts.params.to_a)
       end
 
       # Some proxies (seen on WEBRick) fail if URL has

data/lib/http/connection.rb

@@ -7,7 +7,7 @@ require "http/response/parser"
 
 module HTTP
   # A connection to the HTTP server
-  class Connection
+  class Connection # rubocop: disable Metrics/ClassLength
     extend Forwardable
 
     # Allowed values for CONNECTION header
@@ -85,9 +85,11 @@ module HTTP
     def readpartial(size = BUFFER_SIZE)
       return unless @pending_response
 
-      finished = (read_more(size) == :eof) || @parser.finished?
-      chunk    = @parser.chunk
+      chunk = @parser.read(size)
+      return chunk if chunk
 
+      finished = (read_more(size) == :eof) || @parser.finished?
+      chunk    = @parser.read(size)
       finish_response if finished
 
       chunk.to_s

data/lib/http/request.rb

@@ -151,7 +151,7 @@ module HTTP
         if using_proxy? && !uri.https?
           uri.omit(:fragment)
         else
-          uri.omit(:scheme, :authority, :fragment)
+          uri.request_uri
         end
 
       "#{verb.to_s.upcase} #{request_uri} HTTP/#{version}"

data/lib/http/request/body.rb

@@ -3,25 +3,27 @@
 module HTTP
   class Request
     class Body
-      def initialize(body)
-        @body = body
+      attr_reader :source
 
-        validate_body_type!
+      def initialize(source)
+        @source = source
+
+        validate_source_type!
       end
 
       # Returns size which should be used for the "Content-Length" header.
       #
       # @return [Integer]
       def size
-        if @body.is_a?(String)
-          @body.bytesize
-        elsif @body.respond_to?(:read)
-          raise RequestError, "IO object must respond to #size" unless @body.respond_to?(:size)
-          @body.size
-        elsif @body.nil?
+        if @source.is_a?(String)
+          @source.bytesize
+        elsif @source.respond_to?(:read)
+          raise RequestError, "IO object must respond to #size" unless @source.respond_to?(:size)
+          @source.size
+        elsif @source.nil?
           0
         else
-          raise RequestError, "cannot determine size of body: #{@body.inspect}"
+          raise RequestError, "cannot determine size of body: #{@source.inspect}"
         end
       end
 
@@ -29,24 +31,24 @@ module HTTP
       #
       # @yieldparam [String]
       def each(&block)
-        if @body.is_a?(String)
-          yield @body
-        elsif @body.respond_to?(:read)
-          IO.copy_stream(@body, ProcIO.new(block))
-        elsif @body.is_a?(Enumerable)
-          @body.each(&block)
+        if @source.is_a?(String)
+          yield @source
+        elsif @source.respond_to?(:read)
+          IO.copy_stream(@source, ProcIO.new(block))
+        elsif @source.is_a?(Enumerable)
+          @source.each(&block)
         end
       end
 
       private
 
-      def validate_body_type!
-        return if @body.is_a?(String)
-        return if @body.respond_to?(:read)
-        return if @body.is_a?(Enumerable)
-        return if @body.nil?
+      def validate_source_type!
+        return if @source.is_a?(String)
+        return if @source.respond_to?(:read)
+        return if @source.is_a?(Enumerable)
+        return if @source.nil?
 
-        raise RequestError, "body of wrong type: #{@body.class}"
+        raise RequestError, "body of wrong type: #{@source.class}"
       end
 
       # This class provides a "writable IO" wrapper around a proc object, with

data/lib/http/response/body.rb

@@ -50,6 +50,7 @@ module HTTP
 
           while (chunk = @stream.readpartial)
             @contents << chunk.force_encoding(@encoding)
+            chunk.clear # deallocate string
           end
         rescue
           @contents = nil

data/lib/http/response/parser.rb

@@ -43,9 +43,17 @@ module HTTP
         end
       end
 
-      def chunk
-        chunk  = @chunk
-        @chunk = nil
+      def read(size)
+        return if @chunk.nil?
+
+        if @chunk.bytesize <= size
+          chunk  = @chunk
+          @chunk = nil
+        else
+          chunk = @chunk.byteslice(0, size)
+          @chunk[0, size] = ""
+        end
+
         chunk
       end
 

data/lib/http/uri.rb

@@ -15,6 +15,7 @@ module HTTP
     def_delegators :@uri, :normalized_port, :port=
     def_delegators :@uri, :path, :normalized_path, :path=
     def_delegators :@uri, :query, :normalized_query, :query=
+    def_delegators :@uri, :query_values, :query_values=
     def_delegators :@uri, :request_uri, :request_uri=
     def_delegators :@uri, :fragment, :normalized_fragment, :fragment=
     def_delegators :@uri, :omit, :join, :normalize

data/lib/http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/spec/lib/http/client_spec.rb

@@ -156,6 +156,14 @@ RSpec.describe HTTP::Client do
 
       client.get("http://example.com/", :params => {:t => "1970-01-01T00:00:00Z"})
     end
+
+    it 'does not convert newlines into \r\n before encoding string values' do
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(opts[:uri].query).to eq "foo=bar%0Abaz"
+      end
+
+      client.get("http://example.com/", :params => {:foo => "bar\nbaz"})
+    end
   end
 
   describe "passing multipart form data" do

data/spec/lib/http/connection_spec.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+RSpec.describe HTTP::Connection do
+  let(:req) do
+    HTTP::Request.new(
+      :verb     => :get,
+      :uri      => "http://example.com/",
+      :headers  => {}
+    )
+  end
+  let(:socket) { double(:connect => nil) }
+  let(:timeout_class) { double(:new => socket) }
+  let(:opts) { HTTP::Options.new(:timeout_class => timeout_class) }
+  let(:connection) { HTTP::Connection.new(req, opts) }
+
+  describe "#read_headers!" do
+    before do
+      connection.instance_variable_set(:@pending_response, true)
+      expect(socket).to receive(:readpartial) do
+        <<-RESPONSE.gsub(/^\s*\| */, "").gsub(/\n/, "\r\n")
+        | HTTP/1.1 200 OK
+        | Content-Type: text
+        |
+        RESPONSE
+      end
+    end
+
+    it "reads data in parts" do
+      connection.read_headers!
+      expect(connection.headers).to eq("Content-Type" => "text")
+    end
+  end
+
+  describe "#readpartial" do
+    before do
+      connection.instance_variable_set(:@pending_response, true)
+      expect(socket).to receive(:readpartial) do
+        <<-RESPONSE.gsub(/^\s*\| */, "").gsub(/\n/, "\r\n")
+        | HTTP/1.1 200 OK
+        | Content-Type: text
+        |
+        RESPONSE
+      end
+      expect(socket).to receive(:readpartial) { "1" }
+      expect(socket).to receive(:readpartial) { "23" }
+      expect(socket).to receive(:readpartial) { "456" }
+      expect(socket).to receive(:readpartial) { "78" }
+      expect(socket).to receive(:readpartial) { "9" }
+      expect(socket).to receive(:readpartial) { "0" }
+      expect(socket).to receive(:readpartial) { :eof }
+      expect(socket).to receive(:closed?) { true }
+    end
+
+    it "reads data in parts" do
+      connection.read_headers!
+      buffer = String.new
+      while (s = connection.readpartial(3))
+        buffer << s
+      end
+      expect(buffer).to eq "1234567890"
+    end
+  end
+end

data/spec/lib/http/request/body_spec.rb

@@ -46,6 +46,12 @@ RSpec.describe HTTP::Request::Body do
     end
   end
 
+  describe "#source" do
+    it "returns the original object" do
+      expect(subject.source).to eq ""
+    end
+  end
+
   describe "#size" do
     context "when body is nil" do
       let(:body) { nil }

data/spec/lib/http_spec.rb

@@ -41,6 +41,12 @@ RSpec.describe HTTP do
       end
     end
 
+    context "with two leading slashes in path" do
+      it "is allowed" do
+        expect { HTTP.get "#{dummy.endpoint}//" }.not_to raise_error
+      end
+    end
+
     context "with headers" do
       it "is easy" do
         response = HTTP.accept("application/json").get dummy.endpoint

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -31,22 +31,16 @@ dependencies:
   name: http-form_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre.pre2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre.pre2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +139,7 @@ files:
 - lib/http/version.rb
 - logo.png
 - spec/lib/http/client_spec.rb
+- spec/lib/http/connection_spec.rb
 - spec/lib/http/content_type_spec.rb
 - spec/lib/http/features/auto_deflate_spec.rb
 - spec/lib/http/features/auto_inflate_spec.rb
@@ -192,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -200,12 +195,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
 test_files:
 - spec/lib/http/client_spec.rb
+- spec/lib/http/connection_spec.rb
 - spec/lib/http/content_type_spec.rb
 - spec/lib/http/features/auto_deflate_spec.rb
 - spec/lib/http/features/auto_inflate_spec.rb