http 0.9.9 → 1.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e30cb4fb424a8cc7177fef986701d40f763c79f1
-  data.tar.gz: c591281ad736c5981881378c5f02aebe34d2770d
+  metadata.gz: a6a3c8891e4a8af6201fcda1333d5570ca5b0c15
+  data.tar.gz: e527a9a5e0976f1e9ef793fd451c127b76738607
 SHA512:
-  metadata.gz: 9158b6f918b5bd8400fb1c5467058198e63b910b651bd5fc950e95f3481f84ba84c94a8e1e59f817185ff4b346e426bb3c4554eca1f22db8db5a5fff84c9b74d
-  data.tar.gz: efb3e652ed99710318b3fff185db47bd99234a8f1777e6ff77029150b2c05fa422dd5da7ee0e1bc8c2132ba3a269626422d2b44290750c9d772ca0edb1ee8f36
+  metadata.gz: 4811c0bf41f037a2615f165d03ee1fd8dee7b42a4e743e1ec35638ca2ab96c82d9b808dfe96eff083003588b98c1dcc1502b8eb23c268e7ef239e388e27a00dc
+  data.tar.gz: 9e7357f1161890a87449b6c92040fff54d9b829481de267d85f0c9337e0ec8e9e3a6a13319ef6055875b09fd39d854f62a48179e1e248da1671c47bc609faf21

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 bundler_args: --without development doc
 env:
   global:

data/CHANGES.md

@@ -1,13 +1,18 @@
-## 0.9.9 (2016-03-16)
-
-* *BACKPORT* [#318](https://github.com/httprb/http/pull/318)
-  Remove redundant string allocations upon header names normalization.
-  ([@ixti])
-
-* *BACKPORT* [#295](https://github.com/httprb/http/pull/295):
-  Fix redirect following when used with persistent mode.
-  ([@ixti])
-
+## 1.0.0.pre1 (2015-12-05)
+
+* [#265](https://github.com/httprb/http/pull/265/):
+  Remove deprecations ([@tarcieri]):
+  - HTTP::Chainable#with_follow (use #follow)
+  - HTTP::Chainable#with, #with_headers (use #headers)
+  - HTTP::Chainable#auth(:basic, ...) (use #basic_auth)
+  - HTTP::Chainable#default_headers (use #default_options[:headers])
+  - HTTP::Headers#append (use #add)
+  - HTTP::Options#[] hash-like API deprecated in favor of explicit methods
+  - HTTP::Request#request_header (use #headline)
+  - HTTP::Response::STATUS_CODES (use HTTP::Status::REASONS)
+  - HTTP::Response::SYMBOL_TO_STATUS_CODE (no replacement)
+  - HTTP::Response#status_code (use #status or #code)
+  - HTTP::Response::Status#symbolize (use #to_sym)
 
 ## 0.9.8 (2015-09-29)
 
@@ -15,7 +20,6 @@
   Fixed global timeout persisting time left across requests when reusing connections.
   ([@zanker][])
 
-
 ## 0.9.7 (2015-09-19)
 
 * [#258](https://github.com/httprb/http/pull/258):

data/Gemfile

@@ -20,11 +20,11 @@ end
 group :test do
   gem "backports"
   gem "coveralls"
-  gem "simplecov",    ">= 0.9"
-  gem "json",         ">= 1.8.1"
-  gem "rspec",        "~> 3.0"
+  gem "simplecov", ">= 0.9"
+  gem "json",      ">= 1.8.1"
+  gem "rubocop",   "=  0.35.1"
+  gem "rspec",     "~> 3.0"
   gem "rspec-its"
-  gem "rubocop"
   gem "yardstick"
   gem "certificate_authority"
 end

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://secure.travis-ci.org/httprb/http.svg?branch=master)](http://travis-ci.org/httprb/http)
 [![Code Climate](https://codeclimate.com/github/httprb/http.svg?branch=master)](https://codeclimate.com/github/httprb/http)
 [![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)
 
 ## About
 
@@ -276,30 +276,6 @@ HTTP.persistent('http://en.wikipedia.org') do |http|
 end
 ```
 
-### Celluloid::IO Support
-
-http.rb makes it simple to make multiple concurrent HTTP requests from a
-Celluloid::IO actor. Here's a parallel HTTP fetcher combining http.rb with
-Celluloid::IO:
-
-```ruby
-require "celluloid/io"
-require "http"
-
-class HttpFetcher
-  include Celluloid::IO
-
-  def fetch(url)
-    HTTP.get(url, socket_class: Celluloid::IO::TCPSocket)
-  end
-end
-```
-
-There's a little more to it, but that's the core idea!
-
-* [Full parallel HTTP fetcher example](https://github.com/httprb/http/wiki/Parallel-requests-with-Celluloid%3A%3AIO)
-* See also: [Celluloid::IO](https://github.com/celluloid/celluloid-io)
-
 ### Timeouts
 
 By default, HTTP does not timeout on a request. You can enable per operation

data/lib/http/chainable.rb

@@ -83,7 +83,10 @@ module HTTP
     #   @option options [Float] :write Write timeout
     #   @option options [Float] :connect Connect timeout
     def timeout(klass, options = {})
-      klass, options = :per_operation, klass if klass.is_a? Hash
+      if klass.is_a? Hash
+        options = klass
+        klass   = :per_operation
+      end
 
       klass = case klass.to_sym
               when :null          then HTTP::Timeout::Null
@@ -166,24 +169,12 @@ module HTTP
       branch default_options.with_follow opts
     end
 
-    # @deprecated will be removed in 1.0.0
-    # @see #follow
-    alias_method :with_follow, :follow
-
     # Make a request with the given headers
     # @param headers
     def headers(headers)
       branch default_options.with_headers(headers)
     end
 
-    # @deprecated will be removed in 1.0.0
-    # @see #headers
-    alias_method :with, :headers
-
-    # @deprecated will be removed in 1.0.0
-    # @see #headers
-    alias_method :with_headers, :headers
-
     # Make a request with the given cookies
     def cookies(cookies)
       branch default_options.with_cookies(cookies)
@@ -197,10 +188,7 @@ module HTTP
 
     # Make a request with the given Authorization header
     # @param [#to_s] value Authorization header value
-    def auth(value, opts = nil)
-      # shim for deprecated auth(:basic, opts).
-      # will be removed in 0.8.0
-      return basic_auth(opts) if :basic == value
+    def auth(value)
       headers Headers::AUTHORIZATION => value.to_s
     end
 
@@ -229,21 +217,6 @@ module HTTP
       @default_options = HTTP::Options.new(opts)
     end
 
-    # @deprecated Will be removed in 1.0.0; Use `#default_options#headers`
-    # Get headers of HTTP options
-    def default_headers
-      default_options.headers
-    end
-
-    # Set headers of HTTP options
-    # @deprecated Will be removed in 1.0.0; Use `#headers`
-    # @param headers
-    def default_headers=(headers)
-      @default_options = default_options.dup do |opts|
-        opts.headers = headers
-      end
-    end
-
     private
 
     # :nodoc:

data/lib/http/connection.rb

@@ -22,15 +22,15 @@ module HTTP
     # @param [HTTP::Options] options
     def initialize(req, options)
       @persistent           = options.persistent?
-      @keep_alive_timeout   = options[:keep_alive_timeout].to_f
+      @keep_alive_timeout   = options.keep_alive_timeout.to_f
       @pending_request      = false
       @pending_response     = false
       @failed_proxy_connect = false
 
       @parser = Response::Parser.new
 
-      @socket = options[:timeout_class].new(options[:timeout_options])
-      @socket.connect(options[:socket_class], req.socket_host, req.socket_port)
+      @socket = options.timeout_class.new(options.timeout_options)
+      @socket.connect(options.socket_class, req.socket_host, req.socket_port)
 
       send_proxy_connect_request(req)
       start_tls(req, options)
@@ -148,14 +148,14 @@ module HTTP
     def start_tls(req, options)
       return unless req.uri.https? && !failed_proxy_connect?
 
-      ssl_context = options[:ssl_context]
+      ssl_context = options.ssl_context
 
       unless ssl_context
         ssl_context = OpenSSL::SSL::SSLContext.new
-        ssl_context.set_params(options[:ssl] || {})
+        ssl_context.set_params(options.ssl || {})
       end
 
-      @socket.start_tls(req.uri.host, options[:ssl_socket_class], ssl_context)
+      @socket.start_tls(req.uri.host, options.ssl_socket_class, ssl_context)
     end
 
     # Open tunnel through proxy

data/lib/http/headers.rb

@@ -11,11 +11,11 @@ module HTTP
     include Enumerable
 
     # Matches HTTP header names when in "Canonical-Http-Format"
-    CANONICAL_NAME_RE = /^[A-Z][a-z]*(?:-[A-Z][a-z]*)*$/
+    CANONICAL_HEADER = /^[A-Z][a-z]*(-[A-Z][a-z]*)*$/
 
     # Matches valid header field name according to RFC.
     # @see http://tools.ietf.org/html/rfc7230#section-3.2
-    COMPLIANT_NAME_RE = /^[A-Za-z0-9!#\$%&'*+\-.^_`|~]+$/
+    HEADER_NAME_RE = /^[A-Za-z0-9!#\$%&'*+\-.^_`|~]+$/
 
     # Class constructor.
     def initialize
@@ -51,9 +51,6 @@ module HTTP
       Array(value).each { |v| @pile << [name, v.to_s] }
     end
 
-    # @deprecated Will be removed in 1.0.0
-    alias_method :append, :add
-
     # Returns list of header values if any.
     #
     # @return [Array<String>]
@@ -194,11 +191,10 @@ module HTTP
     #   match {HEADER_NAME_RE}
     # @return [String] canonical HTTP header name
     def normalize_header(name)
-      return name if name =~ CANONICAL_NAME_RE
-
-      normalized = name.split(/[\-_]/).each(&:capitalize!).join("-")
+      normalized   = name[CANONICAL_HEADER]
+      normalized ||= name.split(/[\-_]/).map(&:capitalize).join("-")
 
-      return normalized if normalized =~ COMPLIANT_NAME_RE
+      return normalized if normalized =~ HEADER_NAME_RE
 
       fail InvalidHeaderNameError, "Invalid HTTP header field name: #{name.inspect}"
     end

data/lib/http/options.rb

@@ -91,15 +91,6 @@ module HTTP
       !persistent.nil?
     end
 
-    # @deprecated
-    def [](option)
-      send(option)
-    rescue
-      warn "[DEPRECATED] `HTTP::Options#[:#{option}]` was deprecated. " \
-        "Use `HTTP::Options##{option}` instead."
-      nil
-    end
-
     def merge(other)
       h1 = to_hash
       h2 = other.to_hash
@@ -119,7 +110,7 @@ module HTTP
     def to_hash
       hash_pairs = self.class.
                    defined_options.
-                   flat_map { |opt_name| [opt_name, self[opt_name]] }
+                   flat_map { |opt_name| [opt_name, send(opt_name)] }
       Hash[*hash_pairs]
     end
 

data/lib/http/redirector.rb

@@ -54,8 +54,6 @@ module HTTP
         fail TooManyRedirectsError if too_many_hops?
         fail EndlessRedirectError  if endless_loop?
 
-        @response.flush
-
         @request  = redirect_to @response.headers[Headers::LOCATION]
         @response = yield @request
       end

data/lib/http/request.rb

@@ -126,9 +126,6 @@ module HTTP
       "#{verb.to_s.upcase} #{request_uri.omit :fragment} HTTP/#{version}"
     end
 
-    # @deprecated Will be removed in 1.0.0
-    alias_method :request_header, :headline
-
     # Compute HTTP request header SSL proxy connection
     def proxy_connect_header
       "CONNECT #{host}:#{port} HTTP/#{version}"

data/lib/http/response.rb

@@ -14,13 +14,6 @@ module HTTP
 
     include HTTP::Headers::Mixin
 
-    # @deprecated Will be removed in 1.0.0
-    #   Use Status::REASONS
-    STATUS_CODES = Status::REASONS
-
-    # @deprecated Will be removed in 1.0.0
-    SYMBOL_TO_STATUS_CODE = Hash[STATUS_CODES.map { |k, v| [v.downcase.gsub(/\s|-/, "_").to_sym, k] }].freeze
-
     # @return [Status]
     attr_reader :status
 
@@ -46,9 +39,6 @@ module HTTP
     #   @return (see HTTP::Response::Status#code)
     def_delegator :status, :code
 
-    # @deprecated Will be removed in 1.0.0
-    alias_method :status_code, :code
-
     # @!method to_s
     #   (see HTTP::Response::Body#to_s)
     def_delegator :body, :to_s

data/lib/http/response/parser.rb

@@ -42,7 +42,8 @@ module HTTP
       end
 
       def chunk
-        chunk, @chunk = @chunk, nil
+        chunk  = @chunk
+        @chunk = nil
         chunk
       end
 

data/lib/http/response/status.rb

@@ -91,9 +91,6 @@ module HTTP
         SYMBOLS[code]
       end
 
-      # @deprecated Will be removed in 1.0.0
-      alias_method :symbolize, :to_sym
-
       # Printable version of HTTP Status, surrounded by quote marks,
       # with special characters escaped.
       #

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.9.9".freeze
+  VERSION = "1.0.0.pre1".freeze
 end

data/spec/lib/http/options_spec.rb

@@ -1,9 +1,8 @@
 RSpec.describe HTTP::Options do
   subject { described_class.new(:response => :body) }
 
-  it "behaves like a Hash for reading" do
-    expect(subject[:response]).to eq(:body)
-    expect(subject[:nosuchone]).to be nil
+  it "has reader methods for attributes" do
+    expect(subject.response).to eq(:body)
   end
 
   it "coerces to a Hash" do

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

@@ -34,8 +34,8 @@ RSpec.describe HTTP::Response::Status do
     end
   end
 
-  describe "#symbolize" do
-    subject { described_class.new(code).symbolize }
+  describe "#to_sym" do
+    subject { described_class.new(code).to_sym }
 
     context "with unknown code" do
       let(:code) { 1024 }

data/spec/lib/http_spec.rb

@@ -201,12 +201,12 @@ RSpec.describe HTTP do
   describe ".auth" do
     it "sets Authorization header to the given value" do
       client = HTTP.auth "abc"
-      expect(client.default_headers[:authorization]).to eq "abc"
+      expect(client.default_options.headers[:authorization]).to eq "abc"
     end
 
     it "accepts any #to_s object" do
       client = HTTP.auth double :to_s => "abc"
-      expect(client.default_headers[:authorization]).to eq "abc"
+      expect(client.default_options.headers[:authorization]).to eq "abc"
     end
   end
 
@@ -225,7 +225,7 @@ RSpec.describe HTTP do
 
     it "sets Authorization header with proper BasicAuth value" do
       client = HTTP.basic_auth :user => "foo", :pass => "bar"
-      expect(client.default_headers[:authorization]).
+      expect(client.default_options.headers[:authorization]).
         to match(%r{^Basic [A-Za-z0-9+/]+=*$})
     end
   end

data/spec/support/http_handling_shared.rb

@@ -93,6 +93,9 @@ RSpec.shared_context "HTTP handling" do
         let(:read_timeout) { 2.5 }
 
         it "does not timeout" do
+          # TODO: investigate sporadic JRuby timeouts on CI
+          skip if defined?(JRUBY_VERSION)
+
           client.get("#{server.endpoint}/sleep").body.to_s
           client.get("#{server.endpoint}/sleep").body.to_s
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0.pre1
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -179,12 +179,12 @@ 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.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy