http 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc19474bee4f52564c7c3e7da6a3223aa9854a1e
-  data.tar.gz: 9f6d3dcf7a3ed0bedd9de9ae38fee5d4cba2f40b
+  metadata.gz: 02788674d1c33bccb2b1ce3ce9740c375dfd279e
+  data.tar.gz: f53920c45b63f890d6f53f63825f2876995f18f2
 SHA512:
-  metadata.gz: c5521514cdfa5e30a2e876d492b0ee4d3be1689f0f26fe9258d6c86e6b08ee71521763902042a7ecf2512daf2da6ddd346f84f0c92a9baf9d9c815eb1bac8f57
-  data.tar.gz: e1976feb1290b9466bf9de7ffa5050163aac481a88df2557d468d42cc7e2218fd34c202cec47247f008ab3c5c54024c61ba52cd3fadbee1fa064424cdddf1929
+  metadata.gz: a6e9a8742a612eba91e4b1de6853817a573ffba2942c8b1cc2813b6f365554eca31d1e613b4aedbafc94228393fd61655e892068702b5d86c908898a57176724
+  data.tar.gz: 6a3e72f0d8271682adc939e6619f839183ab1cd283913004e39ceeda998db1ec5c6334f55c4bc2214e269495c9b9f84f2c510cbf92337433420fd8cd7e465a81

data/.rspec

@@ -2,4 +2,5 @@
 --color
 --format=documentation
 --order random
+--require spec_helper
 --warnings

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
-  - jruby-19mode
+  - jruby
   - jruby-head
   - ruby-head
   - rbx-2

data/CHANGES.md

@@ -1,5 +1,10 @@
-0.7.0 (2015-01-02)
-------------------
+## 0.7.1 (2015-01-03)
+
+* Gemspec fixups
+* Remove superfluous space in HTTP::Response inspection
+
+
+## 0.7.0 (2015-01-02)
 
 * Fix handling of EOF which caused infinite loop. See #163, #166 and #152. (@mickm, @ixti)
 * Drop Ruby 1.8.7 support. (@ixti)
@@ -22,13 +27,13 @@
   deprecated (@ixti)
 * Delegate `HTTP::Response#readpartial` to `HTTP::Response::Body` (@ixti)
 
-0.6.3 (2014-11-14)
-------------------
+
+## 0.6.3 (2014-11-14)
 
 * Backported EOF fix from master branch. See #166. (@ixti)
 
-0.6.2 (2014-08-06)
-------------------
+
+## 0.6.2 (2014-08-06)
 
 * Fix default Host header value. See #150. (@ixti)
 * Deprecate BearerToken authorization header. (@ixti)
@@ -36,8 +41,8 @@
 * Rename `HTTP.with_follow` to `HTTP.follow` and mark former one as being
   deprecated (@ixti)
 
-0.6.1 (2014-05-07)
-------------------
+
+## 0.6.1 (2014-05-07)
 
 * Fix request `Content-Length` calculation for Unicode (@challengeechallengee)
 * Add `Response#flush` (@ixti)
@@ -46,8 +51,8 @@
 * Fix forgotten CGI require (@ixti)
 * Improve README (@tarcieri)
 
-0.6.0 (2014-04-04)
-------------------
+
+## 0.6.0 (2014-04-04)
 
 * Rename `HTTP::Request#method` to `HTTP::Request#verb` (@krainboltgreene)
 * Add `HTTP::ResponseBody` class (@tarcieri)
@@ -109,16 +114,17 @@ File.open "/tmp/dummy.bin", "wb" do |io|
 end
 ```
 
-[Changes discussion](https://github.com/tarcieri/http/issues/116)
+[Changes discussion](https://github.com/httprb/http.rb/issues/116)
+
 
-0.5.1 (2014-05-27)
-------------------
+## 0.5.1 (2014-05-27)
 
 * Backports redirector fixes from 0.6.0 (@ixti)
 * EOL of 0.5.X branch.
 
-0.5.0
------
+
+## 0.5.0 (2013-09-14)
+
 * Add query string support
 * New response delegator allows HTTP.get(uri).response
 * HTTP::Chainable#stream provides a shorter alias for
@@ -126,36 +132,42 @@ end
 * Better string inspect for HTTP::Response
 * Curb compatibility layer removed
 
-0.4.0
------
+
+## 0.4.0 (2012-10-12)
+
 * Fix bug accessing https URLs
 * Fix several instances of broken redirect handling
 * Add default user agent
 * Many additional minor bugfixes
 
-0.3.0
------
+
+## 0.3.0 (2012-09-01)
+
 * New implementation based on tmm1's http_parser.rb instead of Net::HTTP
 * Support for following redirects
 * Support for request body through {:body => ...} option
 * HTTP#with_response (through Chainable)
 
-0.2.0
------
+
+## 0.2.0 (2012-03-05)
+
 * Request and response objects
 * Callback system
 * Internal refactoring ensuring true chainability
 * Use the certified gem to ensure SSL certificate verification
 
-0.1.0
------
+
+## 0.1.0 (2012-01-26)
+
 * Testing against WEBrick
 * Curb compatibility (require 'http/compat/curb')
 
-0.0.1
------
+
+## 0.0.1 (2011-10-11)
+
 * Initial half-baked release
 
-0.0.0
------
+
+## 0.0.0 (2011-10-06)
+
 * Vapoware release to claim the "http" gem name >:D

data/Gemfile

@@ -1,36 +1,36 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'jruby-openssl' if defined? JRUBY_VERSION
 gem 'rake'
 
 group :development do
+  gem 'celluloid-io'
+  gem 'guard'
+  gem 'guard-rspec'
   gem 'pry'
+
   platforms :ruby_19, :ruby_20 do
     gem 'pry-debugger'
     gem 'pry-stack_explorer'
   end
-  platforms :ruby_19, :ruby_20, :ruby_21 do
-    gem 'celluloid-io'
-    gem 'guard-rspec'
-  end
 end
 
 group :test do
   gem 'backports'
   gem 'coveralls'
-  gem 'json', '>= 1.8.1', :platforms => [:jruby, :rbx, :ruby_19]
-  gem 'mime-types', '~> 1.25', :platforms => [:jruby]
-  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby]
-  gem 'rspec', '~> 3.0'
+  gem 'json',         '>= 1.8.1'
+  gem 'mime-types',   '~> 1.25',  :platforms => [:jruby]
+  gem 'rest-client',  '~> 1.6.0', :platforms => [:jruby]
+  gem 'rspec',        '~> 3.0'
   gem 'rspec-its'
-  gem 'rubocop', '~> 0.25.0', :platforms => [:ruby_19, :ruby_20, :ruby_21]
-  gem 'simplecov', '>= 0.9'
+  gem 'rubocop',      '~> 0.25.0'
+  gem 'simplecov',    '>= 0.9'
   gem 'yardstick'
 end
 
 group :doc do
-  gem 'yard'
   gem 'redcarpet'
+  gem 'yard'
 end
 
 # Specify your gem's dependencies in http.gemspec

data/Guardfile

@@ -1,8 +1,16 @@
-# A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
-  watch(/^spec\/.+_spec\.rb$/)
-  watch(/^lib\/(.+)\.rb$/)     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { 'spec' }
+guard :rspec, :cmd => 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper)  { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
 end

data/README.md

@@ -23,12 +23,13 @@ Help and Discussion
 -------------------
 
 If you need help or just want to talk about the http.rb,
-[visit the http.rb Google Group][googlegroup],
-or join by email by sending a message to:
-[httprb+subscribe@googlegroups.com][subscribe].
+visit the http.rb Google Group:
 
-[googlegroup]: https://groups.google.com/forum/#!forum/httprb
-[subscribe]:   mailto:httprb+subscribe@googlegroups.com
+https://groups.google.com/forum/#!forum/httprb
+
+You can join by email by sending a message to:
+
+[httprb+subscribe@googlegroups.com](mailto:httprb+subscribe@googlegroups.com)
 
 If you believe you've found a bug, please report it at:
 
@@ -58,7 +59,7 @@ Inside of your Ruby program do:
 Documentation
 -------------
 
-[Please see the http.rb wiki](https://github.com/httprb/http/wiki)
+[Please see the http.rb wiki](https://github.com/httprb/http.rb/wiki)
 for more detailed documentation and usage notes.
 
 Basic Usage
@@ -69,7 +70,7 @@ Here's some simple examples to get you started:
 ### GET requests
 
 ```ruby
->> HTTP.get("http://www.google.com").to_s
+>> HTTP.get('https://github.com').to_s
 => "<html><head><meta http-equiv=\"content-type\" content=..."
 ```
 
@@ -77,26 +78,26 @@ That's all it takes! To obtain an `HTTP::Response` object instead of the respons
 body, all we have to do is omit the #to_s on the end:
 
 ```ruby
->> HTTP.get("http://www.google.com")
+>> HTTP.get('https://github.com')
 => #<HTTP/1.0 200 OK @headers={"Content-Type"=>"text/html; charset=UTF-8", "Date"=>"Fri, ...>
  => #<HTTP::Response/1.1 200 OK @headers={"Content-Type"=>"text/html; ...>
 ```
 
-We can also obtain an `HTTP::ResponseBody` object for this response:
+We can also obtain an `HTTP::Response::Body` object for this response:
 
 ```ruby
->> HTTP.get("http://www.google.com").body
- => #<HTTP::ResponseBody:814d7aac @streaming=false>
+>> HTTP.get('https://github.com').body
+ => #<HTTP::Response::Body:814d7aac @streaming=false>
 ```
 
-The response body can be streamed with `HTTP::ResponseBody#readpartial`:
+The response body can be streamed with `HTTP::Response::Body#readpartial`:
 
 ```ruby
->> HTTP.get("http://www.google.com").body.readpartial
+>> HTTP.get('https://github.com').body.readpartial
  => "<!doctype html><html "
 ```
 
-In practice you'll want to bind the HTTP::ResponseBody to a local variable (e.g.
+In practice you'll want to bind the HTTP::Response::Body to a local variable (e.g.
 "body") and call readpartial on it repeatedly until it returns nil.
 
 ### POST requests
@@ -104,24 +105,24 @@ In practice you'll want to bind the HTTP::ResponseBody to a local variable (e.g.
 Making POST requests is simple too. Want to POST a form?
 
 ```ruby
-HTTP.post("http://example.com/resource", :form => {:foo => "42"})
+HTTP.post('http://example.com/resource', :form => {:foo => '42'})
 ```
 Making GET requests with query string parameters is as simple.
 
 ```ruby
-HTTP.get("http://example.com/resource", :params => {:foo => "bar"})
+HTTP.get('http://example.com/resource', :params => {:foo => 'bar'})
 ```
 
 Want to POST with a specific body, JSON for instance?
 
 ```ruby
-HTTP.post("http://example.com/resource", :json => { :foo => '42' })
+HTTP.post('http://example.com/resource', :json => { :foo => '42' })
 ```
 
 Or just a plain body?
 
 ```ruby
-HTTP.post("http://example.com/resource", :body => "foo=42&bar=baz")
+HTTP.post('http://example.com/resource', :body => 'foo=42&bar=baz')
 ```
 
 It's easy!
@@ -132,15 +133,15 @@ Making request behind proxy is as simple as making them directly. Just specify
 hostname (or IP address) of your proxy server and its port, and here you go:
 
 ```ruby
-HTTP.via("proxy-hostname.local", 8080)
-  .get "http://example.com/resource"
+HTTP.via('proxy-hostname.local', 8080)
+  .get('http://example.com/resource')
 ```
 
 Proxy needs authentication? No problem:
 
 ```ruby
-HTTP.via("proxy-hostname.local", 8080, "username", "password")
-  .get "http://example.com/resource"
+HTTP.via('proxy-hostname.local', 8080, 'username', 'password')
+  .get('http://example.com/resource')
 ```
 
 ### Adding Headers
@@ -150,7 +151,7 @@ you want to get the latest commit of this library from GitHub in JSON format.
 One way we could do this is by tacking a filename on the end of the URL:
 
 ```ruby
-HTTP.get("https://github.com/httprb/http/commit/HEAD.json")
+HTTP.get('https://github.com/httprb/http.rb/commit/HEAD.json')
 ```
 
 The GitHub API happens to support this approach, but really this is a bit of a
@@ -161,7 +162,7 @@ intends us to, by using the Accept header:
 
 ```ruby
 HTTP.with_headers(:accept => 'application/json').
-  get("https://github.com/httprb/http/commit/HEAD")
+  get('https://github.com/httprb/http.rb/commit/HEAD')
 ```
 
 This requests JSON from GitHub. GitHub is smart enough to understand our
@@ -171,16 +172,16 @@ Shorter aliases exists for HTTP.with_headers:
 
 ```ruby
 HTTP.with(:accept => 'application/json').
-  get("https://github.com/httprb/http/commit/HEAD")
+  get('https://github.com/httprb/http.rb/commit/HEAD')
 
 HTTP[:accept => 'application/json'].
-  get("https://github.com/httprb/http/commit/HEAD")
+  get('https://github.com/httprb/http.rb/commit/HEAD')
 ```
 
 ### Authorization Header
 
-With  [HTTP Basic Authentication](http://tools.ietf.org/html/rfc2617) username
-and password:
+With [HTTP Basic Authentication](http://tools.ietf.org/html/rfc2617) using
+a username and password:
 
 ```ruby
 HTTP.basic_auth(:user => 'user', :pass => 'pass')
@@ -190,7 +191,7 @@ HTTP.basic_auth(:user => 'user', :pass => 'pass')
 Or with plain as-is value:
 
 ```ruby
-HTTP.auth("Bearer VGhlIEhUVFAgR2VtLCBST0NLUw")
+HTTP.auth('Bearer VGhlIEhUVFAgR2VtLCBST0NLUw')
 # <HTTP::Headers {"Authorization"=>"Bearer VGhlIEhUVFAgR2VtLCBST0NLUw"}>
 ```
 
@@ -209,7 +210,7 @@ right? But usually it's not, and so we end up adding ".json" onto the ends of
 our URLs because the existing mechanisms make it too hard. It should be easy:
 
 ```ruby
-HTTP.accept(:json).get("https://github.com/httprb/http/commit/HEAD")
+HTTP.accept(:json).get('https://github.com/httprb/http.rb/commit/HEAD')
 ```
 
 This adds the appropriate Accept header for retrieving a JSON response for the
@@ -236,7 +237,7 @@ 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)
+* [Full parallel HTTP fetcher example](https://github.com/httprb/http.rb/wiki/Parallel-requests-with-Celluloid%3A%3AIO)
 * See also: [Celluloid::IO](https://github.com/celluloid/celluloid-io)
 
 Supported Ruby Versions

data/Rakefile

@@ -23,7 +23,7 @@ end
 require 'yardstick/rake/verify'
 Yardstick::Rake::Verify.new do |verify|
   verify.require_exact_threshold = false
-  verify.threshold = 58.8
+  verify.threshold = 58
 end
 
 task :default => [:spec, :rubocop, :verify_measurements]

data/http.gemspec

@@ -1,10 +1,9 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'http/version'
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/http/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = %w(Tony Arcieri)
-  gem.email         = %w(tony.arcieri@gmail.com)
+  gem.authors       = ['Tony Arcieri', 'Erik Michaels-Ober', 'Aleksey V. Zapparov']
+  gem.email         = ['bascule@gmail.com']
 
   gem.description   = <<-DESCRIPTION.strip.gsub(/\s+/, ' ')
     An easy-to-use client library for making requests from Ruby.
@@ -13,18 +12,18 @@ Gem::Specification.new do |gem|
   DESCRIPTION
 
   gem.summary       = 'HTTP should be easy'
-  gem.homepage      = 'https://github.com/tarcieri/http.rb'
-  gem.licenses      = %w(MIT)
+  gem.homepage      = 'https://github.com/httprb/http.rb'
+  gem.licenses      = ['MIT']
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = 'http'
-  gem.require_paths = %w(lib)
+  gem.require_paths = ['lib']
   gem.version       = HTTP::VERSION
 
   gem.add_runtime_dependency 'http_parser.rb', '~> 0.6.0'
-  gem.add_runtime_dependency 'form_data',      '~> 0.0.1'
+  gem.add_runtime_dependency 'form_data',      '~> 0.1.0'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
 end

data/lib/http/headers.rb

@@ -3,6 +3,7 @@ require 'forwardable'
 require 'http/headers/mixin'
 
 module HTTP
+  # HTTP Headers container.
   class Headers
     extend Forwardable
     include Enumerable
@@ -10,13 +11,14 @@ module HTTP
     # Matches HTTP header names when in "Canonical-Http-Format"
     CANONICAL_HEADER = /^[A-Z][a-z]*(-[A-Z][a-z]*)*$/
 
-    # :nodoc:
+    # Class constructor.
     def initialize
       @pile = []
     end
 
-    # Sets header
+    # Sets header.
     #
+    # @param (see #add)
     # @return [void]
     def set(name, value)
       delete(name)
@@ -24,36 +26,41 @@ module HTTP
     end
     alias_method :[]=, :set
 
-    # Removes header
+    # Removes header.
     #
+    # @param [#to_s] name header name
     # @return [void]
     def delete(name)
       name = canonicalize_header name.to_s
       @pile.delete_if { |k, _| k == name }
     end
 
-    # Append header
+    # Appends header.
     #
+    # @param [#to_s] name header name
+    # @param [Array<#to_s>, #to_s] value header value(s) to be appended
     # @return [void]
     def add(name, value)
-      name = canonicalize_header name.to_s
-      Array(value).each { |v| @pile << [name, v] }
+      name  = canonicalize_header name.to_s
+      Array(value).each { |v| @pile << [name, v.to_s] }
     end
+
+    # @deprecated Will be removed in 1.0.0
     alias_method :append, :add
 
-    # Return array of header values if any.
+    # Returns list of header values if any.
     #
-    # @return [Array]
+    # @return [Array<String>]
     def get(name)
       name = canonicalize_header name.to_s
       @pile.select { |k, _| k == name }.map { |_, v| v }
     end
 
-    # Smart version of {#get}
+    # Smart version of {#get}.
     #
-    # @return [NilClass] if header was not set
-    # @return [Object] if header has exactly one value
-    # @return [Array<Object>] if header has more than one value
+    # @return [nil] if header was not set
+    # @return [String] if header has exactly one value
+    # @return [Array<String>] if header has more than one value
     def [](name)
       values = get(name)
 
@@ -64,26 +71,28 @@ module HTTP
       end
     end
 
-    # Converts headers into a Rack-compatible Hash
+    # Returns Rack-compatible headers Hash
     #
     # @return [Hash]
     def to_h
       Hash[keys.map { |k| [k, self[k]] }]
     end
 
-    # Array of key/value pairs
+    # Returns headers key/value pairs.
     #
     # @return [Array<[String, String]>]
     def to_a
       @pile.map { |pair| pair.map(&:dup) }
     end
 
-    # :nodoc:
+    # Returns human-readable representation of `self` instance.
+    #
+    # @return [String]
     def inspect
       "#<#{self.class} #{to_h.inspect}>"
     end
 
-    # List of header names
+    # Returns list of header names.
     #
     # @return [Array<String>]
     def keys
@@ -98,15 +107,40 @@ module HTTP
       @pile == other.to_a
     end
 
-    def_delegators :@pile, :each, :empty?, :hash
+    # Calls the given block once for each key/value pair in headers container.
+    #
+    # @return [Enumerator] if no block given
+    # @return [Headers] self-reference
+    def each(&blk)
+      return @pile.each unless blk
+
+      @pile.each(&blk)
+      self
+    end
 
-    # :nodoc:
+    # @!method empty?
+    #   Returns `true` if `self` has no key/value pairs
+    #
+    #   @return [Boolean]
+    def_delegator :@pile, :empty?
+
+    # @!method hash
+    #   Compute a hash-code for this headers container.
+    #   Two conatiners with the same content will have the same hash code.
+    #
+    #   @see http://www.ruby-doc.org/core/Object.html#method-i-hash
+    #   @return [Fixnum]
+    def_delegator :@pile, :hash
+
+    # Properly clones internal key/value storage.
+    #
+    # @api private
     def initialize_copy(orig)
       super
       @pile = to_a
     end
 
-    # Merge in `other` headers
+    # Merges `other` headers into `self`.
     #
     # @see #merge
     # @return [void]
@@ -114,7 +148,7 @@ module HTTP
       self.class.coerce(other).to_h.each { |name, values| set name, values }
     end
 
-    # Returns new Headers instance with `other` headers merged in.
+    # Returns new instance with `other` headers merged in.
     #
     # @see #merge!
     # @return [Headers]
@@ -123,9 +157,9 @@ module HTTP
     end
 
     class << self
-      # Initiates new Headers object from given object.
+      # Coerces given `object` into Headers.
       #
-      # @raise [Error] if given object can't be coerced
+      # @raise [Error] if object can't be coerced
       # @param [#to_hash, #to_h, #to_a] object
       # @return [Headers]
       def coerce(object)
@@ -147,9 +181,10 @@ module HTTP
 
   private
 
-    # Transform to canonical HTTP header capitalization
+    # Transforms `name` to canonical HTTP header capitalization
+    #
     # @param [String] name
-    # @return [String]
+    # @return [String] canonical HTTP header name
     def canonicalize_header(name)
       name[CANONICAL_HEADER] || name.split(/[\-_]/).map(&:capitalize).join('-')
     end

data/lib/http/headers/mixin.rb

@@ -2,10 +2,31 @@ require 'forwardable'
 
 module HTTP
   class Headers
+    # Provides shared behavior for {HTTP::Request} and {HTTP::Response}.
+    # Expects `@headers` to be an instance of {HTTP::Headers}.
+    #
+    # @example Usage
+    #
+    #   class MyHttpRequest
+    #     include HTTP::Headers::Mixin
+    #
+    #     def initialize
+    #       @headers = HTTP::Headers.new
+    #     end
+    #   end
     module Mixin
       extend Forwardable
+
+      # @return [HTTP::Headers]
       attr_reader :headers
-      def_delegators :headers, :[], :[]=
+
+      # @!method []
+      #   (see HTTP::Headers#[])
+      def_delegator :headers, :[]
+
+      # @!method []=
+      #   (see HTTP::Headers#[]=)
+      def_delegator :headers, :[]=
     end
   end
 end

data/lib/http/response.rb

@@ -102,7 +102,7 @@ module HTTP
 
     # Inspect a response
     def inspect
-      "#<#{self.class}/#{@version} #{code}  #{reason} #{headers.inspect}>"
+      "#<#{self.class}/#{@version} #{code} #{reason} #{headers.inspect}>"
     end
   end
 end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/{http → lib/http}/client_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Client do
   let(:test_endpoint)  { "http://#{ExampleServer::ADDR}" }
 

data/spec/{http → lib/http}/content_type_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::ContentType do
   describe '.parse' do
     context 'with text/plain' do

data/spec/{http → lib/http}/headers/mixin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Headers::Mixin do
   let :dummy_class do
     Class.new do

data/spec/{http → lib/http}/headers_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Headers do
   subject(:headers) { described_class.new }
 
@@ -235,6 +233,14 @@ RSpec.describe HTTP::Headers do
         %w(Set-Cookie woo=hoo)
       )
     end
+
+    it 'returns self instance if block given' do
+      expect(headers.each { |*| }).to be headers
+    end
+
+    it 'returns Enumerator if no block given' do
+      expect(headers.each).to be_a Enumerator
+    end
   end
 
   describe '.empty?' do

data/spec/{http → lib/http}/options/body_spec.rb

@@ -1,7 +1,4 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options, 'body' do
-
   let(:opts) { HTTP::Options.new }
 
   it 'defaults to nil' do
@@ -13,5 +10,4 @@ RSpec.describe HTTP::Options, 'body' do
     expect(opts.body).to be nil
     expect(opts2.body).to eq('foo')
   end
-
 end

data/spec/{http → lib/http}/options/form_spec.rb

@@ -1,7 +1,4 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options, 'form' do
-
   let(:opts) { HTTP::Options.new }
 
   it 'defaults to nil' do
@@ -13,5 +10,4 @@ RSpec.describe HTTP::Options, 'form' do
     expect(opts.form).to be nil
     expect(opts2.form).to eq(:foo => 42)
   end
-
 end

data/spec/{http → lib/http}/options/headers_spec.rb

@@ -1,7 +1,4 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options, 'headers' do
-
   let(:opts) { HTTP::Options.new }
 
   it 'defaults to be empty' do
@@ -18,5 +15,4 @@ RSpec.describe HTTP::Options, 'headers' do
     x = Struct.new(:to_hash).new('accept' => 'json')
     expect(opts.with_headers(x).headers['accept']).to eq('json')
   end
-
 end

data/spec/{http → lib/http}/options/json_spec.rb

@@ -1,7 +1,4 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options, 'json' do
-
   let(:opts) { HTTP::Options.new }
 
   it 'defaults to nil' do
@@ -13,5 +10,4 @@ RSpec.describe HTTP::Options, 'json' do
     expect(opts.json).to be nil
     expect(opts2.json).to eq(:foo => 42)
   end
-
 end

data/spec/{http → lib/http}/options/merge_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options, 'merge' do
   let(:opts) { HTTP::Options.new }
 

data/spec/{http → lib/http}/options/new_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options, 'new' do
   it 'supports a Options instance' do
     opts = HTTP::Options.new

data/spec/{http → lib/http}/options/proxy_spec.rb

@@ -1,7 +1,4 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options, 'proxy' do
-
   let(:opts) { HTTP::Options.new }
 
   it 'defaults to {}' do

data/spec/{http → lib/http}/options_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Options do
   subject { described_class.new(:response => :body) }
 

data/spec/{http → lib/http}/redirector_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Redirector do
   def simple_response(status, body = '', headers = {})
     HTTP::Response.new(status, '1.1', headers, body)

data/spec/{http → lib/http}/request/writer_spec.rb

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-require 'spec_helper'
-
 RSpec.describe HTTP::Request::Writer do
   let(:io)          { StringIO.new }
   let(:body)        { '' }

data/spec/{http → lib/http}/request_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Request do
   let(:headers)     { {:accept => 'text/html'} }
   let(:request_uri) { 'http://example.com/' }

data/spec/{http → lib/http}/response/body_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Response::Body do
   let(:client)   { double }
   let(:chunks)   { ['Hello, ', 'World!'] }

data/spec/{http → lib/http}/response/status_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Response::Status do
   describe '.new' do
     it 'fails if given value does not respond to #to_i' do

data/spec/{http → lib/http}/response_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe HTTP::Response do
   it 'includes HTTP::Headers::Mixin' do
     expect(described_class).to include HTTP::Headers::Mixin

data/spec/{http_spec.rb → lib/http_spec.rb}

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'json'
 
 RSpec.describe HTTP do

data/spec/spec_helper.rb

@@ -1,32 +1,86 @@
-if RUBY_VERSION >= '1.9'
-  require 'simplecov'
-  require 'coveralls'
+# coding: utf-8
 
-  SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+require 'simplecov'
+require 'coveralls'
 
-  SimpleCov.start do
-    add_filter '/spec/'
-    minimum_coverage(80)
-  end
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start do
+  add_filter '/spec/'
+  minimum_coverage 80
 end
 
 require 'http'
 require 'rspec/its'
 require 'support/example_server'
 require 'support/proxy_server'
+require 'support/capture_warning'
 
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
   config.disable_monkey_patching!
-end
 
-def capture_warning
-  begin
-    old_stderr = $stderr
-    $stderr = StringIO.new
-    yield
-    result = $stderr.string
-  ensure
-    $stderr = old_stderr
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
   end
-  result
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

data/spec/support/capture_warning.rb

@@ -0,0 +1,8 @@
+def capture_warning
+  old_stderr = $stderr
+  $stderr = StringIO.new
+  yield
+  $stderr.string
+ensure
+  $stderr = old_stderr
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
-- Tony
-- Arcieri
+- Tony Arcieri
+- Erik Michaels-Ober
+- Aleksey V. Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -31,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,7 +57,7 @@ dependencies:
 description: An easy-to-use client library for making requests from Ruby. It uses
   a simple method chaining system for building requests, similar to Python's Requests.
 email:
-- tony.arcieri@gmail.com
+- bascule@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,30 +97,31 @@ files:
 - lib/http/response/status/reasons.rb
 - lib/http/version.rb
 - logo.png
-- spec/http/client_spec.rb
-- spec/http/content_type_spec.rb
-- spec/http/headers/mixin_spec.rb
-- spec/http/headers_spec.rb
-- spec/http/options/body_spec.rb
-- spec/http/options/form_spec.rb
-- spec/http/options/headers_spec.rb
-- spec/http/options/json_spec.rb
-- spec/http/options/merge_spec.rb
-- spec/http/options/new_spec.rb
-- spec/http/options/proxy_spec.rb
-- spec/http/options_spec.rb
-- spec/http/redirector_spec.rb
-- spec/http/request/writer_spec.rb
-- spec/http/request_spec.rb
-- spec/http/response/body_spec.rb
-- spec/http/response/status_spec.rb
-- spec/http/response_spec.rb
-- spec/http_spec.rb
+- spec/lib/http/client_spec.rb
+- spec/lib/http/content_type_spec.rb
+- spec/lib/http/headers/mixin_spec.rb
+- spec/lib/http/headers_spec.rb
+- spec/lib/http/options/body_spec.rb
+- spec/lib/http/options/form_spec.rb
+- spec/lib/http/options/headers_spec.rb
+- spec/lib/http/options/json_spec.rb
+- spec/lib/http/options/merge_spec.rb
+- spec/lib/http/options/new_spec.rb
+- spec/lib/http/options/proxy_spec.rb
+- spec/lib/http/options_spec.rb
+- spec/lib/http/redirector_spec.rb
+- spec/lib/http/request/writer_spec.rb
+- spec/lib/http/request_spec.rb
+- spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/status_spec.rb
+- spec/lib/http/response_spec.rb
+- spec/lib/http_spec.rb
 - spec/spec_helper.rb
+- spec/support/capture_warning.rb
 - spec/support/example_server.rb
 - spec/support/example_server/servlet.rb
 - spec/support/proxy_server.rb
-homepage: https://github.com/tarcieri/http.rb
+homepage: https://github.com/httprb/http.rb
 licenses:
 - MIT
 metadata: {}
@@ -139,31 +141,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
 test_files:
-- spec/http/client_spec.rb
-- spec/http/content_type_spec.rb
-- spec/http/headers/mixin_spec.rb
-- spec/http/headers_spec.rb
-- spec/http/options/body_spec.rb
-- spec/http/options/form_spec.rb
-- spec/http/options/headers_spec.rb
-- spec/http/options/json_spec.rb
-- spec/http/options/merge_spec.rb
-- spec/http/options/new_spec.rb
-- spec/http/options/proxy_spec.rb
-- spec/http/options_spec.rb
-- spec/http/redirector_spec.rb
-- spec/http/request/writer_spec.rb
-- spec/http/request_spec.rb
-- spec/http/response/body_spec.rb
-- spec/http/response/status_spec.rb
-- spec/http/response_spec.rb
-- spec/http_spec.rb
+- spec/lib/http/client_spec.rb
+- spec/lib/http/content_type_spec.rb
+- spec/lib/http/headers/mixin_spec.rb
+- spec/lib/http/headers_spec.rb
+- spec/lib/http/options/body_spec.rb
+- spec/lib/http/options/form_spec.rb
+- spec/lib/http/options/headers_spec.rb
+- spec/lib/http/options/json_spec.rb
+- spec/lib/http/options/merge_spec.rb
+- spec/lib/http/options/new_spec.rb
+- spec/lib/http/options/proxy_spec.rb
+- spec/lib/http/options_spec.rb
+- spec/lib/http/redirector_spec.rb
+- spec/lib/http/request/writer_spec.rb
+- spec/lib/http/request_spec.rb
+- spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/status_spec.rb
+- spec/lib/http/response_spec.rb
+- spec/lib/http_spec.rb
 - spec/spec_helper.rb
+- spec/support/capture_warning.rb
 - spec/support/example_server.rb
 - spec/support/example_server/servlet.rb
 - spec/support/proxy_server.rb