reel 0.4.0.pre7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6f6bd25f256cb4c52c75128cfbb1ef57387df0
-  data.tar.gz: 6a37df9af45706282748e19bc7960274dce88472
+  metadata.gz: ea63b536704d29dc28c875c4160bc25937d989b5
+  data.tar.gz: e3d5d422b33b49c35932238dc00dd0847eaca7f1
 SHA512:
-  metadata.gz: 3cfa461777774503f16f9f8f87996bf93e75fc61a11228b7d1303ebf0d2039caec1f7d14a5f3f12d1e8eb512e391e0865dd0a257a2964a7a79ebb977e43fd134
-  data.tar.gz: 5233094d5448181826cee1f2c479a16e4ae7e6c96b14c75c5829815d989edf31d9f5e8e0ad7096bc3350024aa1122900fb9694e039231caba4497168051be02c
+  metadata.gz: f5d23ce9c146c86b313f5aa35f218e37e172001a7e29f8a39945a68e995ed9dcaf61bebc987558224b2c950917628a10f39b5428c50fd3451eda7e4ea15eb2f9
+  data.tar.gz: 73f35c9e99d133135d39ec18d77a04f2a71ce56170f23ccb36f766194a722595b31fa3856769b5c701a8e468c77293a317302711544f13aef89d9375c847e805

data/CHANGES.md

@@ -1,5 +1,5 @@
-0.4.0.pre7
-----------
+0.4.0
+-----
 * Rack adapter moved to the reel-rack project
 * Pipelining support
 * Reel::Connection#each_request for iterating through keep-alive requests
@@ -11,7 +11,7 @@
 * Remove `on_error` callback system
 * Increase buffer size
 * Remove Reel::App (unmaintained, sorry)
-* Reel::CODENAME added (presently "Garbo")
+* Reel::CODENAME added (0.4.0 is "Garbo")
 
 0.3.0
 -----

data/lib/reel/connection.rb

@@ -18,14 +18,14 @@ module Reel
     attr_reader :buffer_size
 
     def initialize(socket, buffer_size = nil)
-      @attached  = true
-      @socket    = socket
-      @keepalive = true
-      @parser    = Request::Parser.new(socket, self)
-      @writer    = Response::Writer.new(socket, self)
-      @buffer_size = buffer_size.nil? ? BUFFER_SIZE : buffer_size
-      reset_request
+      @attached    = true
+      @socket      = socket
+      @keepalive   = true
+      @buffer_size = buffer_size || BUFFER_SIZE
+      @parser      = Request::Parser.new(self)
+      @writer      = Response::Writer.new(socket)
 
+      reset_request
       @response_state = :header
     end
 

data/lib/reel/request_parser.rb

@@ -4,10 +4,11 @@ module Reel
       include HTTPVersionsMixin
       attr_reader :socket, :connection
 
-      def initialize(sock, conn)
-        @parser = Http::Parser.new(self)
-        @socket = sock
-        @connection = conn
+      def initialize(connection)
+        @parser      = Http::Parser.new(self)
+        @connection  = connection
+        @socket      = connection.socket
+        @buffer_size = connection.buffer_size
         @currently_reading = @currently_responding = nil
         @pending_reads     = []
         @pending_responses = []
@@ -40,21 +41,22 @@ module Reel
         @currently_responding || @currently_reading
       end
 
-      def readpartial(size = @connection.buffer_size)
+      def readpartial(size = @buffer_size)
         bytes = @socket.readpartial(size)
         @parser << bytes
       end
 
       #
-      # Http::Parser callbacks
+      # HTTP::Parser callbacks
       #
       def on_headers_complete(headers)
         info = RequestInfo.new(http_method, url, http_version, headers)
-        req = Request.new(info, connection)
-        if @currently_reading.nil?
-          @currently_reading = req
-        else
+        req  = Request.new(info, connection)
+
+        if @currently_reading
           @pending_reads << req
+        else
+          @currently_reading = req
         end
       end
 
@@ -66,21 +68,25 @@ module Reel
       # Mark current request as complete, set this as ready to respond.
       def on_message_complete
         @currently_reading.finish_reading! if @currently_reading.is_a?(Request)
-        if @currently_responding.nil?
-          @currently_responding = @currently_reading
-        else
+
+        if @currently_responding
           @pending_responses << @currently_reading
+        else
+          @currently_responding = @currently_reading
         end
+
         @currently_reading = @pending_reads.shift
       end
 
       def reset
         popped = @currently_responding
+
         if req = @pending_responses.shift
           @currently_responding = req
         elsif @currently_responding
           @currently_responding = nil
         end
+
         popped
       end
     end

data/lib/reel/response_writer.rb

@@ -3,9 +3,8 @@ module Reel
     class Writer
       CRLF = "\r\n"
 
-      def initialize(socket, connection)
+      def initialize(socket)
         @socket = socket
-        @connection = connection
       end
 
       # Write body chunks directly to the connection
@@ -44,7 +43,9 @@ module Reel
                 # 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) }
+                Celluloid.defer { IO.copy_stream(response.body, @socket.to_io) }
+                # @socket currently not being converted to appropriate IO object automatically.
+                # Convert the object in advance to still enjoy IO.copy_stream coverage.
               end
             ensure
               response.body.close

data/lib/reel/ssl_server.rb

@@ -8,15 +8,17 @@ module Reel
       # Ideally we can encapsulate this rather than making Ruby OpenSSL a
       # mandatory part of the Reel API. It would be nice to support
       # alternatives (e.g. Puma's MiniSSL)
-      ssl_context = OpenSSL::SSL::SSLContext.new
+      ssl_context      = OpenSSL::SSL::SSLContext.new
       ssl_context.cert = OpenSSL::X509::Certificate.new options.fetch(:cert)
       ssl_context.key  = OpenSSL::PKey::RSA.new options.fetch(:key)
 
-      # FIXME: VERY VERY VERY VERY BAD RELEASE BLOCKER BAD
+      # We don't presently support verifying client certificates
+      # TODO: support client certificates!
       ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
       @tcpserver  = Celluloid::IO::TCPServer.new(host, port)
-      @server = Celluloid::IO::SSLServer.new(@tcpserver, ssl_context)
+      @server     = Celluloid::IO::SSLServer.new(@tcpserver, ssl_context)
+
       @server.listen(backlog)
       @callback = callback
 
@@ -27,8 +29,8 @@ module Reel
       loop do
         begin
           socket = @server.accept
-        rescue OpenSSL::SSL::SSLError
-          # TODO: log this?
+        rescue OpenSSL::SSL::SSLError => ex
+          Logger.warn "Error accepting SSLSocket: #{ex.class}: #{ex.to_s}"
           retry
         end
 

data/lib/reel/version.rb

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

data/reel.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Tony Arcieri"]
   gem.email         = ["tony.arcieri@gmail.com"]
   gem.description   = "A Celluloid::IO-powered HTTP server"
-  gem.summary       = "A reel good HTTP server"
+  gem.summary       = "A Reel good HTTP server"
   gem.homepage      = "https://github.com/celluloid/reel"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Reel::VERSION
 
-  gem.add_runtime_dependency 'celluloid',        '>= 0.15.0'
+  gem.add_runtime_dependency 'celluloid',        '>= 0.15.1'
   gem.add_runtime_dependency 'celluloid-io',     '>= 0.15.0'
-  gem.add_runtime_dependency 'http',             '>= 0.5.0.pre2'
+  gem.add_runtime_dependency 'http',             '>= 0.5.0'
   gem.add_runtime_dependency 'http_parser.rb',   '>= 0.6.0.beta.2'
   gem.add_runtime_dependency 'websocket_parser', '>= 0.1.4'
 

data/spec/reel/connection_spec.rb

@@ -4,7 +4,8 @@ describe Reel::Connection do
   let(:fixture_path) { File.expand_path("../../fixtures/example.txt", __FILE__) }
 
   it "reads requests without bodies" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << ExampleRequest.new.to_s
       request = connection.request
 
@@ -22,7 +23,8 @@ describe Reel::Connection do
   end
 
   it "reads requests with bodies" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       body = "Hello, world!"
       example_request = ExampleRequest.new
       example_request.body = body
@@ -38,7 +40,8 @@ describe Reel::Connection do
   end
 
   it "reads requests with large bodies" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << ExampleRequest.new.to_s
       request = connection.request
 
@@ -54,7 +57,8 @@ describe Reel::Connection do
   end
 
   it "enumerates requests with #each_request" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << ExampleRequest.new.to_s
 
       request_count = 0
@@ -70,7 +74,8 @@ describe Reel::Connection do
   end
 
   it "streams responses when transfer-encoding is chunked" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << ExampleRequest.new.to_s
       request = connection.request
 
@@ -99,7 +104,8 @@ describe Reel::Connection do
   end
 
   it "reset the request after a response is sent" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       example_request = ExampleRequest.new(:get, "/", "1.1", {'Connection' => 'close'})
       client << example_request
 
@@ -112,24 +118,24 @@ describe Reel::Connection do
   end
 
   it "raises an error trying to read two pipelines without responding first" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
+
       2.times do
         client << ExampleRequest.new.to_s
       end
 
-      lambda{
-        2.times do
-          request = connection.request
-        end
-      }.should raise_error(Reel::Connection::StateError)
+      expect do
+        2.times { request = connection.request }
+      end.to raise_error(Reel::Connection::StateError)
     end
   end
 
   it "reads pipelined requests without bodies" do
-    with_socket_pair do |client, connection|
-      3.times do
-        client << ExampleRequest.new.to_s
-      end
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
+
+      3.times { client << ExampleRequest.new.to_s }
 
       3.times do
         request = connection.request
@@ -150,7 +156,9 @@ describe Reel::Connection do
   end
 
   it "reads pipelined requests with bodies" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
+
       3.times do |i|
         body = "Hello, world number #{i}!"
         example_request = ExampleRequest.new
@@ -174,7 +182,9 @@ describe Reel::Connection do
   end
 
   it "reads pipelined requests with streamed bodies" do
-    with_socket_pair(4) do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer, 4)
+
       3.times do |i|
         body = "Hello, world number #{i}!"
         example_request = ExampleRequest.new
@@ -206,8 +216,10 @@ describe Reel::Connection do
   # This test will deadlock rspec waiting unless
   # connection.request works properly
   it "does not block waiting for body to read before handling request" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       example_request = ExampleRequest.new
+
       content = "Hi guys! Sorry I'm late to the party."
       example_request['Content-Length'] = content.length
       client << example_request.to_s
@@ -220,8 +232,10 @@ describe Reel::Connection do
   end
 
   it "blocks on read until written" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       example_request = ExampleRequest.new
+
       content = "Hi guys! Sorry I'm late to the party."
       example_request['Content-Length'] = content.length
       client << example_request.to_s
@@ -244,8 +258,10 @@ describe Reel::Connection do
   end
 
   it "streams body properly with #read and buffered body" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       example_request = ExampleRequest.new
+
       content = "I'm data you can stream!"
       example_request['Content-Length'] = content.length
       client << example_request.to_s
@@ -266,8 +282,10 @@ describe Reel::Connection do
 
   context "#readpartial" do
     it "streams request bodies" do
-      with_socket_pair(8) do |client, connection|
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer, 8)
         example_request = ExampleRequest.new
+
         content = "I'm data you can stream!"
         example_request['Content-Length'] = content.length
         client << example_request.to_s
@@ -288,8 +306,10 @@ describe Reel::Connection do
 
   context "#each" do
     it "streams request bodies" do
-      with_socket_pair(8) do |client, connection|
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
+
         content = "I'm data you can stream!"
         example_request['Content-Length'] = content.length
         client << example_request.to_s
@@ -309,7 +329,8 @@ describe Reel::Connection do
 
   describe "IO#read duck typing" do
     it "raises an exception if length is a negative value" do
-      with_socket_pair do |client, connection|
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
 
         client << example_request.to_s
@@ -320,7 +341,8 @@ describe Reel::Connection do
     end
 
     it "returns an empty string if the length is zero" do
-      with_socket_pair do |client, connection|
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
 
         client << example_request.to_s
@@ -331,10 +353,10 @@ describe Reel::Connection do
     end
 
     it "reads to EOF if length is nil, even small buffer" do
-      with_socket_pair(4) do |client, connection|
-        body = "Hello, world!"
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer, 4)
         example_request = ExampleRequest.new
-        example_request.body = body
+        example_request.body = "Hello, world!"
         connection.buffer_size.should == 4
 
         client << example_request.to_s
@@ -345,10 +367,11 @@ describe Reel::Connection do
     end
 
     it "reads to EOF if length is nil" do
-      with_socket_pair do |client, connection|
-        body = "Hello, world!"
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
-        example_request.body = body
+        example_request.body = "Hello, world!"
+
 
         client << example_request.to_s
         request = connection.request
@@ -358,10 +381,10 @@ describe Reel::Connection do
     end
 
     it "uses the optional buffer to recieve data" do
-      with_socket_pair do |client, connection|
-        body = "Hello, world!"
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
-        example_request.body = body
+        example_request.body = "Hello, world!"
 
         client << example_request.to_s
         request = connection.request
@@ -373,10 +396,10 @@ describe Reel::Connection do
     end
 
     it "returns with the content it could read when the length longer than EOF" do
-      with_socket_pair do |client, connection|
-        body = "Hello, world!"
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
-        example_request.body = body
+        example_request.body = "Hello, world!"
 
         client << example_request.to_s
         request = connection.request
@@ -386,7 +409,8 @@ describe Reel::Connection do
     end
 
     it "returns nil at EOF if a length is passed" do
-      with_socket_pair do |client, connection|
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
 
         client << example_request.to_s
@@ -397,7 +421,8 @@ describe Reel::Connection do
     end
 
     it "returns an empty string at EOF if length is nil" do
-      with_socket_pair do |client, connection|
+      with_socket_pair do |client, peer|
+        connection = Reel::Connection.new(peer)
         example_request = ExampleRequest.new
 
         client << example_request.to_s
@@ -406,7 +431,5 @@ describe Reel::Connection do
         request.read.should be_empty
       end
     end
-
   end
-
 end

data/spec/reel/response_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Reel::Response do
   it "streams enumerables" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << ExampleRequest.new.to_s
       request = connection.request
 
@@ -17,7 +18,8 @@ describe Reel::Response do
   end
 
   it "canonicalizes response headers" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << ExampleRequest.new.to_s
       request = connection.request
 

data/spec/reel/response_writer_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Reel::Response::Writer do
+  let(:fixture_path) { File.expand_path("../../fixtures/example.txt", __FILE__) }
+  let(:expected_response) { "HTTP/1.1 200 OK\r\nContent-Length: 56\r\n\r\n#{File.read(fixture_path)}" }
+  it "streams static files" do
+    with_socket_pair do |socket, peer|
+      writer = described_class.new(socket)
+
+      File.open(fixture_path, 'r') do |file|
+        response = Reel::Response.new(:ok, {}, file)
+        writer.handle_response(response)
+      end
+
+      peer.readpartial(4096).should eq expected_response
+    end
+  end
+end

data/spec/reel/websocket_spec.rb

@@ -7,7 +7,8 @@ describe Reel::WebSocket do
   let(:another_message) { "What's going on?" }
 
   it "performs websocket handshakes" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << handshake.to_data
 
       request = connection.request
@@ -21,7 +22,8 @@ describe Reel::WebSocket do
   end
 
   it "raises an error if trying to close a connection upgraded to socket" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << handshake.to_data
 
       websocket = connection.request.websocket
@@ -76,7 +78,8 @@ describe Reel::WebSocket do
   end
 
   it "raises a RequestError when connection used after it was upgraded" do
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << handshake.to_data
 
       remote_host = connection.remote_host
@@ -92,7 +95,8 @@ describe Reel::WebSocket do
   end
 
   def with_websocket_pair
-    with_socket_pair do |client, connection|
+    with_socket_pair do |client, peer|
+      connection = Reel::Connection.new(peer)
       client << handshake.to_data
       request = connection.request
 

data/spec/spec_helper.rb

@@ -24,7 +24,7 @@ ensure
   server.terminate if server && server.alive?
 end
 
-def with_socket_pair(buffer_size = nil)
+def with_socket_pair
   host = '127.0.0.1'
   port = 10101
 
@@ -33,8 +33,7 @@ def with_socket_pair(buffer_size = nil)
   peer   = server.accept
 
   begin
-    connection = Reel::Connection.new(peer, buffer_size)
-    yield client, connection
+    yield client, peer
   ensure
     server.close rescue nil
     client.close rescue nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre7
+  version: 0.4.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0.pre2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0.pre2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,7 @@ files:
 - spec/fixtures/server.key
 - spec/reel/connection_spec.rb
 - spec/reel/response_spec.rb
+- spec/reel/response_writer_spec.rb
 - spec/reel/server_spec.rb
 - spec/reel/ssl_server_spec.rb
 - spec/reel/websocket_spec.rb
@@ -178,15 +179,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: A reel good HTTP server
+summary: A Reel good HTTP server
 test_files:
 - spec/fixtures/client.crt
 - spec/fixtures/client.key
@@ -195,6 +196,7 @@ test_files:
 - spec/fixtures/server.key
 - spec/reel/connection_spec.rb
 - spec/reel/response_spec.rb
+- spec/reel/response_writer_spec.rb
 - spec/reel/server_spec.rb
 - spec/reel/ssl_server_spec.rb
 - spec/reel/websocket_spec.rb