http 1.0.0.pre3 → 1.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e1927443d777f84c1531531c9dec4e0b6eba9ff
-  data.tar.gz: 4ac6e616a529191f56f7af34dd71e3fb93667155
+  metadata.gz: 9b68e3604886c916e6e4f1fd3607704c781d5895
+  data.tar.gz: e7ec1fece7b666199c2f5dab353530c0669a512a
 SHA512:
-  metadata.gz: 2f9b035441245faf2b3124cf4c2562b705ac74d1522f75216f31d7dcff91779acae067845127b0cca63ccf0159567ae11ed94408425cf4626d072178ed09d4a1
-  data.tar.gz: 44745a975c4fe5595857ed2214cdc9ec1d7caf0bb5c146270a2a9630574955d2ad33b63a600d8c9d0c2898facb59bd8cfc9f9685c972a66e8c4c23532a4659c1
+  metadata.gz: 642f976768af7e7bbebf7e8a1639c539bd168001b0dd7b1bf0369fe310a0ba94a15a377a14ae7d9725c08c4d45af1e8d2fbaecb1fa72591718e740a455e47a3f
+  data.tar.gz: 299d773b6b6ca345116fa3c2d2f87d8e55fe2203af198fb7ab4af1c09d8c550a2cac88ba4fcc3ec59a86e32969cec41dfe91b7ae2383ae73ff8dbad0fe51b616

data/CHANGES.md

@@ -1,4 +1,4 @@
-## 1.0.0.pre2 (2015-12-18)
+## 1.0.0.pre4 (2015-12-18)
 
 * [#265](https://github.com/httprb/http/pull/265/):
   Remove deprecations ([@tarcieri]):
@@ -34,6 +34,11 @@
   Use Encoding::BINARY as the default encoding for HTTP::Response::Body.
   ([@tarcieri])
 
+* [#278](https://github.com/httprb/http/pull/278)
+  Use an options hash for HTTP::Request's initializer API.
+  ([@ixti])
+
+
 ## 0.9.8 (2015-09-29)
 
 * [#260](https://github.com/httprb/http/pull/258):
@@ -435,3 +440,4 @@ end
 [@krainboltgreene]: https://github.com/krainboltgreene
 [@hundredwatt]: https://github.com/hundredwatt
 [@jwinter]: https://github.com/jwinter
+[@nerdrew]: https://github.com/nerdrew

data/lib/http/client.rb

@@ -32,13 +32,19 @@ module HTTP
       body    = make_request_body(opts, headers)
       proxy   = opts.proxy
 
-      req = HTTP::Request.new(verb, uri, headers, proxy, body)
-      res = perform req, opts
+      req = HTTP::Request.new(
+        :verb    => verb,
+        :uri     => uri,
+        :headers => headers,
+        :proxy   => proxy,
+        :body    => body
+      )
 
+      res = perform(req, opts)
       return res unless opts.follow
 
-      Redirector.new(opts.follow).perform req, res do |request|
-        perform request, opts
+      Redirector.new(opts.follow).perform(req, res) do |request|
+        perform(request, opts)
       end
     end
 
@@ -61,12 +67,12 @@ module HTTP
       end
 
       res = Response.new(
-        :status => @connection.status_code,
-        :version => @connection.http_version,
-        :headers => @connection.headers,
+        :status     => @connection.status_code,
+        :version    => @connection.http_version,
+        :headers    => @connection.headers,
         :connection => @connection,
-        :encoding => options.encoding,
-        :uri => req.uri
+        :encoding   => options.encoding,
+        :uri        => req.uri
       )
 
       @connection.finish_response if req.verb == :head

data/lib/http/request.rb

@@ -63,20 +63,24 @@ module HTTP
     attr_reader :uri
     attr_reader :proxy, :body, :version
 
-    # :nodoc:
-    def initialize(verb, uri, headers = {}, proxy = {}, body = nil, version = "1.1") # rubocop:disable ParameterLists
-      @verb   = verb.to_s.downcase.to_sym
-      @uri    = normalize_uri uri
-      @scheme = @uri.scheme && @uri.scheme.to_s.downcase.to_sym
+    # @option opts [String] :version
+    # @option opts [#to_s] :verb HTTP request method
+    # @option opts [HTTP::URI, #to_s] :uri
+    # @option opts [Hash] :headers
+    # @option opts [Hash] :proxy
+    # @option opts [String] :body
+    def initialize(opts)
+      @verb   = opts.fetch(:verb).to_s.downcase.to_sym
+      @uri    = normalize_uri(opts.fetch :uri)
+      @scheme = @uri.scheme.to_s.downcase.to_sym if @uri.scheme
 
       fail(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
       fail(UnsupportedSchemeError, "unknown scheme: #{scheme}") unless SCHEMES.include?(@scheme)
 
-      @proxy   = proxy
-      @body    = body
-      @version = version
-
-      @headers = HTTP::Headers.coerce(headers || {})
+      @proxy   = opts[:proxy] || {}
+      @body    = opts[:body]
+      @version = opts[:version] || "1.1"
+      @headers = HTTP::Headers.coerce(opts[:headers] || {})
 
       @headers[Headers::HOST]        ||= default_host_header_value
       @headers[Headers::USER_AGENT]  ||= USER_AGENT
@@ -84,7 +88,15 @@ module HTTP
 
     # Returns new Request with updated uri
     def redirect(uri, verb = @verb)
-      req = self.class.new(verb, @uri.join(uri), headers, proxy, body, version)
+      req = self.class.new(
+        :verb    => verb,
+        :uri     => @uri.join(uri),
+        :headers => headers,
+        :proxy   => proxy,
+        :body    => body,
+        :version => version
+      )
+
       req[Headers::HOST] = req.uri.host
       req
     end

data/lib/http/response.rb

@@ -34,13 +34,15 @@ module HTTP
     # @option opts [String] :uri
     def initialize(opts)
       @version  = opts.fetch(:version)
-      @uri      = opts.include?(:uri) && HTTP::URI.parse(opts.fetch(:uri))
-      @status   = HTTP::Response::Status.new opts.fetch(:status)
-      @headers  = HTTP::Headers.coerce(opts.fetch(:headers, {}))
+      @uri      = HTTP::URI.parse(opts.fetch :uri) if opts.include? :uri
+      @status   = HTTP::Response::Status.new(opts.fetch :status)
+      @headers  = HTTP::Headers.coerce(opts[:headers] || {})
 
       if opts.include?(:connection)
-        encoding = opts[:encoding] || charset || Encoding::BINARY
-        @body = Response::Body.new(opts.fetch(:connection), encoding)
+        connection = opts.fetch(:connection)
+        encoding   = opts[:encoding] || charset || Encoding::BINARY
+
+        @body = Response::Body.new(connection, encoding)
       else
         @body = opts.fetch(:body)
       end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "1.0.0.pre3".freeze
+  VERSION = "1.0.0.pre4".freeze
 end

data/spec/lib/http/client_spec.rb

@@ -27,17 +27,19 @@ RSpec.describe HTTP::Client do
 
   def redirect_response(location, status = 302)
     HTTP::Response.new(
-      :status => status,
+      :status  => status,
       :version => "1.1",
       :headers => {"Location" => location},
-      :body => "")
+      :body    => ""
+    )
   end
 
   def simple_response(body, status = 200)
     HTTP::Response.new(
-      :status => status,
+      :status  => status,
       :version => "1.1",
-      :body => body)
+      :body    => body
+    )
   end
 
   describe "following redirects" do
@@ -107,48 +109,48 @@ RSpec.describe HTTP::Client do
     before { allow(client).to receive :perform }
 
     it "accepts params within the provided URL" do
-      expect(HTTP::Request).to receive(:new) do |_, uri|
-        expect(CGI.parse uri.query).to eq("foo" => %w(bar))
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(CGI.parse opts[:uri].query).to eq("foo" => %w(bar))
       end
 
       client.get("http://example.com/?foo=bar")
     end
 
     it "combines GET params from the URI with the passed in params" do
-      expect(HTTP::Request).to receive(:new) do |_, uri|
-        expect(CGI.parse uri.query).to eq("foo" => %w(bar), "baz" => %w(quux))
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(CGI.parse opts[:uri].query).to eq("foo" => %w(bar), "baz" => %w(quux))
       end
 
       client.get("http://example.com/?foo=bar", :params => {:baz => "quux"})
     end
 
     it "merges duplicate values" do
-      expect(HTTP::Request).to receive(:new) do |_, uri|
-        expect(uri.query).to match(/^(a=1&a=2|a=2&a=1)$/)
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(opts[:uri].query).to match(/^(a=1&a=2|a=2&a=1)$/)
       end
 
       client.get("http://example.com/?a=1", :params => {:a => 2})
     end
 
     it "does not modifies query part if no params were given" do
-      expect(HTTP::Request).to receive(:new) do |_, uri|
-        expect(uri.query).to eq "deadbeef"
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(opts[:uri].query).to eq "deadbeef"
       end
 
       client.get("http://example.com/?deadbeef")
     end
 
     it "does not corrupts index-less arrays" do
-      expect(HTTP::Request).to receive(:new) do |_, uri|
-        expect(CGI.parse uri.query).to eq "a[]" => %w(b c), "d" => %w(e)
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(CGI.parse opts[:uri].query).to eq "a[]" => %w(b c), "d" => %w(e)
       end
 
       client.get("http://example.com/?a[]=b&a[]=c", :params => {:d => "e"})
     end
 
     it "properly encodes colons" do
-      expect(HTTP::Request).to receive(:new) do |_, uri|
-        expect(uri.query).to eq "t=1970-01-01T00%3A00%3A00Z"
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(opts[:uri].query).to eq "t=1970-01-01T00%3A00%3A00Z"
       end
 
       client.get("http://example.com/", :params => {:t => "1970-01-01T00:00:00Z"})
@@ -160,8 +162,8 @@ RSpec.describe HTTP::Client do
       client = HTTP::Client.new
       allow(client).to receive(:perform)
 
-      expect(HTTP::Request).to receive(:new) do |*args|
-        expect(args.last).to eq('{"foo":"bar"}')
+      expect(HTTP::Request).to receive(:new) do |opts|
+        expect(opts[:body]).to eq '{"foo":"bar"}'
       end
 
       client.get("http://example.com/", :json => {:foo => :bar})

data/spec/lib/http/redirector_spec.rb

@@ -1,10 +1,10 @@
 RSpec.describe HTTP::Redirector do
   def simple_response(status, body = "", headers = {})
     HTTP::Response.new(
-      :status => status,
+      :status  => status,
       :version => "1.1",
       :headers => headers,
-      :body => body
+      :body    => body
     )
   end
 
@@ -35,7 +35,7 @@ RSpec.describe HTTP::Redirector do
     let(:redirector) { described_class.new options }
 
     it "fails with TooManyRedirectsError if max hops reached" do
-      req = HTTP::Request.new :head, "http://example.com"
+      req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       res = proc { |prev_req| redirect_response(301, "#{prev_req.uri}/1") }
 
       expect { redirector.perform(req, res.call(req), &res) }.
@@ -43,7 +43,7 @@ RSpec.describe HTTP::Redirector do
     end
 
     it "fails with EndlessRedirectError if endless loop detected" do
-      req = HTTP::Request.new :head, "http://example.com"
+      req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       res = redirect_response(301, req.uri)
 
       expect { redirector.perform(req, res) { res } }.
@@ -51,7 +51,7 @@ RSpec.describe HTTP::Redirector do
     end
 
     it "fails with StateError if there were no Location header" do
-      req = HTTP::Request.new :head, "http://example.com"
+      req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       res = simple_response(301)
 
       expect { |b| redirector.perform(req, res, &b) }.
@@ -59,7 +59,7 @@ RSpec.describe HTTP::Redirector do
     end
 
     it "returns first non-redirect response" do
-      req  = HTTP::Request.new :head, "http://example.com"
+      req  = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       hops = [
         redirect_response(301, "http://example.com/1"),
         redirect_response(301, "http://example.com/2"),
@@ -78,7 +78,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => true} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -88,7 +88,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -96,7 +96,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -104,7 +104,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -116,7 +116,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => false} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -126,7 +126,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -136,7 +136,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -146,7 +146,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -162,7 +162,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => true} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -172,7 +172,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -180,7 +180,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -188,7 +188,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -200,7 +200,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => false} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -210,7 +210,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -220,7 +220,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -230,7 +230,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -246,7 +246,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => true} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -256,7 +256,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -264,7 +264,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -272,7 +272,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -284,7 +284,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => false} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -294,7 +294,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -304,7 +304,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -314,7 +314,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -327,7 +327,7 @@ RSpec.describe HTTP::Redirector do
 
     context "following 303 redirect" do
       it "follows with HEAD if original request was HEAD" do
-        req = HTTP::Request.new :head, "http://example.com"
+        req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
         res = redirect_response 303, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -337,7 +337,7 @@ RSpec.describe HTTP::Redirector do
       end
 
       it "follows with GET if original request was GET" do
-        req = HTTP::Request.new :get, "http://example.com"
+        req = HTTP::Request.new :verb => :get, :uri => "http://example.com"
         res = redirect_response 303, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -347,7 +347,7 @@ RSpec.describe HTTP::Redirector do
       end
 
       it "follows with GET if original request was neither GET nor HEAD" do
-        req = HTTP::Request.new :post, "http://example.com"
+        req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
         res = redirect_response 303, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -359,7 +359,7 @@ RSpec.describe HTTP::Redirector do
 
     context "following 307 redirect" do
       it "follows with original request's verb" do
-        req = HTTP::Request.new :post, "http://example.com"
+        req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
         res = redirect_response 307, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -371,7 +371,7 @@ RSpec.describe HTTP::Redirector do
 
     context "following 308 redirect" do
       it "follows with original request's verb" do
-        req = HTTP::Request.new :post, "http://example.com"
+        req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
         res = redirect_response 308, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|

data/spec/lib/http/request_spec.rb

@@ -5,14 +5,21 @@ RSpec.describe HTTP::Request do
   let(:headers)     { {:accept => "text/html"} }
   let(:request_uri) { "http://example.com/foo?bar=baz" }
 
-  subject(:request) { HTTP::Request.new(:get, request_uri, headers, proxy) }
+  subject :request do
+    HTTP::Request.new(
+      :verb     => :get,
+      :uri      => request_uri,
+      :headers  => headers,
+      :proxy    => proxy
+    )
+  end
 
   it "includes HTTP::Headers::Mixin" do
     expect(described_class).to include HTTP::Headers::Mixin
   end
 
   it "requires URI to have scheme part" do
-    expect { HTTP::Request.new(:get, "example.com/") }.to \
+    expect { HTTP::Request.new(:verb => :get, :uri => "example.com/") }.to \
       raise_error(HTTP::Request::UnsupportedSchemeError)
   end
 
@@ -63,7 +70,16 @@ RSpec.describe HTTP::Request do
     let(:headers)   { {:accept => "text/html"} }
     let(:proxy)     { {:proxy_username => "douglas", :proxy_password => "adams"} }
     let(:body)      { "The Ultimate Question" }
-    let(:request)   { HTTP::Request.new(:post, "http://example.com/", headers, proxy, body) }
+
+    let :request do
+      HTTP::Request.new(
+        :verb    => :post,
+        :uri     => "http://example.com/",
+        :headers => headers,
+        :proxy   => proxy,
+        :body    => body
+      )
+    end
 
     subject(:redirected) { request.redirect "http://blog.example.com/" }
 
@@ -105,8 +121,17 @@ RSpec.describe HTTP::Request do
       end
 
       context "with original URI having non-standard port" do
-        let(:request) { HTTP::Request.new(:post, "http://example.com:8080/", headers, proxy, body) }
-        its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
+        let :request do
+          HTTP::Request.new(
+            :verb    => :post,
+            :uri     => "http://example.com:8080/",
+            :headers => headers,
+            :proxy   => proxy,
+            :body    => body
+          )
+        end
+
+        its(:uri) { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
       end
     end
 
@@ -124,8 +149,17 @@ RSpec.describe HTTP::Request do
       end
 
       context "with original URI having non-standard port" do
-        let(:request) { HTTP::Request.new(:post, "http://example.com:8080/", headers, proxy, body) }
-        its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
+        let :request do
+          HTTP::Request.new(
+            :verb    => :post,
+            :uri     => "http://example.com:8080/",
+            :headers => headers,
+            :proxy   => proxy,
+            :body    => body
+          )
+        end
+
+        its(:uri) { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
       end
     end
 

data/spec/lib/http/response_spec.rb

@@ -5,11 +5,11 @@ RSpec.describe HTTP::Response do
 
   subject(:response) do
     HTTP::Response.new(
-      :status => 200,
+      :status  => 200,
       :version => "1.1",
       :headers => headers,
-      :body => body,
-      :uri => uri
+      :body    => body,
+      :uri     => uri
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy