Break Request#stream into a method object RequestStream

Signed-off-by: Sam Phippen <samphippen@googlemail.com>

lib/http.rb

@@ -8,6 +8,7 @@
 require 'http/mime_type'
 require 'http/options'
 require 'http/request'
+require 'http/request_stream'
 require 'http/response'
 require 'http/response_parser'
 require 'http/uri_backport' if RUBY_VERSION < "1.9.0"

lib/http/request.rb

@@ -34,37 +34,8 @@ def [](header)
     # Stream the request to a socket
     def stream(socket)
       request_header = "#{method.to_s.upcase} #{uri.path} HTTP/#{version}#{CRLF}"
-      @headers.each do |field, value|
-        request_header << "#{field}: #{value}#{CRLF}"
-      end
-
-      case body
-      when NilClass
-        socket << request_header << CRLF
-        return
-      when String
-        request_header << "Content-Length: #{body.length}#{CRLF}" unless @headers['Content-Length']
-        request_header << CRLF
-
-        socket << request_header
-        socket << body.to_s
-      when Enumerable
-        if encoding = @headers['Transfer-Encoding']
-          raise ArgumentError, "invalid transfer encoding" unless encoding == "chunked"
-          request_header << CRLF
-        else
-          request_header << "Transfer-Encoding: chunked#{CRLF * 2}"
-        end
-
-        socket << request_header
-        body.each do |chunk|
-          socket << chunk.bytesize.to_s(16) << CRLF
-          socket << chunk
-        end
-
-        socket << "0" << CRLF * 2
-      else raise TypeError, "invalid body type: #{body.class}"
-      end
+      rs = Http::RequestStream.new socket, body, @headers, request_header
+      rs.stream
     end
   end
 end

lib/http/request_stream.rb

@@ -0,0 +1,47 @@
+module Http
+  class RequestStream
+    def initialize(socket, body, headers, headerstart)
+      @socket         = socket
+      @body           = body
+      @headers        = headers
+      @request_header = headerstart
+    end
+
+    # Stream the request to a socket
+    def stream
+      socket = @socket
+      request_header = @request_header
+      @headers.each do |field, value|
+        request_header << "#{field}: #{value}#{CRLF}"
+      end
+
+      case @body
+      when NilClass
+        socket << request_header << CRLF
+        return
+      when String
+        request_header << "Content-Length: #{@body.length}#{CRLF}" unless @headers['Content-Length']
+        request_header << CRLF
+
+        socket << request_header
+        socket << @body.to_s
+      when Enumerable
+        if encoding = @headers['Transfer-Encoding']
+          raise ArgumentError, "invalid transfer encoding" unless encoding == "chunked"
+          request_header << CRLF
+        else
+          request_header << "Transfer-Encoding: chunked#{CRLF * 2}"
+        end
+
+        socket << request_header
+        @body.each do |chunk|
+          socket << chunk.bytesize.to_s(16) << CRLF
+          socket << chunk
+        end
+
+        socket << "0" << CRLF * 2
+      else raise TypeError, "invalid @body type: #{@body.class}"
+      end
+    end
+  end
+end