http 2.2.2 → 3.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66bda3b695b673507461ef5f59bc3d14a145fc78
-  data.tar.gz: 69c82f1484defda8becec34ef76caf0a59e2d378
+  metadata.gz: 4d74f7b02faf0fd77fd72d958ebcff214296aeca
+  data.tar.gz: 97f8a4bead5243682c117e8e54cf9f11edcef626
 SHA512:
-  metadata.gz: c1149d111a7b16ea0d02c30a5a5126c393ea86cda749341a2056c17cf5c5004ee1bb3faf416c9bc483d28771c7c0ad9af349a866bd209a394460b579561142be
-  data.tar.gz: 7e3a46cf89a76a1ff557f40740f3aa851a8dd3e9bc44f64146f62db7db4839f21fb5efce9aaf88826945c85d97820bfa7574bc8aea21a0e6551d7195120d5e51
+  metadata.gz: 6d1136aa3733a3c8873d084b09282268e60c1f6b0fe46393b31423eab90cd4c72ff321cede0d18f720ad6d8d1e712997f617f27a352815d3785058a7323b86d0
+  data.tar.gz: 6a678e67514d00cdf8d707f269d54a7f6c9f6a4dc0985603d2a117fe78691e5c73d7e5ae8a260b27816c01e1b1df960160310b31d64ae8474fe0bce52bce82d1

data/.rubocop.yml

@@ -1,6 +1,26 @@
 AllCops:
   DisplayCopNames: true
 
+## Layout ######################################################################
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/SpaceAroundOperators:
+  AllowForAlignment: true
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+## Metrics #####################################################################
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+
 Metrics/BlockNesting:
   Max: 2
 
@@ -8,19 +28,22 @@ Metrics/ClassLength:
   CountComments: false
   Max: 125
 
-Metrics/PerceivedComplexity:
+# TODO: Lower to 6
+Metrics/CyclomaticComplexity:
   Max: 8
 
-Metrics/CyclomaticComplexity:
-  Max: 8 # TODO: Lower to 6
+Metrics/PerceivedComplexity:
+  Max: 8
 
+# TODO: Lower to 80
 Metrics/LineLength:
   AllowURI: true
-  Max: 143 # TODO: Lower to 80
+  Max: 143
 
+# TODO: Lower to 15
 Metrics/MethodLength:
   CountComments: false
-  Max: 25 # TODO: Lower to 15
+  Max: 25
 
 Metrics/ModuleLength:
   CountComments: false
@@ -30,9 +53,14 @@ Metrics/ParameterLists:
   Max: 5
   CountKeywordArgs: true
 
-Metrics/AbcSize:
+## Performance #################################################################
+
+# XXX: requires ruby 2.4+
+Performance/RegexpMatch:
   Enabled: false
 
+## Style #######################################################################
+
 Style/CollectionMethods:
   PreferredMethods:
     collect:  'map'
@@ -43,9 +71,6 @@ Style/CollectionMethods:
 Style/Documentation:
   Enabled: false
 
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
@@ -58,20 +83,28 @@ Style/Encoding:
 Style/EmptyCaseCondition:
   Enabled: false
 
+# XXX: Lots of times it suggests making code terrible to read.
+Style/GuardClause:
+  Enabled: false
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
 Style/Lambda:
   Enabled: false
 
-Style/SpaceAroundOperators:
-  AllowForAlignment: true
+Style/OptionHash:
+  Enabled: true
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+# XXX: requires ruby 2.3+
+Style/SafeNavigation:
+  Enabled: false
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/TrivialAccessors:
   Enabled: false
+
+Style/YodaCondition:
+  Enabled: false

data/.travis.yml

@@ -1,30 +1,35 @@
 language: ruby
 sudo: false
 
+cache: bundler
+
 before_install:
-  - gem update --system 2.6.10
+  - gem update --system
   - gem --version
-  - gem install bundler --version 1.14.3 --no-rdoc --no-ri
+  - gem install bundler --no-rdoc --no-ri
   - bundle --version
 
-install: bundle _1.14.3_ install --without development doc
+install: bundle install --without development doc
 
-script: bundle _1.14.3_ exec rake
+script: bundle exec rake
 
-env:
-  global:
-    - JRUBY_OPTS="$JRUBY_OPTS --debug"
+env: JRUBY_OPTS="$JRUBY_OPTS --debug"
 
 rvm:
-  - jruby-9.1.7.0
-  - 2.0.0
-  - 2.1
+  # Include JRuby first because it takes the longest
+  - jruby-9.1.13.0
   - 2.2
-  - 2.3.3
-  - 2.4.0
+  - 2.3.4
+  - 2.4.1
 
 matrix:
   fast_finish: true
+  include:
+  # Only run RuboCop and Yardstick metrics on the latest Ruby
+  - rvm: 2.4.1
+    env: SUITE="rubocop"
+  - rvm: 2.4.1
+    env: SUITE="yardstick"
 
 branches:
   only:

data/CHANGES.md

@@ -1,3 +1,27 @@
+## 3.0.0.pre
+
+* Drop support of Ruby `2.0` and Ruby `2.1`.
+  ([@ixti])
+
+* [#410](https://github.com/httprb/http/pull/410)
+  Infer `Host` header upon redirects.
+  ([@janko-m])
+
+* [#409](https://github.com/httprb/http/pull/409)
+  Enables request body streaming on any IO object.
+  ([@janko-m])
+
+* [#413](https://github.com/httprb/http/issues/413),
+  [#414](https://github.com/httprb/http/pull/414)
+  Fix encoding of body chunks.
+  ([@janko-m])
+
+* [#368](https://github.com/httprb/http/pull/368),
+  [#357](https://github.com/httprb/http/issues/357)
+  Fix timeout issue.
+  ([@HoneyryderChuck])
+
+
 ## 2.2.2 (2017-04-27)
 
 * [#404](https://github.com/httprb/http/issues/404),
@@ -593,4 +617,4 @@ end
 [@britishtea]: https://github.com/britishtea
 [@janko-m]: https://github.com/janko-m
 [@Bonias]: https://github.com/Bonias
-[@nestegg]: https://github.com/nestegg
+[@HoneyryderChuck]: https://github.com/HoneyryderChuck

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 ruby RUBY_VERSION
 
@@ -15,15 +17,20 @@ group :development do
 end
 
 group :test do
+  gem "activemodel", :require => false # Used by certificate_authority
+  gem "certificate_authority", :require => false
+
   gem "backports"
+
   gem "coveralls", :require => false
   gem "simplecov", ">= 0.9"
-  gem "rubocop",   "=  0.40.0"
-  gem "rspec",     "~> 3.0"
+
+  gem "rspec", "~> 3.0"
   gem "rspec-its"
+
+  gem "rubocop", "= 0.49.1"
+
   gem "yardstick"
-  gem "certificate_authority", :require => false
-  gem "activemodel",           :require => false # Used by certificate_authority
 end
 
 group :doc do

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # More info at https://github.com/guard/guard#readme
 
 guard :rspec, :cmd => "GUARD_RSPEC=1 bundle exec rspec --no-profile" do

data/README.md

@@ -6,9 +6,9 @@
 [![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 2.x **stable** branch.  For the 3.x **development** branch, please see:_
+_NOTE: This is the 3.x **development** branch.  For the 2.x **stable** branch, please see:_
 
-https://github.com/httprb/http/
+https://github.com/httprb/http/tree/2-x-stable
 
 ## About
 
@@ -160,10 +160,9 @@ and call `#readpartial` on it repeatedly until it returns `nil`:
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
-* Ruby 2.0.0
-* Ruby 2.1.x
 * Ruby 2.2.x
 * Ruby 2.3.x
+* Ruby 2.4.x
 * JRuby 9.1.x.x
 
 If something doesn't work on one of these versions, it's a bug.
@@ -194,5 +193,5 @@ dropped.
 
 ## Copyright
 
-Copyright (c) 2011-2016 Tony Arcieri, Erik Michaels-Ober, Alexey V. Zapparov, Zachary Anker.
+Copyright (c) 2011-2017 Tony Arcieri, Alexey V. Zapparov, Erik Michaels-Ober, Zachary Anker.
 See LICENSE.txt for further details.

data/Rakefile

@@ -1,19 +1,12 @@
-#!/usr/bin/env rake
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 
-task :test => :spec
-
-begin
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new
-rescue LoadError
-  task :rubocop do
-    $stderr.puts "RuboCop is disabled"
-  end
-end
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
 
 require "yardstick/rake/measurement"
 Yardstick::Rake::Measurement.new do |measurement|
@@ -36,7 +29,7 @@ task :generate_status_codes do
     code = e.xpath("xmlns:value").text.to_s
     desc = e.xpath("xmlns:description").text.to_s
 
-    next a if "Unassigned" == desc || "(Unused)" == desc
+    next a if %w[Unassigned (Unused)].include?(desc)
 
     a << "#{code} => #{desc.inspect}"
   end
@@ -68,4 +61,12 @@ task :generate_status_codes do
   end
 end
 
-task :default => [:spec, :rubocop, :verify_measurements]
+if ENV["CI"].nil?
+  task :default => %i[spec rubocop verify_measurements]
+else
+  case ENV["SUITE"]
+  when "rubocop"   then task :default => :rubocop
+  when "yardstick" then task :default => :verify_measurements
+  else                  task :default => :spec
+  end
+end

data/http.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "http/version"
@@ -26,7 +28,7 @@ Gem::Specification.new do |gem|
   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-form_data", ">= 2.0.0-pre2", "< 3"
   gem.add_runtime_dependency "http-cookie",    "~> 1.0"
   gem.add_runtime_dependency "addressable",    "~> 2.3"
 

data/lib/http.rb

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

data/lib/http/chainable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "base64"
 
 require "http/headers"
@@ -8,70 +9,70 @@ module HTTP
     # Request a get sans response body
     # @param uri
     # @option options [Hash]
-    def head(uri, options = {})
+    def head(uri, options = {}) # rubocop:disable Style/OptionHash
       request :head, uri, options
     end
 
     # Get a resource
     # @param uri
     # @option options [Hash]
-    def get(uri, options = {})
+    def get(uri, options = {}) # rubocop:disable Style/OptionHash
       request :get, uri, options
     end
 
     # Post to a resource
     # @param uri
     # @option options [Hash]
-    def post(uri, options = {})
+    def post(uri, options = {}) # rubocop:disable Style/OptionHash
       request :post, uri, options
     end
 
     # Put to a resource
     # @param uri
     # @option options [Hash]
-    def put(uri, options = {})
+    def put(uri, options = {}) # rubocop:disable Style/OptionHash
       request :put, uri, options
     end
 
     # Delete a resource
     # @param uri
     # @option options [Hash]
-    def delete(uri, options = {})
+    def delete(uri, options = {}) # rubocop:disable Style/OptionHash
       request :delete, uri, options
     end
 
     # Echo the request back to the client
     # @param uri
     # @option options [Hash]
-    def trace(uri, options = {})
+    def trace(uri, options = {}) # rubocop:disable Style/OptionHash
       request :trace, uri, options
     end
 
     # Return the methods supported on the given URI
     # @param uri
     # @option options [Hash]
-    def options(uri, options = {})
+    def options(uri, options = {}) # rubocop:disable Style/OptionHash
       request :options, uri, options
     end
 
     # Convert to a transparent TCP/IP tunnel
     # @param uri
     # @option options [Hash]
-    def connect(uri, options = {})
+    def connect(uri, options = {}) # rubocop:disable Style/OptionHash
       request :connect, uri, options
     end
 
     # Apply partial modifications to a resource
     # @param uri
     # @option options [Hash]
-    def patch(uri, options = {})
+    def patch(uri, options = {}) # rubocop:disable Style/OptionHash
       request :patch, uri, options
     end
 
     # Make an HTTP request with the given verb
     # @param uri
     # @option options [Hash]
-    def request(verb, uri, options = {})
+    def request(verb, uri, options = {}) # rubocop:disable Style/OptionHash
       branch(options).request verb, uri
     end
 
@@ -85,7 +86,7 @@ module HTTP
     #   @option options [Float] :read Read timeout
     #   @option options [Float] :write Write timeout
     #   @option options [Float] :connect Connect timeout
-    def timeout(klass, options = {})
+    def timeout(klass, options = {}) # rubocop:disable Style/OptionHash
       if klass.is_a? Hash
         options = klass
         klass   = :per_operation
@@ -98,7 +99,7 @@ module HTTP
               else raise ArgumentError, "Unsupported Timeout class: #{klass}"
               end
 
-      [:read, :write, :connect].each do |k|
+      %i[read write connect].each do |k|
         next unless options.key? k
         options["#{k}_timeout".to_sym] = options.delete k
       end
@@ -170,8 +171,8 @@ module HTTP
     # @param opts
     # @return [HTTP::Client]
     # @see Redirector#initialize
-    def follow(opts = {})
-      branch default_options.with_follow opts
+    def follow(options = {}) # rubocop:disable Style/OptionHash
+      branch default_options.with_follow options
     end
 
     # Make a request with the given headers