http 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c81e2f4f9a7626fd58b225bf69772a47bf361c6
-  data.tar.gz: 31f9bb1e4ceb3494898604e1724de240b8237e43
+  metadata.gz: b8b8b0bfe4eb9e5d2e91ca1bedb6a5af057481f0
+  data.tar.gz: 056c7f5f2e4ad84615a2e717e01ad332f4b63a21
 SHA512:
-  metadata.gz: 637b115774a74b54c7dcede1ab6c4fde01638f329c51dedc83b8ad2cb1129983a888b2aef2442e00a8f68bc36dba614710ec645c009ba3bb47551a8630069add
-  data.tar.gz: b9b86db8e595bc6bb09862bc9e2f8e529e8e2e2b0c0599214ea24f816e8a30cf948bc5f405d143501cdce5475cf1e2971cf376e46b50dc95a3943adebf00f207
+  metadata.gz: 8c947f2225570316f16e42ffe86ec1a609b4e252c9267f2baa09c245437aa312978ce8be229d7048e3feeab9487ccec6c92e19b531f23a6d28afb393db798f81
+  data.tar.gz: a0dcc0530802bb055b30380fcc709a850d126e3ccd29ad91eb1fffddae56ae0319e2e69157e8e888c9cddc9c8d788b771a20bf75463a48231b119a42cfc026ff

data/CHANGES.md

@@ -1,5 +1,15 @@
-0.6.0
------
+0.6.1 (2014-05-07)
+------------------
+
+* Fix request `Content-Length` calculation for Unicode (@challengeechallengee)
+* Add `Response#flush` (@ixti)
+* Fix `Response::Body#readpartial` default size (@hannesg, @ixti)
+* Add missing `CRLF` for chunked bodies (@hannesg)
+* Fix forgotten CGI require (@ixti)
+* Improve README (@tarcieri)
+
+0.6.0 (2014-04-04)
+------------------
 
 * Rename `HTTP::Request#method` to `HTTP::Request#verb` (@krainboltgreene)
 * Add `HTTP::ResponseBody` class (@tarcieri)

data/README.md

@@ -23,6 +23,20 @@ extension based on the Node.js parser and a Java port thereof.
 [requests]: http://docs.python-requests.org/en/latest/
 [http_parser.rb]: https://github.com/tmm1/http_parser.rb
 
+Help and Discussion
+-------------------
+
+If you need help or just want to talk about the Ruby HTTP Gem, [visit our Google
+Group][googlegroup], or join by email by sending a message to:
+[ruby-http-gem+subscribe@googlegroups.com][subscribe].
+
+[googlegroup]: https://groups.google.com/forum/#!forum/ruby-http-gem
+[subscribe]:   mailto:ruby-http-gem+subscribe@googlegroups.com
+
+If you believe you've found a bug, please report it at:
+
+https://github.com/tarcieri/http/issues
+
 Installation
 ------------
 
@@ -50,18 +64,6 @@ Documentation
 [Please see the HTTP Gem Wiki](https://github.com/tarcieri/http/wiki)
 for more detailed documentation and usage notes.
 
-Support
--------
-
-For help with The HTTP Gem, either open a [Github Issue] or discuss it
-on the Celluloid mailing list:
-
-http://groups.google.com/group/celluloid-ruby
-
-You can also find us on IRC at #celluloid on freenode
-
-[Github Issue]: https://github.com/tarcieri/http/issues
-
 Basic Usage
 -----------
 

data/lib/http/client.rb

@@ -1,6 +1,7 @@
+require 'cgi'
+require 'uri'
 require 'http/options'
 require 'http/redirector'
-require 'uri'
 
 module HTTP
   # Clients make requests and receive responses

data/lib/http/mime_type.rb

@@ -31,7 +31,7 @@ module HTTP
       #
       # @param [#to_s] type
       # @raise [Error] if no adapter found
-      # @return [void]
+      # @return [Class]
       def [](type)
         adapters[normalize type] || fail(Error, "Unknown MIME type: #{type}")
       end

data/lib/http/request/writer.rb

@@ -35,7 +35,7 @@ module HTTP
       # with
       def add_body_type_headers
         if @body.is_a?(String) && !@headers['Content-Length']
-          @request_header << "Content-Length: #{@body.length}"
+          @request_header << "Content-Length: #{@body.bytesize}"
         elsif @body.is_a?(Enumerable)
           encoding = @headers['Transfer-Encoding']
           if encoding == 'chunked'
@@ -68,7 +68,7 @@ module HTTP
         elsif @body.is_a?(Enumerable)
           @body.each do |chunk|
             @socket << chunk.bytesize.to_s(16) << CRLF
-            @socket << chunk
+            @socket << chunk << CRLF
           end
 
           @socket << '0' << CRLF * 2

data/lib/http/response.rb

@@ -95,6 +95,12 @@ module HTTP
     end
     alias_method :to_str, :to_s
 
+    # Flushes body and returns self-reference
+    def flush
+      body.to_s
+      self
+    end
+
     # Parsed Content-Type header
     # @return [HTTP::ContentType]
     def content_type

data/lib/http/response/body.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'http/client'
 
 module HTTP
   class Response
@@ -15,9 +16,10 @@ module HTTP
       end
 
       # Read up to length bytes, but return any data that's available
-      def readpartial(length = nil)
+      # @see HTTP::Client#readpartial
+      def readpartial(*args)
         stream!
-        @client.readpartial(length)
+        @client.readpartial(*args)
       end
 
       # Iterate over the body, allowing it to be enumerable

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/spec/http/client_spec.rb

@@ -91,7 +91,7 @@ describe HTTP::Client do
 
     it 'merges duplicate values' do
       expect(HTTP::Request).to receive(:new) do |_, uri|
-        expect(CGI.parse uri.query).to eq('a' => %w[1 2])
+        expect(uri.query).to match(/^(a=1&a=2|a=2&a=1)$/)
       end
 
       client.get('http://example.com/?a=1', :params => {:a => 2})

data/spec/http/request/writer_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe HTTP::Request::Writer do
@@ -21,5 +23,21 @@ describe HTTP::Request::Writer do
     it "does throw on a body that isn't string, enumerable or nil" do
       expect { construct true }.to raise_error
     end
+
+    it 'writes a chunked request from an Enumerable correctly' do
+      io = StringIO.new
+      writer = HTTP::Request::Writer.new(io, %w[bees cows], [], '')
+      writer.send_request_body
+      io.rewind
+      expect(io.string).to eq "4\r\nbees\r\n4\r\ncows\r\n0\r\n\r\n"
+    end
+  end
+
+  describe '#add_body_type_headers' do
+    it 'properly calculates length of unicode string' do
+      writer = HTTP::Request::Writer.new(nil, 'Привет, мир!', {}, '')
+      writer.add_body_type_headers
+      expect(writer.join_headers).to match(/\r\nContent-Length: 21\r\n/)
+    end
   end
 end

data/spec/http/response/body_spec.rb

@@ -1,24 +1,42 @@
 require 'spec_helper'
 
 describe HTTP::Response::Body do
-  let(:body)     { 'Hello, world!' }
-  let(:response) { double(:response) }
+  let(:client)   { double }
+  let(:chunks)   { ['Hello, ', 'World!'] }
 
-  subject { described_class.new(response) }
+  before         { allow(client).to receive(:readpartial) { chunks.shift } }
 
-  before do
-    response.should_receive(:readpartial).and_return(body)
-    response.should_receive(:readpartial).and_return(nil)
-  end
+  subject(:body) { described_class.new client }
 
   it 'streams bodies from responses' do
-    expect(subject.to_s).to eq body
+    expect(subject.to_s).to eq 'Hello, World!'
   end
 
   context 'when body empty' do
-    let(:body) { '' }
+    let(:chunks) { [''] }
+
     it 'returns responds to empty? with true' do
       expect(subject).to be_empty
     end
   end
+
+  describe '#readpartial' do
+    context 'with size given' do
+      it 'passes value to underlying client' do
+        expect(client).to receive(:readpartial).with(42)
+        body.readpartial 42
+      end
+    end
+
+    context 'without size given' do
+      it 'does not blows up' do
+        expect { body.readpartial }.to_not raise_error
+      end
+
+      it 'calls underlying client readpartial without specific size' do
+        expect(client).to receive(:readpartial).with no_args
+        body.readpartial
+      end
+    end
+  end
 end

data/spec/http/response_spec.rb

@@ -83,4 +83,18 @@ describe HTTP::Response do
       end
     end
   end
+
+  describe '#flush' do
+    let(:body)      { double :to_s => '' }
+    let(:response)  { HTTP::Response.new 200, '1.1', {}, body }
+
+    it 'returns response self-reference' do
+      expect(response.flush).to be response
+    end
+
+    it 'flushes body' do
+      expect(body).to receive :to_s
+      response.flush
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tony
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb