reel 0.4.0 → 0.5.0.pre

data/spec/reel/{server_spec.rb → http_server_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'net/http'
 
-describe Reel::Server do
+describe Reel::Server::HTTP do
   let(:endpoint) { URI(example_url) }
   let(:response_body) { "ohai thar" }
 

data/spec/reel/https_server_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+require 'net/http'
+
+describe Reel::Server::HTTPS do
+  let(:example_https_port) { example_port + 1 }
+  let(:example_url)      { "https://#{example_addr}:#{example_https_port}#{example_path}" }
+  let(:endpoint)         { URI(example_url) }
+  let(:response_body)    { "ohai thar" }
+
+  let(:ca_file) { fixture_dir.join('ca.crt').to_s }
+
+  let(:server_cert)          { fixture_dir.join("server.crt")         .read }
+  let(:server_key)           { fixture_dir.join("server.key")         .read }
+  let(:client_cert)          { fixture_dir.join("client.crt")         .read }
+  let(:client_cert_unsigned) { fixture_dir.join("client.unsigned.crt").read }
+  let(:client_key)           { fixture_dir.join("client.key")         .read }
+
+  it "receives HTTP requests and sends responses" do
+    ex = nil
+
+    handler = proc do |connection|
+      begin
+        request = connection.request
+        request.method.should eq 'GET'
+        request.version.should eq "1.1"
+        request.url.should eq example_path
+
+        connection.respond :ok, response_body
+      rescue => ex
+      end
+    end
+
+    with_reel_https_server(handler) do
+      http         = Net::HTTP.new(endpoint.host, endpoint.port)
+      http.use_ssl = true
+      http.ca_file = self.ca_file
+
+      request = Net::HTTP::Get.new(endpoint.path)
+      response = http.request(request)
+
+      response.body.should eq response_body
+    end
+
+    raise ex if ex
+  end
+
+  it 'verifies client SSL certs when provided with a CA' do
+    ex = nil
+
+    handler = proc do |connection|
+      begin
+        request = connection.request
+        request.method.should eq 'GET'
+        request.version.should eq '1.1'
+        request.url.should eq example_path
+
+        connection.respond :ok, response_body
+      rescue => ex
+      end
+    end
+
+    with_reel_https_server(handler, :ca_file => self.ca_file) do
+      http         = Net::HTTP.new(endpoint.host, endpoint.port)
+      http.use_ssl = true
+      http.ca_file = self.ca_file
+      http.cert    = OpenSSL::X509::Certificate.new self.client_cert
+      http.key     = OpenSSL::PKey::RSA.new         self.client_key
+
+      request  = Net::HTTP::Get.new(endpoint.path)
+      response = http.request(request)
+
+      response.body.should eq response_body
+    end
+
+    raise ex if ex
+  end
+
+  it %{fails to verify client certificates that aren't signed} do
+    ex = nil
+
+    handler = proc do |connection|
+      begin
+        request = connection.request
+        request.method.should eq 'GET'
+        request.version.should eq '1.1'
+        request.url.should eq example_path
+
+        connection.respond :ok, response_body
+      rescue => ex
+      end
+    end
+
+    with_reel_https_server(handler, :ca_file => self.ca_file) do
+      http         = Net::HTTP.new(endpoint.host, endpoint.port)
+      http.use_ssl = true
+      http.ca_file = self.ca_file
+      http.cert    = OpenSSL::X509::Certificate.new self.client_cert_unsigned
+      http.key     = OpenSSL::PKey::RSA.new         self.client_key
+
+      request  = Net::HTTP::Get.new(endpoint.path)
+
+      proc { http.request(request) }.should raise_error(OpenSSL::SSL::SSLError)
+    end
+
+    raise ex if ex
+  end
+
+  def with_reel_https_server(handler, options = {})
+    options = {
+      :cert => server_cert,
+      :key  => server_key
+    }.merge(options)
+
+    server = described_class.new(example_addr, example_https_port, options, &handler)
+    yield server
+  ensure
+    server.terminate if server && server.alive?
+  end
+end

data/spec/reel/{response_writer_spec.rb → response/writer_spec.rb}

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe Reel::Response::Writer do
-  let(:fixture_path) { File.expand_path("../../fixtures/example.txt", __FILE__) }
+  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)
@@ -12,7 +13,14 @@ describe Reel::Response::Writer do
         writer.handle_response(response)
       end
 
-      peer.readpartial(4096).should eq expected_response
+      buf = ""
+      begin
+        buf << peer.read(95)
+      rescue IOError
+        # End of body!
+      end
+
+      expect(buf).to eq expected_response
     end
   end
 end

data/spec/reel/websocket_spec.rb

@@ -28,7 +28,7 @@ describe Reel::WebSocket do
 
       websocket = connection.request.websocket
       websocket.should be_a Reel::WebSocket
-      expect { connection.close }.to raise_error(Reel::Connection::StateError)
+      expect { connection.close }.to raise_error(Reel::StateError)
     end
   end
 
@@ -89,7 +89,7 @@ describe Reel::WebSocket do
       websocket = request.websocket
       websocket.should be_a Reel::WebSocket
 
-      expect { connection.remote_host }.to raise_error(Reel::Connection::StateError)
+      expect { connection.remote_host }.to raise_error(Reel::StateError)
       websocket.remote_host.should == remote_host
     end
   end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'bundler/setup'
 require 'reel'
 require 'pry'
 
+require 'support/example_request'
+
 logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
 Celluloid.logger = Logger.new(logfile)
 
@@ -18,7 +20,7 @@ def example_path; "/example"; end
 def example_url;  "http://#{example_addr}:#{example_port}#{example_path}"; end
 
 def with_reel(handler)
-  server = Reel::Server.new(example_addr, example_port, &handler)
+  server = Reel::Server::HTTP.new(example_addr, example_port, &handler)
   yield server
 ensure
   server.terminate if server && server.alive?
@@ -41,39 +43,6 @@ def with_socket_pair
   end
 end
 
-class ExampleRequest
-  extend Forwardable
-  def_delegators :@headers, :[], :[]=
-  attr_accessor  :method, :path, :version, :body
-
-  def initialize(method = :get, path = "/", version = "1.1", headers = {}, body = nil)
-    @method = method.to_s.upcase
-    @path = path
-    @version = "1.1"
-    @headers = {
-      'Host'       => 'www.example.com',
-      'Connection' => 'keep-alive',
-      'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.78 S',
-      'Accept'     => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-      'Accept-Encoding' => 'gzip,deflate,sdch',
-      'Accept-Language' => 'en-US,en;q=0.8',
-      'Accept-Charset'  => 'ISO-8859-1,utf-8;q=0.7,*;q=0.3'
-    }.merge(headers)
-
-    @body = nil
-  end
-
-  def to_s
-    if @body && !@headers['Content-Length']
-      @headers['Content-Length'] = @body.length
-    end
-
-    "#{@method} #{@path} HTTP/#{@version}\r\n" <<
-    @headers.map { |k, v| "#{k}: #{v}" }.join("\r\n") << "\r\n\r\n" <<
-    (@body ? @body : '')
-  end
-end
-
 module WebSocketHelpers
   def self.included(spec)
     spec.instance_eval do

data/spec/support/example_request.rb

@@ -0,0 +1,34 @@
+require 'forwardable'
+
+class ExampleRequest
+  extend Forwardable
+  def_delegators :@headers, :[], :[]=
+  attr_accessor  :method, :path, :version, :body
+
+  def initialize(method = :get, path = "/", version = "1.1", headers = {}, body = nil)
+    @method = method.to_s.upcase
+    @path = path
+    @version = "1.1"
+    @headers = {
+      'Host'       => 'www.example.com',
+      'Connection' => 'keep-alive',
+      'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.78 S',
+      'Accept'     => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+      'Accept-Encoding' => 'gzip,deflate,sdch',
+      'Accept-Language' => 'en-US,en;q=0.8',
+      'Accept-Charset'  => 'ISO-8859-1,utf-8;q=0.7,*;q=0.3'
+    }.merge(headers)
+
+    @body = body
+  end
+
+  def to_s
+    if @body && !@headers['Content-Length']
+      @headers['Content-Length'] = @body.length
+    end
+
+    "#{@method} #{@path} HTTP/#{@version}\r\n" <<
+    @headers.map { |k, v| "#{k}: #{v}" }.join("\r\n") << "\r\n\r\n" <<
+    (@body ? @body : '')
+  end
+end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.pre
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: websocket_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 description: A Celluloid::IO-powered HTTP server
 email:
 - tony.arcieri@gmail.com
@@ -115,10 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -128,42 +128,50 @@ files:
 - benchmarks/hello_goliath.rb
 - benchmarks/hello_node.js
 - benchmarks/hello_reel.rb
-- examples/chunked.rb
+- benchmarks/reel_pool.rb
 - examples/hello_world.rb
+- examples/https_hello_world.rb
 - examples/roundtrip.rb
 - examples/server_sent_events.rb
-- examples/ssl_hello_world.rb
+- examples/spy_hello_world.rb
 - examples/websockets.rb
 - lib/reel.rb
 - lib/reel/connection.rb
 - lib/reel/logger.rb
 - lib/reel/mixins.rb
 - lib/reel/request.rb
-- lib/reel/request_body.rb
-- lib/reel/request_info.rb
-- lib/reel/request_parser.rb
+- lib/reel/request/body.rb
+- lib/reel/request/info.rb
+- lib/reel/request/parser.rb
+- lib/reel/request/state_machine.rb
 - lib/reel/response.rb
-- lib/reel/response_writer.rb
+- lib/reel/response/writer.rb
 - lib/reel/server.rb
-- lib/reel/ssl_server.rb
+- lib/reel/server/http.rb
+- lib/reel/server/https.rb
+- lib/reel/spy.rb
 - lib/reel/stream.rb
 - lib/reel/version.rb
 - lib/reel/websocket.rb
 - log/.gitignore
 - logo.png
 - reel.gemspec
+- spec/fixtures/ca.crt
+- spec/fixtures/ca.key
 - spec/fixtures/client.crt
 - spec/fixtures/client.key
+- spec/fixtures/client.unsigned.crt
 - spec/fixtures/example.txt
 - spec/fixtures/server.crt
 - spec/fixtures/server.key
 - spec/reel/connection_spec.rb
+- spec/reel/http_server_spec.rb
+- spec/reel/https_server_spec.rb
+- spec/reel/response/writer_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
 - spec/spec_helper.rb
+- spec/support/example_request.rb
 - tasks/rspec.rake
 homepage: https://github.com/celluloid/reel
 licenses: []
@@ -174,30 +182,35 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Reel good HTTP server
 test_files:
+- spec/fixtures/ca.crt
+- spec/fixtures/ca.key
 - spec/fixtures/client.crt
 - spec/fixtures/client.key
+- spec/fixtures/client.unsigned.crt
 - spec/fixtures/example.txt
 - spec/fixtures/server.crt
 - spec/fixtures/server.key
 - spec/reel/connection_spec.rb
+- spec/reel/http_server_spec.rb
+- spec/reel/https_server_spec.rb
+- spec/reel/response/writer_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
 - spec/spec_helper.rb
+- spec/support/example_request.rb
+has_rdoc: