reel 0.1.0 → 0.2.0.pre

data/spec/reel/server_spec.rb

@@ -4,36 +4,42 @@ require 'net/http'
 describe Reel::Server do
   let(:endpoint) { URI("http://#{example_addr}:#{example_port}#{example_url}") }
   let(:response_body) { "ohai thar" }
-  
+
   it "receives HTTP requests and sends responses" do
-    handler_called = false
+    ex = nil
+
     handler = proc do |connection|
-      handler_called = true
-      request = connection.request
-      request.method.should eq :get
-      request.version.should eq "1.1"
-      request.url.should eq example_url
-      
-      connection.respond :ok, response_body
+      begin
+        request = connection.request
+        request.method.should eq :get
+        request.version.should eq "1.1"
+        request.url.should eq example_url
+
+        connection.respond :ok, response_body
+      rescue => ex
+      end
     end
-    
+
     with_reel(handler) do
       response = Net::HTTP.get endpoint
       response.should eq response_body
     end
-    
-    handler_called.should be_true
+
+    raise ex if ex
   end
-  
+
   it "echoes request bodies as response bodies" do
-    handler_called = false
+    ex = nil
+
     handler = proc do |connection|
-      handler_called = true
-      request = connection.request
-      request.method.should eq :post
-      connection.respond :ok, request.body
+      begin
+        request = connection.request
+        request.method.should eq :post
+        connection.respond :ok, request.body
+      rescue => ex
+      end
     end
-    
+
     with_reel(handler) do
       http = Net::HTTP.new(endpoint.host, endpoint.port)
       request = Net::HTTP::Post.new(endpoint.request_uri)
@@ -43,7 +49,7 @@ describe Reel::Server do
       response.should be_a Net::HTTPOK
       response.body.should == response_body
     end
-    
-    handler_called.should be_true
+
+    raise ex if ex
   end
-end
+end

data/spec/reel/websocket_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Reel::WebSocket do
+  let(:example_host)    { "www.example.com" }
+  let(:example_path)    { "/example"}
+  let(:example_url)     { "ws://#{example_host}#{example_path}" }
+  let(:example_message) { "Hello, World!" }
+  let(:another_message) { "What's going on?" }
+
+  let :handshake_headers do
+    {
+      "Host"                   => example_host,
+      "Upgrade"                => "websocket",
+      "Connection"             => "Upgrade",
+      "Sec-WebSocket-Key"      => "dGhlIHNhbXBsZSBub25jZQ==",
+      "Origin"                 => "http://example.com",
+      "Sec-WebSocket-Protocol" => "chat, superchat",
+      "Sec-WebSocket-Version"  => "13"
+    }
+  end
+
+  let(:handshake) { WebSocket::ClientHandshake.new(:get, example_url, handshake_headers) }
+
+  it "performs websocket handshakes" do
+    with_socket_pair do |client, connection|
+      client << handshake.to_data
+
+      websocket = connection.request
+      websocket.should be_a Reel::WebSocket
+
+      handshake.errors.should be_empty
+    end
+  end
+
+  it "knows its URL" do
+    with_websocket_pair do |_, websocket|
+      websocket.url.should == example_path
+    end
+  end
+
+  it "knows its headers" do
+    with_websocket_pair do |_, websocket|
+      websocket['Host'].should == example_host
+    end
+  end
+
+  it "reads frames" do
+    with_websocket_pair do |client, websocket|
+      client << WebSocket::Message.new(example_message).to_data
+      client << WebSocket::Message.new(another_message).to_data
+
+      websocket.read.should == example_message
+      websocket.read.should == another_message
+    end
+  end
+
+  it "writes messages" do
+    with_websocket_pair do |client, websocket|
+      websocket.write example_message
+      websocket.write another_message
+
+      parser = WebSocket::Parser.new
+
+      parser.append client.readpartial(4096) until first_message = parser.next_message
+      first_message.should == example_message
+
+      parser.append client.readpartial(4096) until next_message = parser.next_message
+      next_message.should == another_message
+    end
+  end
+
+  it "closes" do
+    with_websocket_pair do |_, websocket|
+      websocket.should_not be_closed
+      websocket.close
+      websocket.should be_closed
+    end
+  end
+
+  def with_websocket_pair
+    with_socket_pair do |client, connection|
+      client << handshake.to_data
+      websocket = connection.request
+      websocket.should be_a Reel::WebSocket
+
+      # Discard handshake
+      client.readpartial(4096)
+
+      yield client, websocket
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'bundler/setup'
 require 'reel'
 
+logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
+Celluloid.logger = Logger.new(logfile)
+
 def example_addr; '127.0.0.1'; end
 def example_port; 1234; end
 def example_url;  "/example"; end
@@ -12,13 +15,30 @@ ensure
   server.terminate
 end
 
+def with_socket_pair
+  host = '127.0.0.1'
+  port = 10103
+
+  server = TCPServer.new(host, port)
+  client = TCPSocket.new(host, port)
+  peer   = server.accept
+
+  begin
+    yield client, Reel::Connection.new(peer)
+  ensure
+    server.close rescue nil
+    client.close rescue nil
+    peer.close   rescue nil
+  end
+end
+
 class ExampleRequest
   extend Forwardable
   def_delegators :@headers, :[], :[]=
-  attr_accessor  :path, :version, :body
+  attr_accessor  :method, :path, :version, :body
 
-  def initialize(verb = :get, path = "/", version = "1.1", headers = {}, body = nil)
-    @verb = verb.to_s.upcase
+  def initialize(method = :get, path = "/", version = "1.1", headers = {}, body = nil)
+    @method = method.to_s.upcase
     @path = path
     @version = "1.1"
     @headers = {
@@ -39,7 +59,7 @@ class ExampleRequest
       @headers['Content-Length'] = @body.length
     end
 
-    "#{@verb} #{@path} HTTP/#{@version}\r\n" <<
+    "#{@method} #{@path} HTTP/#{@version}\r\n" <<
     @headers.map { |k, v| "#{k}: #{v}" }.join("\r\n") << "\r\n\r\n" <<
     (@body ? @body : '')
   end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
-  requirement: &70093521317700 !ruby/object:Gem::Requirement
+  requirement: &70212936553620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093521317700
+  version_requirements: *70212936553620
 - !ruby/object:Gem::Dependency
   name: http
-  requirement: &70093521316860 !ruby/object:Gem::Requirement
+  requirement: &70212936553120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093521316860
+  version_requirements: *70212936553120
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70093521316180 !ruby/object:Gem::Requirement
+  requirement: &70212936552660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,32 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70093521316180
+  version_requirements: *70212936552660
+- !ruby/object:Gem::Dependency
+  name: websocket_parser
+  requirement: &70212936552200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70212936552200
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70212936551740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70212936551740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70093521315560 !ruby/object:Gem::Requirement
+  requirement: &70212936551360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093521315560
+  version_requirements: *70212936551360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70093521314860 !ruby/object:Gem::Requirement
+  requirement: &70212936550900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093521314860
+  version_requirements: *70212936550900
 description: A Celluloid::IO-powered HTTP server
 email:
 - tony.arcieri@gmail.com
@@ -88,20 +110,27 @@ files:
 - benchmarks/hello_reel.rb
 - bin/reel
 - examples/hello_world.rb
+- examples/websockets.rb
+- lib/rack/handler/reel.rb
 - lib/reel.rb
 - lib/reel/connection.rb
 - lib/reel/logger.rb
+- lib/reel/rack_worker.rb
 - lib/reel/request.rb
 - lib/reel/request_parser.rb
 - lib/reel/response.rb
 - lib/reel/server.rb
 - lib/reel/version.rb
+- lib/reel/websocket.rb
+- log/.gitignore
 - logo.png
 - reel.gemspec
 - spec/fixtures/example.txt
 - spec/reel/connection_spec.rb
+- spec/reel/rack_worker_spec.rb
 - spec/reel/response_spec.rb
 - spec/reel/server_spec.rb
+- spec/reel/websocket_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: https://github.com/celluloid/reel
@@ -119,9 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -131,7 +160,9 @@ summary: A reel good HTTP server
 test_files:
 - spec/fixtures/example.txt
 - spec/reel/connection_spec.rb
+- spec/reel/rack_worker_spec.rb
 - spec/reel/response_spec.rb
 - spec/reel/server_spec.rb
+- spec/reel/websocket_spec.rb
 - spec/spec_helper.rb
 has_rdoc: