http 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd857e2ad6dc7552b81641ec83c3a60e99087fae
-  data.tar.gz: b31ec2d4637bc449f29ff01f6df6568672c04cd4
+  metadata.gz: 4daefc1ab609a814049d1dbb15c8b4dd1dcbc4af
+  data.tar.gz: 8e997cb150a1b40c3f93713a8c0a8e0c3c347e37
 SHA512:
-  metadata.gz: 6efddbaf1df00256de1e58fc512357165e343a421a7d67f5b7d0103f241ea0eb77d9a19c33377624d954b68f5b7d016e0d15ffbb5eab0c8acb49d827b3f7f7b4
-  data.tar.gz: 2a0dec9c76defd8f85d57da8eb4ef46251519bd49be93c57955995e6e91a1b55122ad3d86cd96ba4130e3380871be8e6c329bc0503a5fbf021c8bbca9bee7b03
+  metadata.gz: 14aa2d7853ca5d3b0c4a60f3d85ea79ce29f942cae40d60c83cfa9de10845806b521cece91aabff8954f2bfd33ccd78577f39676133d5dee45f7055b0083e599
+  data.tar.gz: 9473c747c14dc40eb7ee6a9822bf45b674a8892c8cc92db6cfa9d88fa9bc3d6f03429e72609d6e902fdaed836c38e80fc6ba0d5d58c53a2a688a98fb365deaf1

data/CHANGES.md

@@ -1,3 +1,15 @@
+## 2.0.3 (2016-08-03)
+
+* [#365](https://github.com/httprb/http/issues/365)
+  Add `HTTP::Response#content_length`
+  ([@janko-m])
+
+* [#335](https://github.com/httprb/http/issues/335),
+  [#360](https://github.com/httprb/http/pull/360)
+  Set `Content-Length: 0` header for `nil` bodies.
+  ([@britishtea])
+
+
 ## 2.0.2 (2016-06-24)
 
 * [#353](https://github.com/httprb/http/pull/353)
@@ -537,3 +549,5 @@ end
 [@mwitek]: https://github.com/mwitek
 [@tonyta]: https://github.com/tonyta
 [@jhbabon]: https://github.com/jhbabon
+[@britishtea]: https://github.com/britishtea
+[@janko-m]: https://github.com/janko-m

data/CONTRIBUTING.md

@@ -23,3 +23,4 @@ In any case, specify following info in description of your issue:
 - What actually happened
 - The exception backtrace(s), if any
 - Version of gem or commit ref you are using
+- Version of ruby you are using

data/Gemfile

@@ -23,6 +23,7 @@ group :test do
   gem "rspec-its"
   gem "yardstick"
   gem "certificate_authority", :require => false
+  gem "activemodel", "~> 4", :require => false # Used by certificate_authority
 end
 
 group :doc do

data/lib/http/request/writer.rb

@@ -53,6 +53,8 @@ module HTTP
       def add_body_type_headers
         if @body.is_a?(String) && !@headers[Headers::CONTENT_LENGTH]
           @request_header << "#{Headers::CONTENT_LENGTH}: #{@body.bytesize}"
+        elsif @body.nil? && !@headers[Headers::CONTENT_LENGTH]
+          @request_header << "#{Headers::CONTENT_LENGTH}: 0"
         elsif @body.is_a?(Enumerable) && CHUNKED != @headers[Headers::TRANSFER_ENCODING]
           raise(RequestError, "invalid transfer encoding")
         end

data/lib/http/response.rb

@@ -86,6 +86,22 @@ module HTTP
       self
     end
 
+    # Value of the Content-Length header.
+    #
+    # @return [nil] if Content-Length was not given, or it's value was invalid
+    #   (not an integer, e.g. empty string or string with non-digits).
+    # @return [Integer] otherwise
+    def content_length
+      value = @headers[Headers::CONTENT_LENGTH]
+      return unless value
+
+      begin
+        Integer(value)
+      rescue ArgumentError
+        nil
+      end
+    end
+
     # Parsed Content-Type header
     #
     # @return [HTTP::ContentType]
@@ -113,7 +129,7 @@ module HTTP
     #
     # @param [#to_s] as Parse as given MIME type
     #   instead of the one determined from headers
-    # @raise [Error] if adapter not found
+    # @raise [HTTP::Error] if adapter not found
     # @return [Object]
     def parse(as = nil)
       MimeType[as || mime_type].decode to_s

data/lib/http/uri.rb

@@ -26,7 +26,7 @@ module HTTP
 
     # Parse the given URI string, returning an HTTP::URI object
     #
-    # @param [HTTP::URI, String, #to_str] :uri to parse
+    # @param [HTTP::URI, String, #to_str] uri to parse
     #
     # @return [HTTP::URI] new URI instance
     def self.parse(uri)
@@ -37,8 +37,8 @@ module HTTP
 
     # Encodes key/value pairs as application/x-www-form-urlencoded
     #
-    # @param [#to_hash, #to_ary] :form_values to encode
-    # @param [TrueClass, FalseClass] :sort should key/value pairs be sorted first?
+    # @param [#to_hash, #to_ary] form_values to encode
+    # @param [TrueClass, FalseClass] sort should key/value pairs be sorted first?
     #
     # @return [String] encoded value
     def self.form_encode(form_values, sort = false)
@@ -47,14 +47,16 @@ module HTTP
 
     # Creates an HTTP::URI instance from the given options
     #
-    # @option [String, #to_str] :scheme URI scheme
-    # @option [String, #to_str] :user for basic authentication
-    # @option [String, #to_str] :password for basic authentication
-    # @option [String, #to_str] :host name component
-    # @option [String, #to_str] :port network port to connect to
-    # @option [String, #to_str] :path component to request
-    # @option [String, #to_str] :query component distinct from path
-    # @option [String, #to_str] :fragment component at the end of the URI
+    # @param [Hash, Addressable::URI] options_or_uri
+    #
+    # @option options_or_uri [String, #to_str] :scheme URI scheme
+    # @option options_or_uri [String, #to_str] :user for basic authentication
+    # @option options_or_uri [String, #to_str] :password for basic authentication
+    # @option options_or_uri [String, #to_str] :host name component
+    # @option options_or_uri [String, #to_str] :port network port to connect to
+    # @option options_or_uri [String, #to_str] :path component to request
+    # @option options_or_uri [String, #to_str] :query component distinct from path
+    # @option options_or_uri [String, #to_str] :fragment component at the end of the URI
     #
     # @return [HTTP::URI] new URI instance
     def initialize(options_or_uri = {})
@@ -63,13 +65,14 @@ module HTTP
         @uri = Addressable::URI.new(options_or_uri)
       when Addressable::URI
         @uri = options_or_uri
-      else raise TypeError, "expected Hash for options, got #{options_or_uri.class}"
+      else
+        raise TypeError, "expected Hash for options, got #{options_or_uri.class}"
       end
     end
 
     # Are these URI objects equal? Normalizes both URIs prior to comparison
     #
-    # @param [Object] :other URI to compare this one with
+    # @param [Object] other URI to compare this one with
     #
     # @return [TrueClass, FalseClass] are the URIs equivalent (after normalization)?
     def ==(other)
@@ -78,7 +81,7 @@ module HTTP
 
     # Are these URI objects equal? Does NOT normalizes both URIs prior to comparison
     #
-    # @param [Object] :other URI to compare this one with
+    # @param [Object] other URI to compare this one with
     #
     # @return [TrueClass, FalseClass] are the URIs equivalent?
     def eql?(other)

data/lib/http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP
-  VERSION = "2.0.2".freeze
+  VERSION = "2.0.3".freeze
 end

data/spec/lib/http/request/writer_spec.rb

@@ -69,6 +69,24 @@ RSpec.describe HTTP::Request::Writer do
       end
     end
 
+    context "when body is nil" do
+      let(:body) { nil }
+
+      it "properly sets Content-Length header if needed" do
+        writer.stream
+        expect(io.string).to start_with "#{headerstart}\r\nContent-Length: 0\r\n\r\n"
+      end
+
+      context "when Content-Length explicitly set" do
+        let(:headers) { HTTP::Headers.coerce "Content-Length" => 12 }
+
+        it "keeps given value" do
+          writer.stream
+          expect(io.string).to start_with "#{headerstart}\r\nContent-Length: 12\r\n\r\n"
+        end
+      end
+    end
+
     context "when body is a unicode String" do
       let(:body) { "Привет, мир!" }
 

data/spec/lib/http/response_spec.rb

@@ -28,6 +28,24 @@ RSpec.describe HTTP::Response do
     end
   end
 
+  describe "#content_length" do
+    subject { response.content_length }
+
+    context "without Content-Length header" do
+      it { is_expected.to be_nil }
+    end
+
+    context "with Content-Length: 5" do
+      let(:headers) { {"Content-Length" => "5"} }
+      it { is_expected.to eq 5 }
+    end
+
+    context "with invalid Content-Length" do
+      let(:headers) { {"Content-Length" => "foo"} }
+      it { is_expected.to be_nil }
+    end
+  end
+
   describe "mime_type" do
     subject { response.mime_type }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb