reel 0.0.1 → 0.0.2

data/.travis.yml

@@ -8,3 +8,6 @@ rvm:
 # Rubies I would like to support, but they deadlock
 #  - rbx-18mode
 #  - rbx-19mode
+
+notifications:
+  irc: "irc.freenode.org#celluloid"

data/lib/reel/connection.rb

@@ -11,6 +11,7 @@ module Reel
     def initialize(socket)
       @socket = socket
       @keepalive = true
+      @parser = Request::Parser.new
       reset
 
       @response_state = :header
@@ -96,8 +97,8 @@ module Reel
 
     def reset
       @request_state = :header
-      @parser = Request::Parser.new
       @request = nil
+      @parser.reset
     end
   end
 end

data/lib/reel/request.rb

@@ -1,6 +1,6 @@
 module Reel
   class Request
-    attr_accessor :method, :version, :url
+    attr_accessor :method, :version, :url, :headers
     METHODS = [:get, :head, :post, :put, :delete, :trace, :options, :connect, :patch]
     
     def initialize(method, url, version = "1.1", headers = {}, connection = nil)

data/lib/reel/request/parser.rb

@@ -6,9 +6,7 @@ module Reel
 
       def initialize
         @parser = Http::Parser.new(self)
-        @headers = nil
-        @finished = false
-        @chunk = nil
+        reset
       end
 
       def add(data)
@@ -58,6 +56,12 @@ module Reel
       def on_message_complete
         @finished = true
       end
+
+      def reset
+        @finished = false
+        @headers  = nil
+        @chunk    = nil
+      end
     end
   end
 end

data/lib/reel/response.rb

@@ -4,7 +4,7 @@ module Reel
     STATUS_CODES          = Http::Response::STATUS_CODES
     SYMBOL_TO_STATUS_CODE = Http::Response::SYMBOL_TO_STATUS_CODE
     CRLF = "\r\n"
-    
+
     attr_reader   :status # Status has a special setter to coerce symbol names
     attr_accessor :reason
 
@@ -19,8 +19,11 @@ module Reel
         @headers = body_or_headers
       end
 
-      if @body
-        @headers['Content-Length'] ||= @body.length
+      case @body
+      when String
+        @headers['Content-Length'] ||= @body.bytesize
+      when IO
+        @headers['Content-Length'] ||= @body.stat.size
       end
 
       # FIXME: real HTTP versioning
@@ -33,7 +36,7 @@ module Reel
       when Integer
         @status = status
         @reason ||= STATUS_CODES[status]
-      when Symbol 
+      when Symbol
         if code = SYMBOL_TO_STATUS_CODE[status]
           self.status = code
         else
@@ -47,7 +50,16 @@ module Reel
     # Write the response out to the wire
     def render(socket)
       socket << render_header
-      socket << @body
+
+      case @body
+      when String
+        socket << @body
+      when IO
+        # TODO: IO.copy_stream when it works cross-platform
+        while data = @body.read(4096)
+          socket << data
+        end
+      end
     end
 
     # Convert headers into a string

data/lib/reel/version.rb

@@ -1,3 +1,3 @@
 module Reel
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fixtures/example.txt

@@ -0,0 +1 @@
+This is an example of a static file being served by Reel

data/spec/reel/connection_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 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|
       client << ExampleRequest.new.to_s
@@ -30,8 +32,23 @@ describe Reel::Connection do
 
       request.url.should     eq "/"
       request.version.should eq "1.1"
-      request['Content-Length'].should == body.length.to_s
-      request.body.should == example_request.body
+      request['Content-Length'].should eq body.length.to_s
+      request.body.should eq example_request.body
+    end
+  end
+
+  it "serves static files" do
+    with_socket_pair do |client, connection|
+      client << ExampleRequest.new.to_s
+      request = connection.read_request
+
+      fixture_text = File.read(fixture_path)
+      File.open(fixture_path) do |file|
+        connection.respond :ok, file
+      end
+
+      response = client.readpartial(4096)
+      response[(response.length - fixture_text.length)..-1].should eq fixture_text
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
-  requirement: &70219946901960 !ruby/object:Gem::Requirement
+  requirement: &70171644061140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219946901960
+  version_requirements: *70171644061140
 - !ruby/object:Gem::Dependency
   name: http
-  requirement: &70219946917780 !ruby/object:Gem::Requirement
+  requirement: &70171644060640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219946917780
+  version_requirements: *70171644060640
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70219946917260 !ruby/object:Gem::Requirement
+  requirement: &70171644060180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70219946917260
+  version_requirements: *70171644060180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219946916780 !ruby/object:Gem::Requirement
+  requirement: &70171644059800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219946916780
+  version_requirements: *70171644059800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70219946916200 !ruby/object:Gem::Requirement
+  requirement: &70171644075700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219946916200
+  version_requirements: *70171644075700
 description: A Celluloid::IO-powered HTTP server
 email:
 - tony.arcieri@gmail.com
@@ -97,6 +97,7 @@ files:
 - lib/reel/version.rb
 - logo.png
 - reel.gemspec
+- spec/fixtures/example.txt
 - spec/reel/connection_spec.rb
 - spec/reel/server_spec.rb
 - spec/spec_helper.rb
@@ -126,6 +127,7 @@ signing_key:
 specification_version: 3
 summary: A reel good HTTP server
 test_files:
+- spec/fixtures/example.txt
 - spec/reel/connection_spec.rb
 - spec/reel/server_spec.rb
 - spec/spec_helper.rb