http 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e198bd8fdb5940123725f1f6cd3aaa0b610f631
-  data.tar.gz: c0d829c1d9dbc36b708f0acce73fc537e82b2f66
+  metadata.gz: 3e43eef7590b892ac207ac122a1ac58e61a402ba
+  data.tar.gz: 622380eacbab0139f5c6d1420d0df6c8c190b6d3
 SHA512:
-  metadata.gz: 448f0114af4fbe70411fb4969792263b7e58111ac197f0581e93d1b48628dc4d64b81fc0b6de0f961d64995fad0e4d4d58bdedc798efb151360df1ebf13e0c64
-  data.tar.gz: 9320d337488c30d9904fa0e7fd27c1f13a90c5ddce253b43cb5c03d72fdfdaa197e19cb8b48d5a5ce0426bcd486612baa19410d3deedafc7bf369e48f8d47d10
+  metadata.gz: 4ccc0e229a0e15aa63c30d012213258a9802a04f1ec0a1dbea67d73b2647d7380b951151d7492b43b10730e6c3dd905f64bfda4621a706747e65a976a7b37cd1
+  data.tar.gz: 1e2af51ecfcb07a33f2b6d94b93bc313b9018e2799e6ccc3f3265e7e2c8fde80bf97f7ff6e8c8309d8e693a08e72ae21f15b1cdb4442adc43608daba11d947b4

data/CHANGES.md

@@ -3,6 +3,12 @@
 * _the future is unwritten_
 
 
+## 0.8.9 (2015-05-11)
+
+* Add cookies support. (@ixti)
+* Enforce stringified body encoding. See #219. (@Connorhd)
+
+
 ## 0.8.8 (2015-05-09)
 
 * Fix CONNECT header for proxies. See #217. (@Connorhd)

data/http.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "http_parser.rb", "~> 0.6.0"
   gem.add_runtime_dependency "http-form_data", "~> 1.0.1"
+  gem.add_runtime_dependency "http-cookie",    "~> 1.0"
   gem.add_runtime_dependency "addressable",    "~> 2.3"
 
   gem.add_development_dependency "bundler", "~> 1.0"

data/lib/http/chainable.rb

@@ -187,6 +187,11 @@ module HTTP
     # @see #headers
     alias_method :with_headers, :headers
 
+    # Make a request with the given cookies
+    def cookies(cookies)
+      branch default_options.with_cookies(cookies)
+    end
+
     # Accept the given MIME type(s)
     # @param type
     def accept(type)

data/lib/http/client.rb

@@ -5,6 +5,7 @@ require "uri"
 
 require "http/form_data"
 require "http/options"
+require "http/headers"
 require "http/connection"
 require "http/redirector"
 require "http/uri"
@@ -31,9 +32,9 @@ module HTTP
     def request(verb, uri, opts = {})
       opts    = @default_options.merge(opts)
       uri     = make_request_uri(uri, opts)
-      headers = opts.headers
-      proxy   = opts.proxy
+      headers = opts.headers.merge(Headers::SET_COOKIE => opts.cookies.values)
       body    = make_request_body(opts, headers)
+      proxy   = opts.proxy
 
       # Tell the server to keep the conn open
       if default_options.persistent?

data/lib/http/headers.rb

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

data/lib/http/options.rb

@@ -42,23 +42,23 @@ module HTTP
     end
 
     def initialize(options = {})
-      defaults = {:response =>         :auto,
-                  :proxy =>            {},
-                  :timeout_class =>    self.class.default_timeout_class,
-                  :timeout_options =>  {},
-                  :socket_class =>     self.class.default_socket_class,
-                  :ssl_socket_class => self.class.default_ssl_socket_class,
-                  :ssl =>              {},
-                  :cache =>            self.class.default_cache,
-                  :keep_alive_timeout  => 5,
-                  :headers =>          {}}
+      defaults = {
+        :response =>         :auto,
+        :proxy =>            {},
+        :timeout_class =>    self.class.default_timeout_class,
+        :timeout_options =>  {},
+        :socket_class =>     self.class.default_socket_class,
+        :ssl_socket_class => self.class.default_ssl_socket_class,
+        :ssl =>              {},
+        :cache =>            self.class.default_cache,
+        :keep_alive_timeout  => 5,
+        :headers =>          {},
+        :cookies =>          {}
+      }
 
       opts_w_defaults = defaults.merge(options)
       opts_w_defaults[:headers] = HTTP::Headers.coerce(opts_w_defaults[:headers])
-
-      opts_w_defaults.each do |(opt_name, opt_val)|
-        self[opt_name] = opt_val
-      end
+      opts_w_defaults.each { |(k, v)| self[k] = v }
     end
 
     def_option :headers do |headers|
@@ -145,3 +145,6 @@ module HTTP
     end
   end
 end
+
+# require cookies options
+require "http/options/cookies"

data/lib/http/options/cookies.rb

@@ -0,0 +1,20 @@
+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

data/lib/http/response.rb

@@ -5,6 +5,8 @@ require "http/content_type"
 require "http/mime_type"
 require "http/response/caching"
 require "http/response/status"
+require "http/uri"
+require "http/cookie_jar"
 require "time"
 
 module HTTP
@@ -32,7 +34,7 @@ module HTTP
     def initialize(status, version, headers, body, uri = nil) # rubocop:disable ParameterLists
       @version = version
       @body    = body
-      @uri     = uri
+      @uri     = uri && HTTP::URI.parse(uri)
       @status  = HTTP::Response::Status.new status
       @headers = HTTP::Headers.coerce(headers || {})
     end
@@ -93,6 +95,12 @@ module HTTP
       @charset ||= content_type.charset
     end
 
+    def cookies
+      @cookies ||= headers.each_with_object CookieJar.new do |(k, v), jar|
+        jar.parse(v, uri) if k == Headers::SET_COOKIE
+      end
+    end
+
     # Parse response body with corresponding MIME type adapter.
     #
     # @param [#to_s] as Parse as given MIME type

data/lib/http/response/body.rb

@@ -36,9 +36,9 @@ module HTTP
 
         begin
           @streaming = false
-          @contents = ""
+          @contents = "".force_encoding(Encoding::UTF_8)
           while (chunk = @client.readpartial)
-            @contents << chunk
+            @contents << chunk.force_encoding(Encoding::ASCII_8BIT)
           end
         rescue
           @contents = nil

data/lib/http/version.rb

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

data/spec/lib/http/options/merge_spec.rb

@@ -55,6 +55,7 @@ RSpec.describe HTTP::Options, "merge" do
       :socket_class     => described_class.default_socket_class,
       :ssl_socket_class => described_class.default_ssl_socket_class,
       :ssl_context      => nil,
-      :cache      => described_class.default_cache)
+      :cache      => described_class.default_cache,
+      :cookies    => {})
   end
 end

data/spec/lib/http/response_spec.rb

@@ -1,6 +1,8 @@
 RSpec.describe HTTP::Response do
   let(:body)          { "Hello world!" }
-  subject(:response)  { HTTP::Response.new 200, "1.1", {}, body }
+  let(:uri)           { "http://example.com/" }
+  let(:headers)       { {} }
+  subject(:response)  { HTTP::Response.new 200, "1.1", headers, body, uri }
 
   it "includes HTTP::Headers::Mixin" do
     expect(described_class).to include HTTP::Headers::Mixin
@@ -9,15 +11,15 @@ RSpec.describe HTTP::Response do
   describe "to_a" do
     let(:body)         { "Hello world" }
     let(:content_type) { "text/plain" }
-    subject { HTTP::Response.new(200, "1.1", {"Content-Type" => content_type}, body) }
+    let(:headers)      { {"Content-Type" => content_type} }
 
     it "returns a Rack-like array" do
-      expect(subject.to_a).to eq([200, {"Content-Type" => content_type}, body])
+      expect(subject.to_a).to eq([200, headers, body])
     end
   end
 
   describe "mime_type" do
-    subject { HTTP::Response.new(200, "1.1", headers, "").mime_type }
+    subject { response.mime_type }
 
     context "without Content-Type header" do
       let(:headers) { {} }
@@ -36,7 +38,7 @@ RSpec.describe HTTP::Response do
   end
 
   describe "charset" do
-    subject { HTTP::Response.new(200, "1.1", headers, "").charset }
+    subject { response.charset }
 
     context "without Content-Type header" do
       let(:headers) { {} }
@@ -57,7 +59,6 @@ RSpec.describe HTTP::Response do
   describe "#parse" do
     let(:headers)   { {"Content-Type" => content_type} }
     let(:body)      { '{"foo":"bar"}' }
-    let(:response)  { HTTP::Response.new 200, "1.1", headers, body }
 
     context "with known content type" do
       let(:content_type) { "application/json" }
@@ -86,8 +87,7 @@ RSpec.describe HTTP::Response do
   end
 
   describe "#flush" do
-    let(:body)      { double :to_s => "" }
-    let(:response)  { HTTP::Response.new 200, "1.1", {}, body }
+    let(:body) { double :to_s => "" }
 
     it "returns response self-reference" do
       expect(response.flush).to be response
@@ -100,11 +100,10 @@ RSpec.describe HTTP::Response do
   end
 
   describe "#inspect" do
-    it "returns human0friendly response representation" do
-      headers   = {:content_type => "text/plain"}
-      body      = double :to_s => "foobar"
-      response  = HTTP::Response.new(200, "1.1", headers, body)
+    let(:headers) { {:content_type => "text/plain"} }
+    let(:body)    { double :to_s => "foobar" }
 
+    it "returns human-friendly response representation" do
       expect(response.inspect).
         to eq '#<HTTP::Response/1.1 200 OK {"Content-Type"=>"text/plain"}>'
     end
@@ -114,4 +113,25 @@ RSpec.describe HTTP::Response do
     subject { response.caching }
     it { is_expected.to be_a HTTP::Response::Caching }
   end
+
+  describe "#cookies" do
+    let(:cookies) { ["a=1", "b=2; domain=example.com", "c=3; domain=bad.org"] }
+    let(:headers) { {"Set-Cookie" => cookies} }
+
+    subject(:jar) { response.cookies }
+
+    it { is_expected.to be_an HTTP::CookieJar }
+
+    it "contains cookies without domain restriction" do
+      expect(jar.count { |c| "a" == c.name }).to eq 1
+    end
+
+    it "contains cookies limited to domain of request uri" do
+      expect(jar.count { |c| "b" == c.name }).to eq 1
+    end
+
+    it "does not contains cookies limited to non-requeted uri" do
+      expect(jar.count { |c| "c" == c.name }).to eq 0
+    end
+  end
 end

data/spec/lib/http_spec.rb

@@ -131,6 +131,20 @@ RSpec.describe HTTP do
     end
   end
 
+  context "loading binary data" do
+    it "is encoded as bytes" do
+      response = HTTP.get "#{dummy.endpoint}/bytes"
+      expect(response.to_s.encoding).to eq(Encoding::ASCII_8BIT)
+    end
+  end
+
+  context "loading text" do
+    it "is utf-8 encoded" do
+      response = HTTP.get dummy.endpoint
+      expect(response.to_s.encoding).to eq(Encoding::UTF_8)
+    end
+  end
+
   context "posting with an explicit body" do
     it "is easy" do
       response = HTTP.post "#{dummy.endpoint}/body", :body => "testing-body"

data/spec/support/dummy_server/servlet.rb

@@ -122,5 +122,11 @@ class DummyServer < WEBrick::HTTPServer
       res.status          = 200
       res["Content-Type"] = "text/html"
     end
+
+    get "/bytes" do |_req, res|
+      bytes = [80, 75, 3, 4, 20, 0, 0, 0, 8, 0, 123, 104, 169, 70, 99, 243, 243]
+      res["Content-Type"] = "application/octet-stream"
+      res.body = bytes.pack("c*")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -41,6 +41,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +121,7 @@ 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