reel 0.4.0.pre → 0.4.0.pre2

data/spec/reel/response_spec.rb

@@ -10,7 +10,7 @@ describe Reel::Response do
       connection.close
 
       response = client.read(4096)
-      crlf = Reel::Response::CRLF
+      crlf = Reel::Response::Writer::CRLF
       fixture = "5#{crlf}Hello#{crlf}5#{crlf}World#{crlf}0#{crlf*2}"
       response[(response.length - fixture.length)..-1].should eq fixture
     end

data/spec/reel/server_spec.rb

@@ -35,7 +35,7 @@ describe Reel::Server do
       begin
         request = connection.request
         request.method.should eq 'POST'
-        connection.respond :ok, request.body
+        connection.respond :ok, request.body.to_s
       rescue => ex
       end
     end

data/spec/reel/ssl_server_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'net/http'
+
+describe Reel::SSLServer do
+  let(:example_ssl_port) { example_port + 1 }
+  let(:example_url)      { "https://#{example_addr}:#{example_ssl_port}#{example_path}" }
+  let(:endpoint)         { URI(example_url) }
+  let(:response_body)    { "ohai thar" }
+
+  let(:server_cert) { fixture_dir.join("server.crt").read }
+  let(:server_key)  { fixture_dir.join("server.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_sslserver(handler) do
+      http = Net::HTTP.new(endpoint.host, endpoint.port)
+      http.use_ssl = true
+
+      # FIXME: VERIFY_NONE is bad! Authenticate the server cert!
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Get.new(endpoint.path)
+      response = http.request(request)
+
+      response.body.should eq response_body
+    end
+
+    raise ex if ex
+  end
+
+  def with_reel_sslserver(handler, context = OpenSSL::SSL::SSLContext.new)
+    options = {
+      :cert => server_cert,
+      :key  => server_key
+    }
+
+    server = Reel::SSLServer.new(example_addr, example_ssl_port, options, &handler)
+    yield server
+  ensure
+    server.terminate if server && server.alive?
+  end
+end

data/spec/reel/websocket_spec.rb

@@ -10,13 +10,26 @@ describe Reel::WebSocket do
     with_socket_pair do |client, connection|
       client << handshake.to_data
 
-      websocket = connection.request
+      request = connection.request
+      request.should be_websocket
+
+      websocket = request.websocket
       websocket.should be_a Reel::WebSocket
 
       handshake.errors.should be_empty
     end
   end
 
+  it "raises an error if trying to close a connection upgraded to socket" do
+    with_socket_pair do |client, connection|
+      client << handshake.to_data
+
+      websocket = connection.request.websocket
+      websocket.should be_a Reel::WebSocket
+      expect { connection.close }.to raise_error(Reel::Connection::StateError)
+    end
+  end
+
   it "knows its URL" do
     with_websocket_pair do |_, websocket|
       websocket.url.should == example_path
@@ -62,10 +75,29 @@ describe Reel::WebSocket do
     end
   end
 
+  it "raises a RequestError when connection used after it was upgraded" do
+    with_socket_pair do |client, connection|
+      client << handshake.to_data
+
+      remote_host = connection.remote_host
+
+      request = connection.request
+      request.should be_websocket
+      websocket = request.websocket
+      websocket.should be_a Reel::WebSocket
+
+      expect { connection.remote_host }.to raise_error(Reel::Connection::StateError)
+      websocket.remote_host.should == remote_host
+    end
+  end
+
   def with_websocket_pair
     with_socket_pair do |client, connection|
       client << handshake.to_data
-      websocket = connection.request
+      request = connection.request
+
+      request.should be_websocket
+      websocket = request.websocket
       websocket.should be_a Reel::WebSocket
 
       # Discard handshake

data/spec/spec_helper.rb

@@ -1,11 +1,17 @@
-require 'bundler/setup'
-require 'reel'
 require 'coveralls'
 Coveralls.wear!
 
+require 'bundler/setup'
+require 'reel'
+require 'pry'
+
 logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
 Celluloid.logger = Logger.new(logfile)
 
+def fixture_dir
+  Pathname.new File.expand_path("../fixtures", __FILE__)
+end
+
 def example_addr; '127.0.0.1'; end
 def example_port; 1234; end
 def example_path; "/example"; end
@@ -18,7 +24,7 @@ ensure
   server.terminate if server && server.alive?
 end
 
-def with_socket_pair
+def with_socket_pair(buffer_size = nil)
   host = '127.0.0.1'
   port = 10101
 
@@ -27,7 +33,7 @@ def with_socket_pair
   peer   = server.accept
 
   begin
-    connection = Reel::Connection.new(peer)
+    connection = Reel::Connection.new(peer, buffer_size)
     yield client, connection
   ensure
     server.close rescue nil
@@ -87,7 +93,7 @@ module WebSocketHelpers
         }
       end
 
-      let(:handshake) { WebSocket::ClientHandshake.new(:get, example_url, handshake_headers) } 
+      let(:handshake) { WebSocket::ClientHandshake.new(:get, example_url, handshake_headers) }
     end
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre
+  version: 0.4.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +58,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0.beta.2
 - !ruby/object:Gem::Dependency
   name: websocket_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,7 @@ files:
 - .travis.yml
 - CHANGES.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -148,6 +163,7 @@ files:
 - examples/hello_world.rb
 - examples/roundtrip.rb
 - examples/server-sent-events.rb
+- examples/ssl_hello_world.rb
 - examples/stream.rb
 - examples/websocket-wall.rb
 - examples/websocket.ru
@@ -161,21 +177,30 @@ files:
 - lib/reel/mixins.rb
 - lib/reel/rack_worker.rb
 - lib/reel/request.rb
+- lib/reel/request_body.rb
+- lib/reel/request_info.rb
 - lib/reel/request_parser.rb
 - lib/reel/response.rb
+- lib/reel/response_writer.rb
 - lib/reel/server.rb
+- lib/reel/ssl_server.rb
 - lib/reel/stream.rb
 - lib/reel/version.rb
 - lib/reel/websocket.rb
 - log/.gitignore
 - logo.png
 - reel.gemspec
+- spec/fixtures/client.crt
+- spec/fixtures/client.key
 - spec/fixtures/example.txt
+- spec/fixtures/server.crt
+- spec/fixtures/server.key
 - spec/reel/app_spec.rb
 - spec/reel/connection_spec.rb
 - spec/reel/rack_worker_spec.rb
 - spec/reel/response_spec.rb
 - spec/reel/server_spec.rb
+- spec/reel/ssl_server_spec.rb
 - spec/reel/websocket_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
@@ -203,11 +228,16 @@ signing_key:
 specification_version: 4
 summary: A reel good HTTP server
 test_files:
+- spec/fixtures/client.crt
+- spec/fixtures/client.key
 - spec/fixtures/example.txt
+- spec/fixtures/server.crt
+- spec/fixtures/server.key
 - spec/reel/app_spec.rb
 - spec/reel/connection_spec.rb
 - spec/reel/rack_worker_spec.rb
 - spec/reel/response_spec.rb
 - spec/reel/server_spec.rb
+- spec/reel/ssl_server_spec.rb
 - spec/reel/websocket_spec.rb
 - spec/spec_helper.rb