http 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e43eef7590b892ac207ac122a1ac58e61a402ba
-  data.tar.gz: 622380eacbab0139f5c6d1420d0df6c8c190b6d3
+  metadata.gz: fca22402af79f980dc7e1b701e4d422daaf7fea8
+  data.tar.gz: 329410d55bbbedbb774496ed0c8f8c177c9d2f12
 SHA512:
-  metadata.gz: 4ccc0e229a0e15aa63c30d012213258a9802a04f1ec0a1dbea67d73b2647d7380b951151d7492b43b10730e6c3dd905f64bfda4621a706747e65a976a7b37cd1
-  data.tar.gz: 1e2af51ecfcb07a33f2b6d94b93bc313b9018e2799e6ccc3f3265e7e2c8fde80bf97f7ff6e8c8309d8e693a08e72ae21f15b1cdb4442adc43608daba11d947b4
+  metadata.gz: 769d422631b9551000a9e647736eeafdbf511f3bd5ed40e9efac847e5be69a72f77ef7cc87b6c83811599437f7ae6a1b39349730e6096a314abe433b146b744d
+  data.tar.gz: faefd914628653751aa3168442a0ade2032b809add4a2e9594c5494bb05160a5edf69f5b559668f5ea4077e0f6a74b3d33ca6669eab1c15e6069279773dee271

data/CHANGES.md

@@ -1,6 +1,6 @@
-## master (unreleased)
+## 0.8.10 (2015-05-14)
 
-* _the future is unwritten_
+* Fix cookie headers generation. (@ixti)
 
 
 ## 0.8.9 (2015-05-11)

data/lib/http/client.rb

@@ -32,7 +32,7 @@ module HTTP
     def request(verb, uri, opts = {})
       opts    = @default_options.merge(opts)
       uri     = make_request_uri(uri, opts)
-      headers = opts.headers.merge(Headers::SET_COOKIE => opts.cookies.values)
+      headers = make_request_headers(opts)
       body    = make_request_body(opts, headers)
       proxy   = opts.proxy
 
@@ -145,6 +145,15 @@ module HTTP
       uri
     end
 
+    # Creates request headers with cookies (if any) merged in
+    def make_request_headers(opts)
+      cookies = opts.cookies.values
+      return opts.headers if cookies.empty?
+
+      cookies = opts.headers.get(Headers::COOKIE).concat(cookies).join("; ")
+      opts.headers.merge(Headers::COOKIE => cookies)
+    end
+
     # Create the request body object to send
     def make_request_body(opts, headers)
       case

data/lib/http/headers.rb

@@ -16,9 +16,12 @@ module HTTP
     # @see http://tools.ietf.org/html/rfc7230#section-3.2
     HEADER_NAME_RE = /^[A-Za-z0-9!#\$%&'*+\-.^_`|~]+$/
 
-    # Cookies header name
+    # Set-Cookie (response) header name
     SET_COOKIE = "Set-Cookie".freeze
 
+    # Cookie (request) header name
+    COOKIE = "Cookie".freeze
+
     # Class constructor.
     def initialize
       @pile = []

data/lib/http/options.rb

@@ -65,6 +65,13 @@ module HTTP
       self.headers.merge(headers)
     end
 
+    def_option :cookies do |cookies|
+      cookies.each_with_object self.cookies.dup do |(k, v), jar|
+        cookie = k.is_a?(Cookie) ? k : Cookie.new(k.to_s, v.to_s)
+        jar[cookie.name] = cookie.cookie_value
+      end
+    end
+
     %w(
       proxy params form json body follow response
       socket_class ssl_socket_class ssl_context ssl
@@ -145,6 +152,3 @@ module HTTP
     end
   end
 end
-
-# require cookies options
-require "http/options/cookies"

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/spec/lib/http_spec.rb

@@ -292,4 +292,32 @@ RSpec.describe HTTP do
         to raise_error(ArgumentError, /foobar/)
     end
   end
+
+  describe ".cookies" do
+    let(:endpoint) { "#{dummy.endpoint}/cookies" }
+
+    it "passes correct `Cookie` header" do
+      expect(HTTP.cookies(:abc => :def).get(endpoint).to_s).
+        to eq "abc: def"
+    end
+
+    it "properly works with cookie jars from response" do
+      res = HTTP.get(endpoint).flush
+
+      expect(HTTP.cookies(res.cookies).get(endpoint).to_s).
+        to eq "foo: bar"
+    end
+
+    it "properly merges cookies" do
+      res     = HTTP.get(endpoint).flush
+      client  = HTTP.cookies(:foo => 123, :bar => 321).cookies(res.cookies)
+
+      expect(client.get(endpoint).to_s).to eq "foo: bar\nbar: 321"
+    end
+
+    it "properly merges Cookie headers and cookies" do
+      client = HTTP.headers("Cookie" => "foo=bar").cookies(:baz => :moo)
+      expect(client.get(endpoint).to_s).to eq "foo: bar\nbaz: moo"
+    end
+  end
 end

data/spec/support/dummy_server/servlet.rb

@@ -128,5 +128,10 @@ class DummyServer < WEBrick::HTTPServer
       res["Content-Type"] = "application/octet-stream"
       res.body = bytes.pack("c*")
     end
+
+    get "/cookies" do |req, res|
+      res["Set-Cookie"] = "foo=bar"
+      res.body = req.cookies.map { |c| [c.name, c.value].join ": " }.join("\n")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -121,7 +121,6 @@ files:
 - lib/http/mime_type/adapter.rb
 - lib/http/mime_type/json.rb
 - lib/http/options.rb
-- lib/http/options/cookies.rb
 - lib/http/redirector.rb
 - lib/http/request.rb
 - lib/http/request/caching.rb

data/lib/http/options/cookies.rb

@@ -1,20 +0,0 @@
-module HTTP
-  class Options
-    # Default path of cookies
-    DEFAULT_COOKIE_PATH = "/".freeze
-
-    def_option :cookies do |cookies|
-      cookies.each_with_object self.cookies.dup do |(k, v), jar|
-        cookie = case
-                 when k.is_a?(Cookie) then k
-                 when k.is_a?(Hash)   then Cookie.new k
-                 when v.is_a?(Hash)   then Cookie.new(k.to_s, v)
-                 else                      Cookie.new(k.to_s, v.to_s)
-                 end
-
-        cookie.path ||= DEFAULT_COOKIE_PATH
-        jar[cookie.name] = cookie.set_cookie_value
-      end
-    end
-  end
-end