http 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f055f29a48247045d37ed9be74484f3116d0c1
-  data.tar.gz: de2b1a88f332b6f2c1848f85b1ff3fe6d01ba49d
+  metadata.gz: cd857e2ad6dc7552b81641ec83c3a60e99087fae
+  data.tar.gz: b31ec2d4637bc449f29ff01f6df6568672c04cd4
 SHA512:
-  metadata.gz: e3f82de8ae1a6947a667216d9cb865eef7c18d068384db44fde9bb8c4c81db2fbf6f36161b559306e9822bdf1186b61cc1053789ebfc9787c7a4179c54a40f47
-  data.tar.gz: 0d8c22f1fa37b8da65a978cd82ca4f7fa42dd52c9307232c2df329f27b046aa14d9f91445197e1018de761d6ce9e5c8e2379f8e0530b7d938fbe4a4e61878328
+  metadata.gz: 6efddbaf1df00256de1e58fc512357165e343a421a7d67f5b7d0103f241ea0eb77d9a19c33377624d954b68f5b7d016e0d15ffbb5eab0c8acb49d827b3f7f7b4
+  data.tar.gz: 2a0dec9c76defd8f85d57da8eb4ef46251519bd49be93c57955995e6e91a1b55122ad3d86cd96ba4130e3380871be8e6c329bc0503a5fbf021c8bbca9bee7b03

data/.rubocop.yml

@@ -55,6 +55,9 @@ Style/EachWithObject:
 Style/Encoding:
   Enabled: false
 
+Style/EmptyCaseCondition:
+  Enabled: false
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 

data/.travis.yml

@@ -12,6 +12,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
+  - 2.3.1
   - jruby-9.1.0.0
   - jruby-head
   - ruby-head

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 2.0.2 (2016-06-24)
+
+* [#353](https://github.com/httprb/http/pull/353)
+  Avoid a dependency cycle between Client and Connection classes.
+  ([@jhbabon])
+
+
 ## 2.0.1 (2016-05-12)
 
 * [#341](https://github.com/httprb/http/pull/341)
@@ -529,3 +536,4 @@ end
 [@smudge]: https://github.com/smudge
 [@mwitek]: https://github.com/mwitek
 [@tonyta]: https://github.com/tonyta
+[@jhbabon]: https://github.com/jhbabon

data/Gemfile

@@ -3,24 +3,22 @@ source "https://rubygems.org"
 gem "rake"
 
 group :development do
-  gem "celluloid-io"
-  gem "guard"
   gem "guard-rspec", :require => false
-  gem "nokogiri", :require => false
-  gem "pry"
+  gem "nokogiri",    :require => false
+  gem "pry",         :require => false
 
-  platforms :ruby_19, :ruby_20 do
-    gem "pry-debugger"
-    gem "pry-stack_explorer"
+  platform :ruby_20 do
+    gem "pry-debugger",       :require => false
+    gem "pry-stack_explorer", :require => false
   end
 end
 
 group :test do
   gem "backports"
-  gem "coveralls"
+  gem "coveralls", :require => false
   gem "simplecov", ">= 0.9"
   gem "json",      ">= 1.8.1"
-  gem "rubocop",   "=  0.39.0"
+  gem "rubocop",   "=  0.40.0"
   gem "rspec",     "~> 3.0"
   gem "rspec-its"
   gem "yardstick"

data/http.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = HTTP::VERSION
 
+  gem.required_ruby_version = ">= 2.0"
+
   gem.add_runtime_dependency "http_parser.rb", "~> 0.6.0"
   gem.add_runtime_dependency "http-form_data", "~> 1.0.1"
   gem.add_runtime_dependency "http-cookie",    "~> 1.0"

data/lib/http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "http/parser"
 
 require "http/errors"

data/lib/http/client.rb

@@ -14,10 +14,7 @@ module HTTP
     extend Forwardable
     include Chainable
 
-    KEEP_ALIVE         = "Keep-Alive".freeze
-    CLOSE              = "close".freeze
-
-    HTTP_OR_HTTPS_RE   = %r{^https?://}i
+    HTTP_OR_HTTPS_RE = %r{^https?://}i
 
     def initialize(default_options = {})
       @default_options = HTTP::Options.new(default_options)
@@ -139,7 +136,7 @@ module HTTP
       headers = opts.headers
 
       # Tell the server to keep the conn open
-      headers[Headers::CONNECTION] = default_options.persistent? ? KEEP_ALIVE : CLOSE
+      headers[Headers::CONNECTION] = default_options.persistent? ? Connection::KEEP_ALIVE : Connection::CLOSE
 
       cookies = opts.cookies.values
 

data/lib/http/connection.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require "forwardable"
 
-require "http/client"
 require "http/headers"
 require "http/response/parser"
 
@@ -10,6 +9,10 @@ module HTTP
   class Connection
     extend Forwardable
 
+    # Allowed values for CONNECTION header
+    KEEP_ALIVE = "Keep-Alive".freeze
+    CLOSE      = "close".freeze
+
     # Attempt to read this much data
     BUFFER_SIZE = 16_384
 
@@ -193,9 +196,9 @@ module HTTP
       @keep_alive =
         case @parser.http_version
         when HTTP_1_0 # HTTP/1.0 requires opt in for Keep Alive
-          @parser.headers[Headers::CONNECTION] == Client::KEEP_ALIVE
+          @parser.headers[Headers::CONNECTION] == KEEP_ALIVE
         when HTTP_1_1 # HTTP/1.1 is opt-out
-          @parser.headers[Headers::CONNECTION] != Client::CLOSE
+          @parser.headers[Headers::CONNECTION] != CLOSE
         else # Anything else we assume doesn't supportit
           false
         end

data/lib/http/content_type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HTTP
   ContentType = Struct.new(:mime_type, :charset) do
     MIME_TYPE_RE = %r{^([^/]+/[^;]+)(?:$|;)}

data/lib/http/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HTTP
   # Generic error
   class Error < StandardError; end

data/lib/http/headers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 
 require "http/errors"

data/lib/http/headers/mixin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 
 module HTTP

data/lib/http/mime_type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HTTP
   # MIME type encode/decode adapters
   module MimeType

data/lib/http/mime_type/adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 require "singleton"
 

data/lib/http/mime_type/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "json"
 require "http/mime_type/adapter"
 

data/lib/http/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "http/headers"
 require "openssl"
 require "socket"

data/lib/http/redirector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "set"
 
 require "http/headers"

data/lib/http/response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 
 require "http/headers"

data/lib/http/response/body.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 require "http/client"
 
@@ -43,8 +44,9 @@ module HTTP
         end
 
         begin
-          @streaming = false
-          @contents = "".force_encoding(encoding)
+          @streaming  = false
+          @contents   = String.new("").force_encoding(encoding)
+
           while (chunk = @client.readpartial)
             @contents << chunk.force_encoding(encoding)
           end

data/lib/http/response/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HTTP
   class Response
     class Parser

data/lib/http/response/status.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "delegate"
 
 require "http/response/status/reasons"

data/lib/http/response/status/reasons.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # AUTO-GENERATED FILE, DO NOT CHANGE IT MANUALLY
 
 require "delegate"

data/lib/http/timeout/global.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "timeout"
 require "io/wait"
 

data/lib/http/timeout/null.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 require "io/wait"
 

data/lib/http/timeout/per_operation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "timeout"
 
 require "http/timeout/null"

data/lib/http/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module HTTP
-  VERSION = "2.0.1".freeze
+  VERSION = "2.0.2".freeze
 end

data/spec/lib/http/client_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 require "support/http_handling_shared"

data/spec/lib/http/content_type_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::ContentType do
   describe ".parse" do
     context "with text/plain" do

data/spec/lib/http/headers/mixin_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Headers::Mixin do
   let :dummy_class do
     Class.new do

data/spec/lib/http/headers_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Headers do
   subject(:headers) { described_class.new }
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Options, "body" do
   let(:opts) { HTTP::Options.new }
 

data/spec/lib/http/options/form_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Options, "form" do
   let(:opts) { HTTP::Options.new }
 

data/spec/lib/http/options/headers_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Options, "headers" do
   let(:opts) { HTTP::Options.new }
 

data/spec/lib/http/options/json_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Options, "json" do
   let(:opts) { HTTP::Options.new }
 

data/spec/lib/http/options/merge_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 RSpec.describe HTTP::Options, "merge" do
   let(:opts) { HTTP::Options.new }
@@ -23,7 +24,8 @@ RSpec.describe HTTP::Options, "merge" do
       :body      => "body-foo",
       :json      => {:foo => "foo"},
       :headers   => {:accept => "json", :foo => "foo"},
-      :proxy     => {})
+      :proxy     => {}
+    )
 
     bar = HTTP::Options.new(
       :response   => :parsed_body,
@@ -36,27 +38,29 @@ RSpec.describe HTTP::Options, "merge" do
       :headers            => {:accept => "xml", :bar => "bar"},
       :timeout_options    => {:foo => :bar},
       :ssl        => {:foo => "bar"},
-      :proxy      => {:proxy_address => "127.0.0.1", :proxy_port => 8080})
+      :proxy      => {:proxy_address => "127.0.0.1", :proxy_port => 8080}
+    )
 
     expect(foo.merge(bar).to_hash).to eq(
-      :response        => :parsed_body,
-      :timeout_class   => described_class.default_timeout_class,
-      :timeout_options => {:foo => :bar},
-      :params     => {:plop => "plip"},
-      :form       => {:bar => "bar"},
-      :body       => "body-bar",
-      :json       => {:bar => "bar"},
-      :persistent => "https://www.googe.com",
+      :response           => :parsed_body,
+      :timeout_class      => described_class.default_timeout_class,
+      :timeout_options    => {:foo => :bar},
+      :params             => {:plop => "plip"},
+      :form               => {:bar => "bar"},
+      :body               => "body-bar",
+      :json               => {:bar => "bar"},
+      :persistent         => "https://www.googe.com",
       :keep_alive_timeout => 10,
-      :ssl       => {:foo => "bar"},
-      :headers   => {"Foo" => "foo", "Accept" => "xml", "Bar" => "bar"},
-      :proxy     => {:proxy_address => "127.0.0.1", :proxy_port => 8080},
-      :follow => nil,
-      :socket_class     => described_class.default_socket_class,
-      :nodelay          => false,
-      :ssl_socket_class => described_class.default_ssl_socket_class,
-      :ssl_context      => nil,
-      :cookies          => {},
-      :encoding         => nil)
+      :ssl                => {:foo => "bar"},
+      :headers            => {"Foo" => "foo", "Accept" => "xml", "Bar" => "bar"},
+      :proxy              => {:proxy_address => "127.0.0.1", :proxy_port => 8080},
+      :follow             => nil,
+      :socket_class       => described_class.default_socket_class,
+      :nodelay            => false,
+      :ssl_socket_class   => described_class.default_ssl_socket_class,
+      :ssl_context        => nil,
+      :cookies            => {},
+      :encoding           => nil
+    )
   end
 end

data/spec/lib/http/options/new_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Options, "new" do
   it "supports a Options instance" do
     opts = HTTP::Options.new

data/spec/lib/http/options/proxy_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Options, "proxy" do
   let(:opts) { HTTP::Options.new }
 

data/spec/lib/http/options_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Options do
   subject { described_class.new(:response => :body) }
 

data/spec/lib/http/redirector_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Redirector do
   def simple_response(status, body = "", headers = {})
     HTTP::Response.new(

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 RSpec.describe HTTP::Request::Writer do

data/spec/lib/http/request_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 RSpec.describe HTTP::Request do

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

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Response::Body do
   let(:client)   { double(:sequence_id => 0) }
-  let(:chunks)   { ["Hello, ", "World!"] }
+  let(:chunks)   { [String.new("Hello, "), String.new("World!")] }
 
   before         { allow(client).to receive(:readpartial) { chunks.shift } }
 
-  subject(:body) { described_class.new client, Encoding::UTF_8 }
+  subject(:body) { described_class.new(client, Encoding::UTF_8) }
 
   it "streams bodies from responses" do
-    expect(subject.to_s).to eq "Hello, World!"
+    expect(subject.to_s).to eq("Hello, World!")
   end
 
   context "when body empty" do
-    let(:chunks) { [""] }
+    let(:chunks) { [String.new("")] }
 
     it "returns responds to empty? with true" do
       expect(subject).to be_empty

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Response::Status do
   describe ".new" do
     it "fails if given value does not respond to #to_i" do

data/spec/lib/http/response_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::Response do
   let(:body)          { "Hello world!" }
   let(:uri)           { "http://example.com/" }

data/spec/lib/http/uri_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.describe HTTP::URI do
   let(:example_http_uri_string)  { "http://example.com" }
   let(:example_https_uri_string) { "https://example.com" }

data/spec/lib/http_spec.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+# encoding: utf-8
 
 require "json"
 

data/spec/regression_specs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 RSpec.describe "Regression testing" do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 require "simplecov"

data/spec/support/black_hole.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BlackHole
   def self.method_missing(*)
     self

data/spec/support/capture_warning.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 def capture_warning
   old_stderr = $stderr
   $stderr = StringIO.new

data/spec/support/dummy_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "webrick"
 require "webrick/ssl"
 

data/spec/support/dummy_server/servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 
 class DummyServer < WEBrick::HTTPServer

data/spec/support/http_handling_shared.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context "HTTP handling" do
   describe "timeouts" do
     let(:conn_timeout) { 1 }

data/spec/support/proxy_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "webrick/httpproxy"
 
 require "support/black_hole"

data/spec/support/servers/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ServerConfig
   def addr
     config[:BindAddress]

data/spec/support/servers/runner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ServerRunner
   def run_server(name)
     let! name do

data/spec/support/ssl_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "pathname"
 
 require "certificate_authority"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="