http 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6175e5c7921354af3518483759cfa8f17066be03
-  data.tar.gz: 6b58746ee974aaa0c3b05504ef315d20da2ed742
+  metadata.gz: 6855d98f9ce4716fb04fda587060dfcc2869b378
+  data.tar.gz: cc3dd5823219d9c1043d59a4ecd28783f3a54314
 SHA512:
-  metadata.gz: 4a2ee6cd6011bc1cf78c0cdcd4b6a6361485fd2236f384f7ad5db2de9925deee7e4a817d4e2bca57140fb45d22fd7eb5e3fb0cfa0022e89345eaaa62408ced56
-  data.tar.gz: 1f1c28bc91ec48cbd95df209ee6e205c0a08fbc245e409644d18bac9f7630fcad7fbbfefdc364778aaf437e8a3c081758de312019e003db6c2655f600efdd62d
+  metadata.gz: ac67b4ffeddb6b1fc1f53c8c9ccc75cae95dfa2fe834f7c9ef4f997734b846a4f380fdc61c8216239e95fa666b774f1083653193357006a31b7c83404747484b
+  data.tar.gz: 5a41152c4bf84a18db3b9bfe93dca7cb94d68176d0c02038efc21c8955915ebbf11a36535c867e762ddb09c7385ea9b235ac37d9fe2b605ce0ea6a20bb8495dc

data/.rubocop.yml

@@ -57,6 +57,15 @@ Style/Lambda:
 Style/SingleSpaceBeforeFirstArg:
   Enabled: false
 
+Style/SpaceAroundOperators:
+  MultiSpaceAllowedForOperators:
+    - "="
+    - "=>"
+    - "||"
+    - "||="
+    - "&&"
+    - "&&="
+
 Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.8.3 (2015-04-07)
+
+* Fix request headline. See #206. (@ixti)
+* Remove deprecated `Request#__method__`. (@ixti)
+
+
 ## 0.8.2 (2015-04-06)
 
 * Fix Celluloid::IO compatibility. See #203. (@ixti)

data/lib/http/client.rb

@@ -104,8 +104,8 @@ module HTTP
 
     # Verify our request isn't going to be made against another URI
     def verify_connection!(uri)
-      if default_options.persistent? && base_host(uri) != default_options.persistent
-        fail StateError, "Persistence is enabled for #{default_options.persistent}, but we got #{base_host(uri)}"
+      if default_options.persistent? && uri.origin != default_options.persistent
+        fail StateError, "Persistence is enabled for #{default_options.persistent}, but we got #{uri.origin}"
       # We re-create the connection object because we want to let prior requests
       # lazily load the body as long as possible, and this mimics prior functionality.
       elsif @connection && (!@connection.keep_alive? || @connection.expired?)
@@ -117,11 +117,6 @@ module HTTP
       end
     end
 
-    # Strips out query/path to give us a consistent way of comparing hosts
-    def base_host(uri)
-      uri.omit(:query, :path).to_s
-    end
-
     # Merges query params if needed
     #
     # @param [#to_s] uri

data/lib/http/options.rb

@@ -2,6 +2,7 @@ require "http/headers"
 require "openssl"
 require "socket"
 require "http/cache/null_cache"
+require "http/uri"
 
 module HTTP
   class Options
@@ -81,6 +82,14 @@ module HTTP
                 end
     end
 
+    def persistent=(value)
+      @persistent = value ? HTTP::URI.parse(value).origin : nil
+    end
+
+    def persistent?
+      !persistent.nil?
+    end
+
     def_option :cache do |cache_or_cache_options|
       if cache_or_cache_options.respond_to? :perform
         cache_or_cache_options
@@ -90,10 +99,6 @@ module HTTP
       end
     end
 
-    def persistent?
-      !persistent.nil? && persistent != ""
-    end
-
     def [](option)
       send(option) rescue nil
     end

data/lib/http/request.rb

@@ -59,13 +59,6 @@ module HTTP
     # Scheme is normalized to be a lowercase symbol e.g. :http, :https
     attr_reader :scheme
 
-    # The following alias may be removed in two minor versions (0.8.0) or one
-    # major version (1.0.0)
-    def __method__(*args)
-      warn "#{Kernel.caller.first}: [DEPRECATION] HTTP::Request#__method__ is deprecated. Use #method instead."
-      method(*args)
-    end
-
     # "Request URI" as per RFC 2616
     # http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html
     attr_reader :uri
@@ -74,7 +67,7 @@ module HTTP
     # :nodoc:
     def initialize(verb, uri, headers = {}, proxy = {}, body = nil, version = "1.1") # rubocop:disable ParameterLists
       @verb   = verb.to_s.downcase.to_sym
-      @uri    = HTTP::URI.parse uri
+      @uri    = HTTP::URI.parse(uri).normalize
       @scheme = @uri.scheme && @uri.scheme.to_s.downcase.to_sym
 
       fail(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
@@ -119,7 +112,8 @@ module HTTP
 
     # Compute HTTP request header for direct or proxy request
     def request_header
-      "#{verb.to_s.upcase} #{uri.normalize} HTTP/#{version}"
+      request_uri = using_proxy? ? uri : uri.omit(:scheme, :authority)
+      "#{verb.to_s.upcase} #{request_uri} HTTP/#{version}"
     end
 
     # Host for tcp socket

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/lib/http/request_spec.rb

@@ -1,8 +1,9 @@
 RSpec.describe HTTP::Request do
+  let(:proxy)       { {} }
   let(:headers)     { {:accept => "text/html"} }
-  let(:request_uri) { "http://example.com/" }
+  let(:request_uri) { "http://example.com/foo?bar=baz#moo" }
 
-  subject(:request) { HTTP::Request.new(:get, request_uri, headers) }
+  subject(:request) { HTTP::Request.new(:get, request_uri, headers, proxy) }
 
   it "includes HTTP::Headers::Mixin" do
     expect(described_class).to include HTTP::Headers::Mixin
@@ -21,13 +22,6 @@ RSpec.describe HTTP::Request do
     expect(subject.verb).to eq(:get)
   end
 
-  it "provides a #__method__ method that outputs a deprecation warning and delegates to Object#method" do
-    warning = capture_warning do
-      expect(subject.__method__(:verb)).to eq(subject.method(:verb))
-    end
-    expect(warning).to match(/\[DEPRECATION\] HTTP::Request#__method__ is deprecated\. Use #method instead\.$/)
-  end
-
   it "sets given headers" do
     expect(subject["Accept"]).to eq("text/html")
   end
@@ -143,4 +137,15 @@ RSpec.describe HTTP::Request do
     subject { request.caching }
     it { is_expected.to be_a HTTP::Request::Caching }
   end
+
+  describe "#request_header" do
+    subject { request.request_header }
+
+    it { is_expected.to eq "GET /foo?bar=baz#moo HTTP/1.1" }
+
+    context "with proxy" do
+      let(:proxy) { {:user => "user", :pass => "pass"} }
+      it { is_expected.to eq "GET http://example.com/foo?bar=baz#moo HTTP/1.1" }
+    end
+  end
 end

data/spec/lib/http_spec.rb

@@ -152,7 +152,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])
-        .to match(/^Basic [A-Za-z0-9+\/]+=*$/)
+        .to match(%r{^Basic [A-Za-z0-9+/]+=*$})
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb