reel 0.4.0.pre4 → 0.4.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60dfb15b20ee1fecdb60f7b1c5a316e846e85e1
-  data.tar.gz: fd4ae6782aaae4aa8f546e80c1bfa8612311b07a
+  metadata.gz: 44aa1cfa32bf4e362a459a5f18377ac56db1f8c7
+  data.tar.gz: bbf8201bd08d1f803804bfde3857cea67b66d7fb
 SHA512:
-  metadata.gz: 10db5d35285758e25858c79d15ce4811d61dd8695879bc10dcfbc4ea15dd1e22a6f76faa2b369c417f2cc0494067a7288b41f4c67e6af8e4377ad546849b9852
-  data.tar.gz: a433060b188c505b934f7d7a6a46082ced480df6119c59a6fc3a951afb7afe6c4d694a2da1b344e2b11162692304ccf6fce28cf11b95aaf04d06665143329717
+  metadata.gz: 5fe52aa183298afe122e513a32782b04249af3024aedef8c30ed5ab59949bf73fd2b33341d957d2f39800c4b0b3e78f83ef9a279e9916ae58f9d7f585c64ed1a
+  data.tar.gz: 185e444d3044b97c939f94d8943039b3c5fcd6b5adb95a00c6cc044e8c003a489e9842270d4b95619b5fbd5472684134b839e12a061cb315729b8b82918dffc5

data/.rspec

@@ -2,3 +2,4 @@
 --format documentation 
 --backtrace
 --default_path spec
+--order random

data/CHANGES.md

@@ -1,4 +1,4 @@
-0.4.0.pre4
+0.4.0.pre5
 ----------
 * Rack adapter moved to the reel-rack project
 * Pipelining support

data/lib/reel/connection.rb

@@ -41,13 +41,6 @@ module Reel
       self
     end
 
-    # Reset the current request state
-    def reset_request(state = :ready)
-      @request_state = state
-      @current_request = nil
-      @parser.reset
-    end
-
     def readpartial(size = @buffer_size)
       raise StateError, "can't read in the '#{@request_state}' request state" unless @request_state == :ready
       @parser.readpartial(size)
@@ -171,5 +164,13 @@ module Reel
       raise StateError, "socket has already been hijacked" unless @socket
       @socket
     end
+
+    # Reset the current request state
+    def reset_request(state = :ready)
+      @request_state = state
+      @current_request = nil
+      @parser.reset
+    end
+    private :reset_request
   end
 end

data/lib/reel/response.rb

@@ -17,7 +17,7 @@ module Reel
       self.status = status
 
       if body_or_headers.is_a?(Hash)
-        headers = body_or_headers
+        headers = body_or_headers.dup
         @body = body
       else
         headers = {}

data/lib/reel/response_writer.rb

@@ -1,8 +1,8 @@
 module Reel
   class Response
     class Writer
-
       CRLF = "\r\n"
+
       def initialize(socket, connection)
         @socket = socket
         @connection = connection
@@ -13,6 +13,8 @@ module Reel
         chunk_header = chunk.bytesize.to_s(16)
         @socket << chunk_header + CRLF
         @socket << chunk + CRLF
+      rescue IOError, Errno::EPIPE, Errno::ECONNRESET => ex
+        raise Reel::SocketError, ex.to_s
       end
 
       # Finish the response and reset the response state to header
@@ -32,13 +34,17 @@ module Reel
             @socket << response.body
           when IO
             begin
-              if !defined?(JRUBY_VERSION)
-                IO.copy_stream(response.body, @socket)
-              else
+              if defined?(JRUBY_VERSION) && JRUBY_VERSION <= "1.6.7"
                 # JRuby 1.6.7 doesn't support IO.copy_stream :(
                 while data = response.body.read(4096)
                   @socket << data
                 end
+              else
+                # Use OS sendfile via IO.copy_stream
+                # FIXME: should use Celluloid::IO.copy_stream and allow these
+                # calls to be multiplexed through Celluloid::IO's reactor
+                # Until then we need a thread for each of these responses
+                Celluloid.defer { IO.copy_stream(response.body, @socket) }
               end
             ensure
               response.body.close

data/lib/reel/version.rb

@@ -1,4 +1,4 @@
 module Reel
-  VERSION  = "0.4.0.pre4"
+  VERSION  = "0.4.0.pre5"
   CODENAME = "Garbo"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre4
+  version: 0.4.0.pre5
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid