reel 0.6.0.pre5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43c1f099231a631fc5e92d94749786b3aad46c19
-  data.tar.gz: 9551959b50390d49b17e1a43cc22bd43f3b1b653
+  metadata.gz: 5ce24f419ce91dd55a85503c2540abea3c2c79d9
+  data.tar.gz: 8a5adfc3c0a04db334dbacdc70f4748bab8c5b41
 SHA512:
-  metadata.gz: 96d51dc3df65f7fe18987c782fd1c82d5310ec5594dd41852214eeceadfd3888e3c7fa1b3cf6325836a6f07e07d4466954297f364115032d4da4b3964d6d407b
-  data.tar.gz: 2092942e41b2ceed4439fc777460b2bf7db547b6dc4672fdfb132b7440ee09be0ac02b39a758a3f184e6d4622cd053966157477f532433415c1695903564cda5
+  metadata.gz: e46d0cb9591419a96bdc072256f6329d5b75272f753137ac90984a06afa89cf52bb8a2f08b92adbc0314f7fef2933f75b524cec26c04ee6018e59d0401c9a9a7
+  data.tar.gz: 40ff868aee4a82390395cf210970ae4e6603e84772bab12c56890fbbee979d6086ef13a6037ed71e7e5be2ab5b23ba8ecf87c721837a51abd1c01c6c3ecee98f

data/.travis.yml

@@ -1,41 +1,14 @@
-script: rake ci
 language: ruby
-rvm:
-  - 2.2.0
-  - 2.2.2
-  - jruby
-  - ruby-head
-  - jruby-head
-  - rbx-2
-
-# TODO: Put these back:
-# * CELLULOID_TASK_CLASS=Fibered
-# * CELLULOID_TASK_CLASS=Threaded
-# For right now the imporant thing is to test BACKPORTED mode:
+sudo: false
 
+rvm:
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - jruby-9.0.5.0
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: rbx-2
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - env: CELLULOID_BACKPORTED=true
-    - env: CELLULOID_BACKPORTED=false CELLULOID_LEAKTEST=1
-
-env:
-  global:
-    - NUMBER_OF_PROCESSORS=2 CELLULOID_CONFIG_FILE=.env-ci
-  matrix:
-    - CELLULOID_BACKPORTED=true
-    - CELLULOID_BACKPORTED=false
-    - CELLULOID_BACKPORTED=false CELLULOID_LEAKTEST=1
 
 notifications:
   irc: "irc.freenode.org#celluloid"
-
-before_install:
-  # Only use 1 job until Travis fixes the rbx --jobs issue.
-  - if [ "$TRAVIS_RUBY_VERSION" == "rbx-2" ] ; then export BUNDLE_JOBS=1 ; else export BUNDLE_JOBS=4; fi
-
-sudo: false
-install: bundle install --without=development

data/CHANGES.md

@@ -1,25 +1,48 @@
-0.6.0 (2015-03-24)
------
-* Fix stack level too deep when writing to ChunkStream
-* Use HTTP::Resonse::Status::REASONS table ( HTTP::Response::* deprecated in the HTTP gem )
-* Use Timers 3.0.0 API
-* Case-insensitivity for header field names ( i.e. in case a proxy downcases them )
-* Catch when openssl sometimes fires ECONNRESET, EPIPE, ETIMEDOUT, EHOSTUNREACH and  as an error
-* Unused `optimize` socket modifications taken off all server implementations
-* Fixed 404 error in roundtrip example
-* Fixed "Reel::StateError: already processing a request" when client is killed
-* Numerous updates to rspec.
-* Switched to websocket/driver and improved websocket handling
-* Implement DriverEnvironment to fix websocket example
-* Refactored Server::HTTPS to be more idomatic
-* Fixed jRuby related test failures
-* Fixed "ArgumentError: Data object has already been freed" caused by underlying parser.
-* FINALLY! Support for UNIX Socket servers across all RVM's, as of jRuby 1.7.19
-* Unified Server#run removes need for duplication of #run across all Server implementations.
-* Standardized method of rescuing exceptions unique to each type of Server in unified #run method.
-
-0.5.0 (2014-04-15)
------
+## 0.6.0 (2016-02-13)
+
+* [#148](https://github.com/celluloid/reel/pull/148):
+  Fix stack level too deep when writing to ChunkStream.
+  (**@bastjan**)
+
+* [#151](https://github.com/celluloid/reel/pull/151):
+  Support for new http.rb gem API.
+  (**@ixti**)
+
+* [#152](https://github.com/celluloid/reel/pull/152):
+  Case insensitivity for header field names.
+  (**@kenichi**)
+
+* [#155](https://github.com/celluloid/reel/pull/155):
+  Handle Errno::ECONNRESET in SSL server.
+  (**@czaks**)
+
+* [#162](https://github.com/celluloid/reel/pull/162):
+  Fix for #150: Reel::StateError: already processing
+  a request when client is killed.
+  (**@artcom**)
+
+* [#166](https://github.com/celluloid/reel/pull/166):
+  Switch to websocket-driver gem.
+  (**@d-snp**)
+
+* [#167](https://github.com/celluloid/reel/pull/167):
+  Delegate #addr, #peeraddr, etc. methods in Spy.
+  (**@d-snp**)
+
+* [#168](https://github.com/celluloid/reel/pull/168):
+  Revert removal of addr and peeraddr delegates.
+  (**@d-snp**)
+
+* [#182](https://github.com/celluloid/reel/pull/182):
+  Do not allow transitioning out of closed.
+  (**@zanker**)
+
+* [#214](https://github.com/celluloid/reel/pull/214):
+  Fix ChunkStream termination.
+  (**@ogoid**)
+
+## 0.5.0 (2014-04-15)
+
 * Reel::Server(::SSL) renamed to Reel::Server::HTTP and Reel::Server::HTTPS
 * New Reel::Spy API for observing requests and responses from the server
 * Fixes to chunked encoding handling
@@ -28,8 +51,8 @@
 * Ensure response bodies are always closed
 * Support for passing a fixnum status to Connection#respond
 
-0.4.0 (2013-09-14)
------
+## 0.4.0
+
 * Rack adapter moved to the reel-rack project
 * Pipelining support
 * Reel::Connection#each_request for iterating through keep-alive requests
@@ -43,8 +66,8 @@
 * Remove Reel::App (unmaintained, sorry)
 * Reel::CODENAME added (0.4.0 is "Garbo")
 
-0.3.0 (2013-02-01)
------
+## 0.3.0
+
 * Reel::App: Sinatra-like DSL for defining Reel apps using Octarine
 * Chunked upload support
 * Lots of additional work on the Rack adapter
@@ -53,12 +76,12 @@
 * Bugfix: Send CRLF after chunks
 * Bugfix: Increase TCP connection backlog to 1024
 
-0.2.0 (2012-09-03)
------
+## 0.2.0
+
 * Initial WebSockets support via Reel::WebSocket
 * Experimental Rack adapter by Alberto Fernández-Capel
 * Octarine (Sinatra-like DSL) support by Grant Rodgers
 
-0.1.0 (2012-07-12)
------
+## 0.1.0
+
 * Initial release

data/Gemfile

@@ -1,12 +1,22 @@
-require File.expand_path("../culture/sync", __FILE__)
-Celluloid::Sync::Gemfile[self]
+source 'https://rubygems.org'
 
-gem 'certificate_authority'
-gem 'jruby-openssl' if RUBY_PLATFORM == 'java'
-gem 'celluloid-io', github: 'celluloid/celluloid-io', branch: '0.17.0-dependent', submodules: true
+gem 'celluloid'
+gem 'celluloid-io'
+gem 'http'
+
+gem 'jruby-openssl' if defined? JRUBY_VERSION
+gem 'coveralls', require: false
+
+# Specify your gem's dependencies in reel.gemspec
+gemspec
+
+group :development do
+  gem 'guard-rspec'
+  gem 'pry'
+end
 
 platforms :rbx do
   gem 'racc'
   gem 'rubinius-coverage'
   gem 'rubysl', '~> 2.0'
-end
+end

data/README.md

@@ -1,9 +1,10 @@
 ![Reel](https://github.com/celluloid/reel/raw/master/logo.png)
 =======
-[![Gem Version](https://badge.fury.io/rb/reel.png)](http://rubygems.org/gems/reel)
-[![Build Status](https://secure.travis-ci.org/celluloid/reel.png?branch=master)](http://travis-ci.org/celluloid/reel)
-[![Code Climate](https://codeclimate.com/github/celluloid/reel.png)](https://codeclimate.com/github/celluloid/reel)
-[![Coverage Status](https://coveralls.io/repos/celluloid/reel/badge.png?branch=master)](https://coveralls.io/r/celluloid/reel)
+[![Gem Version](https://badge.fury.io/rb/reel.svg)](http://rubygems.org/gems/reel)
+[![Build Status](https://secure.travis-ci.org/celluloid/reel.svg?branch=master)](http://travis-ci.org/celluloid/reel)
+[![Code Climate](https://codeclimate.com/github/celluloid/reel.svg)](https://codeclimate.com/github/celluloid/reel)
+[![Coverage Status](https://coveralls.io/repos/celluloid/reel/badge.svg?branch=master)](https://coveralls.io/r/celluloid/reel)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/celluloid/reel/master/LICENSE.txt)
 
 > "A dizzying lifetime... reeling by on celluloid" _-- Rush / Between The Wheels_
 
@@ -34,34 +35,6 @@ primarily I/O bound, and threads for where you're compute bound.
 
 [Yes](http://news.ycombinator.com/item?id=3067434)
 
-Here's a "hello world" web server benchmark, run on a 2GHz i7 (OS X 10.7.3).
-All servers used in a single-threaded mode.
-
-Reel performance on various Ruby VMs:
-
-```
-# httperf --num-conns=50 --num-calls=1000
-
-Ruby Version        Throughput    Latency
-------------        ----------    -------
-JRuby 1.7.0         3978 req/s    (0.3 ms/req)
-rbx HEAD            2288 reqs/s   (0.4 ms/req)
-Ruby 1.9.3          2071 req/s    (0.5 ms/req)
-```
-
-Comparison with other web servers:
-
-```
-Web Server          Throughput    Latency
-----------          ----------    -------
-Goliath (0.9.4)     2058 reqs/s   (0.5 ms/req)
-Thin    (1.2.11)    7502 reqs/s   (0.1 ms/req)
-Node.js (0.6.5)     11735 reqs/s  (0.1 ms/req)
-```
-
-All Ruby benchmarks done on Ruby 1.9.3. Latencies given are average-per-request
-and are not amortized across all concurrent requests.
-
 Documentation
 -------------
 
@@ -133,6 +106,7 @@ applications.
 Reel lets you pass a block to initialize which receives connections:
 
 ```ruby
+require 'celluloid/autostart'
 require 'reel'
 
 Reel::Server::HTTP.supervise("0.0.0.0", 3000) do |connection|
@@ -164,6 +138,7 @@ Reel::WebSocket object for WebSockets connections.
 You can also subclass Reel, which allows additional customizations:
 
 ```ruby
+require 'celluloid/autostart'
 require 'reel'
 
 class MyServer < Reel::Server::HTTP
@@ -194,16 +169,24 @@ end
 MyServer.run
 ```
 
+Supported Ruby Versions
+-----------------------
+
+This library supports and is tested against the following Ruby versions:
+
+* Ruby (MRI) 2.0, 2.1, 2.2, 2.3
+* JRuby 9000
+
 Contributing
 ------------
 
-* Fork this repository on github
-* Make your changes and send me a pull request
-* If I like them I'll merge them
-* If I've accepted a patch, feel free to ask for commit access
+* Fork this repository on GitHub
+* Make your changes and send us a pull request
+* If we like them we'll merge them
+* If we've accepted a patch, feel free to ask for commit access
 
 License
 -------
 
-Copyright (c) 2012 Tony Arcieri. Distributed under the MIT License. See
+Copyright (c) 2012-2016 Tony Arcieri. Distributed under the MIT License. See
 LICENSE.txt for further details.

data/Rakefile

@@ -1,9 +1,6 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
 
-Dir["tasks/**/*.rake"].each { |task| load task }
+Dir[File.expand_path("../tasks/**/*.rake", __FILE__)].each { |task| load task }
 
-default_tasks = ["spec"]
-default_tasks << "rubocop" unless ENV["CI"]
-task default: default_tasks
-
-task ci: %w(spec benchmark)
+task :default => :spec

data/examples/roundtrip.rb

@@ -24,7 +24,7 @@ end
 class Writer
   include Celluloid
   include Celluloid::Notifications
-  include Celluloid::Internals::Logger
+  include Celluloid::Logger
 
   def initialize(websocket)
     info "Writing to socket"
@@ -44,7 +44,7 @@ end
 class Reader
   include Celluloid
   include Celluloid::Notifications
-  include Celluloid::Internals::Logger
+  include Celluloid::Logger
 
   def initialize(websocket)
     info "Reading socket"
@@ -62,7 +62,7 @@ class Reader
 end
 
 class WebServer < Reel::Server::HTTP
-  include Celluloid::Internals::Logger
+  include Celluloid::Logger
 
   def initialize(host = "0.0.0.0", port = 9000)
     info "Roundtrip example starting on #{host}:#{port}"

data/examples/server_sent_events.rb

@@ -9,7 +9,7 @@ require 'reel'
 
 
 class ServerSentEvents < Reel::Server::HTTP
-  include Celluloid::Internals::Logger
+  include Celluloid::Logger
   
   def initialize(ip = '127.0.0.1', port = 63310)
     @connections = []

data/examples/websockets.rb

@@ -22,7 +22,7 @@ end
 class TimeClient
   include Celluloid
   include Celluloid::Notifications
-  include Celluloid::Internals::Logger
+  include Celluloid::Logger
 
   def initialize(websocket)
     info "Streaming time changes to client"
@@ -39,7 +39,7 @@ class TimeClient
 end
 
 class WebServer < Reel::Server::HTTP
-  include Celluloid::Internals::Logger
+  include Celluloid::Logger
 
   def initialize(host = "127.0.0.1", port = 1234)
     info "Time server example starting on #{host}:#{port}"

data/lib/reel.rb

@@ -1,6 +1,5 @@
 require 'uri'
 
-require 'celluloid/autostart'
 require 'http/parser'
 require 'http'
 require 'celluloid/io'
@@ -15,7 +14,6 @@ require 'reel/response'
 require 'reel/server'
 require 'reel/server/http'
 require 'reel/server/https'
-require 'reel/server/unix' unless RUBY_PLATFORM == 'java'
 
 require 'reel/websocket'
 require 'reel/stream'

data/lib/reel/connection.rb

@@ -56,7 +56,7 @@ module Reel
 
       req = @parser.current_request
       @request_fsm.transition :headers
-      @keepalive = false if req.nil? || req[CONNECTION] == CLOSE || req.version == HTTP_VERSION_1_0
+      @keepalive = false if req[CONNECTION] == CLOSE || req.version == HTTP_VERSION_1_0
       @current_request = req
 
       req

data/lib/reel/request/parser.rb

@@ -43,11 +43,7 @@ module Reel
 
       def readpartial(size = @buffer_size)
         bytes = @socket.readpartial(size)
-        begin
-          @parser << bytes
-        rescue ArgumentError
-          raise Errno::EPIPE
-        end
+        @parser << bytes
       end
 
       #

data/lib/reel/server.rb

@@ -2,14 +2,14 @@ module Reel
   # Base class for Reel servers.
   #
   # This class is a Celluloid::IO actor which provides a barebones server
-  # which does not open a socket itself, it just begin handling connections
-  # once initialized with a specific kind of protocol-based server.
+  # which does not open a socket itself, it just begin handling connections once
+  # initialized with a specific kind of protocol-based server.
 
   # For specific protocol support, use:
 
   # Reel::Server::HTTP
   # Reel::Server::HTTPS
-  # Reel::Server::UNIX ( not on jRuby yet )
+  # Coming soon: Reel::Server::UNIX
 
   class Server
     include Celluloid::IO
@@ -25,15 +25,6 @@ module Reel
       @callback = callback
       @server   = server
 
-      @options[:rescue] ||= []
-      @options[:rescue] += [
-        Errno::ECONNRESET,
-        Errno::EPIPE,
-        Errno::EINPROGRESS,
-        Errno::ETIMEDOUT,
-        Errno::EHOSTUNREACH
-      ]
-
       @server.listen(options.fetch(:backlog, DEFAULT_BACKLOG))
 
       async.run
@@ -44,15 +35,7 @@ module Reel
     end
 
     def run
-      loop {
-        begin
-          socket = @server.accept
-        rescue *@options[:rescue] => ex
-          Logger.warn "Error accepting socket: #{ex.class}: #{ex.to_s}"
-          next
-        end
-        async.handle_connection socket
-      }
+      loop { async.handle_connection @server.accept }
     end
 
     def handle_connection(socket)

data/lib/reel/server/https.rb

@@ -27,11 +27,12 @@ module Reel
 
         # if verify_mode isn't explicitly set, verify peers if we've
         # been provided CA information that would enable us to do so
-        ssl_context.verify_mode = if options.include?(:verify_mode)
+        ssl_context.verify_mode = case
+        when options.include?(:verify_mode)
           options[:verify_mode]
-        elsif options.include?(:ca_file)
+        when options.include?(:ca_file)
           OpenSSL::SSL::VERIFY_PEER
-        elsif options.include?(:ca_path)
+        when options.include?(:ca_path)
           OpenSSL::SSL::VERIFY_PEER
         else
           OpenSSL::SSL::VERIFY_NONE
@@ -42,10 +43,22 @@ module Reel
         server = Celluloid::IO::SSLServer.new(@tcpserver, ssl_context)
         options.merge!(host: host, port: port)
 
-        options[:rescue] = [ OpenSSL::SSL::SSLError ]
-        
         super(server, options, &callback)
       end
+
+      def run
+        loop do
+          begin
+            socket = @server.accept
+          rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::EPIPE,
+                 Errno::ETIMEDOUT, Errno::EHOSTUNREACH => ex
+            Logger.warn "Error accepting SSLSocket: #{ex.class}: #{ex.to_s}"
+            retry
+          end
+
+          async.handle_connection socket
+        end
+      end
     end
   end
 end

data/lib/reel/stream.rb

@@ -73,7 +73,7 @@ module Reel
     # finish does not actually close the socket,
     # it only inform the browser there are no more messages
     def finish
-      write "0#{Response::Writer::CRLF * 2}"
+      write ""
     end
 
     def close

data/lib/reel/version.rb

@@ -1,4 +1,4 @@
 module Reel
-  VERSION  = "0.6.0.pre5"
+  VERSION  = "0.6.0"
   CODENAME = "Garland"
 end

data/lib/reel/websocket.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require 'websocket/driver'
+require 'rack'
 
 module Reel
   class WebSocket
@@ -9,11 +10,10 @@ module Reel
 
     attr_reader :socket
     def_delegators :@socket, :addr, :peeraddr
-    def_delegators :@driver, :ping
 
     def initialize(info, connection)
-      driver_env = DriverEnvironment.new(info, connection.socket)
-
+      driver_env = DriverEnvironment.new(info, connection.socket)      
+      
       @socket = connection.hijack_socket
       @request_info = info
 
@@ -98,19 +98,19 @@ module Reel
 
       def_delegators :socket, :write
 
-      RACK_HEADERS = {
-        'Origin'                   => 'HTTP_ORIGIN',
-        'Sec-WebSocket-Key'        => 'HTTP_SEC_WEBSOCKET_KEY',
-        'Sec-WebSocket-Key1'       => 'HTTP_SEC_WEBSOCKET_KEY1',
-        'Sec-WebSocket-Key2'       => 'HTTP_SEC_WEBSOCKET_KEY2',
-        'Sec-WebSocket-Extensions' => 'HTTP_SEC_WEBSOCKET_EXTENSIONS',
-        'Sec-WebSocket-Protocol'   => 'HTTP_SEC_WEBSOCKET_PROTOCOL',
-        'Sec-WebSocket-Version'    => 'HTTP_SEC_WEBSOCKET_VERSION'
-      }
-
       def initialize(info, socket)
-        @env, @url = {}, info.url
-        RACK_HEADERS.each {|k,v| @env[v] = info.headers[k]}
+        @url = info.url
+
+        env_hash = Hash[info.headers.map { |key, value| ['HTTP_' + key.upcase.gsub('-','_'),value ] }]
+        
+        env_hash.merge!({
+          :method       => info.method,
+          :input        => info.body.to_s,
+          'REMOTE_ADDR' => info.remote_addr
+        })
+
+        @env = ::Rack::MockRequest.env_for(@url, env_hash)
+
         @socket = socket
       end
     end

data/reel.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../culture/sync", __FILE__)
+require File.expand_path('../lib/reel/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Tony Arcieri", "digitalextremist //"]
-  gem.email         = ["tony.arcieri@gmail.com", "code@extremist.digital"]
-  gem.description   = "A Celluloid::IO-powered multi-protocol HTTP, HTTPS, and Web Socket server"
-  gem.summary       = "A Reel good web server"
+  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.homepage      = "https://github.com/celluloid/reel"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -15,14 +15,15 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Reel::VERSION
 
-  gem.add_runtime_dependency 'celluloid-io', '>= 0.16.5.pre0'
-
-  Celluloid::Sync::Gemspec[gem]
-
-  gem.add_runtime_dependency 'http', '>= 0.6.0.pre'
-  gem.add_runtime_dependency 'http_parser.rb', '>= 0.6.0'
+  gem.add_runtime_dependency 'celluloid',        '>= 0.15.1'
+  gem.add_runtime_dependency 'celluloid-io',     '>= 0.15.0'
+  gem.add_runtime_dependency 'http',             '>= 0.6.0.pre'
+  gem.add_runtime_dependency 'http_parser.rb',   '>= 0.6.0'
   gem.add_runtime_dependency 'websocket-driver', '>= 0.5.1'
-  gem.add_runtime_dependency 'websocket_parser', '>= 0.1.6'
+  gem.add_runtime_dependency 'rack'
 
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '>= 2.11.0'
   gem.add_development_dependency 'certificate_authority'
+  gem.add_development_dependency 'websocket_parser', '>= 0.1.6'
 end

data/spec/reel/http_server_spec.rb

@@ -14,7 +14,9 @@ RSpec.describe Reel::Server::HTTP do
         expect(request.method).to eq 'GET'
         expect(request.version).to eq "1.1"
         expect(request.url).to eq example_path
+
         connection.respond :ok, response_body
+      rescue => ex
       end
     end
 
@@ -34,6 +36,7 @@ RSpec.describe Reel::Server::HTTP do
         request = connection.request
         expect(request.method).to eq 'POST'
         connection.respond :ok, request.body.to_s
+      rescue => ex
       end
     end
 

data/spec/reel/https_server_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'net/http'
 
 RSpec.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) }
@@ -25,7 +24,9 @@ RSpec.describe Reel::Server::HTTPS do
         expect(request.method).to eq 'GET'
         expect(request.version).to eq "1.1"
         expect(request.url).to eq example_path
+
         connection.respond :ok, response_body
+      rescue => ex
       end
     end
 
@@ -33,15 +34,17 @@ RSpec.describe Reel::Server::HTTPS 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)
+
       expect(response.body).to eq response_body
     end
 
     raise ex if ex
   end
 
-  it "verifies client SSL certs when provided with a CA" do
+  it 'verifies client SSL certs when provided with a CA' do
     ex = nil
 
     handler = proc do |connection|
@@ -50,7 +53,9 @@ RSpec.describe Reel::Server::HTTPS do
         expect(request.method).to eq 'GET'
         expect(request.version).to eq '1.1'
         expect(request.url).to eq example_path
+
         connection.respond :ok, response_body
+      rescue => ex
       end
     end
 
@@ -60,15 +65,17 @@ RSpec.describe Reel::Server::HTTPS do
       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)
+
       expect(response.body).to eq response_body
     end
 
     raise ex if ex
   end
 
-  it "fails to verify client certificates that aren't signed" do
+  it %{fails to verify client certificates that aren't signed} do
     ex = nil
 
     handler = proc do |connection|
@@ -77,7 +84,9 @@ RSpec.describe Reel::Server::HTTPS do
         expect(request.method).to eq 'GET'
         expect(request.version).to eq '1.1'
         expect(request.url).to eq example_path
+
         connection.respond :ok, response_body
+      rescue => ex
       end
     end
 
@@ -87,7 +96,9 @@ RSpec.describe Reel::Server::HTTPS do
       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)
+
       expect { http.request(request) }.to raise_error(OpenSSL::SSL::SSLError)
     end
 

data/spec/reel/websocket_spec.rb

@@ -61,10 +61,12 @@ RSpec.describe Reel::WebSocket do
 
   describe "WebSocket#next_message" do
     it "triggers on the next sent message" do
+      skip "update to new Celluloid internal APIs"
+
       with_websocket_pair do |client, websocket|
         f = Celluloid::Future.new
         websocket.on_message do |message|
-          f << Celluloid::Internals::Response::Success.new(:on_message, message)
+          f << Celluloid::SuccessResponse.new(:on_message, message)
         end
 
         message = WebSocket::Message.new(example_message)
@@ -80,6 +82,8 @@ RSpec.describe Reel::WebSocket do
 
   describe "WebSocket#read_every" do
     it "automatically executes read" do
+      skip "update to new Celluloid internal APIs"
+
       with_websocket_pair do |client, websocket|
         class MyActor
           include Celluloid
@@ -91,7 +95,7 @@ RSpec.describe Reel::WebSocket do
 
         f = Celluloid::Future.new
         websocket.on_message do |message|
-          f << Celluloid::Internals::Response::Success.new(:on_message, message)
+          f << Celluloid::SuccessResponse.new(:on_message, message)
         end
 
         message = WebSocket::Message.new(example_message)

metadata

@@ -1,351 +1,166 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre5
+  version: 0.6.0
 platform: ruby
 authors:
 - Tony Arcieri
-- digitalextremist //
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.16.5.pre0
-  name: celluloid-io
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.16.5.pre0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: bundler
-  prerelease: false
+        version: 0.15.1
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: nenv
   prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
+  name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: dotenv
-  prerelease: false
+        version: 0.15.0
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: benchmark_suite
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rubocop
+        version: 0.6.0.pre
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0.pre
 - !ruby/object:Gem::Dependency
+  name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: pry
+        version: 0.6.0
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
+  name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rake
+        version: 0.5.1
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: coveralls
-  prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.17.0.pre12
-  name: celluloid
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.17.0.pre12
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: celluloid-essentials
   prerelease: false
-  type: :development
   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'
-  name: celluloid-supervision
-  prerelease: false
+        version: 2.11.0
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: celluloid-pool
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
+  name: certificate_authority
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: celluloid-fsm
-  prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: celluloid-extras
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: websocket_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  name: timers
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  name: rspec-logsplit
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0.pre
-  name: http
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0.pre
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  name: http_parser.rb
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  name: websocket-driver
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
-  name: websocket_parser
+  type: :development
   prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: certificate_authority
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: A Celluloid::IO-powered multi-protocol HTTP, HTTPS, and Web Socket server
+description: A Celluloid::IO-powered HTTP server
 email:
 - tony.arcieri@gmail.com
-- code@extremist.digital
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -376,7 +191,6 @@ files:
 - lib/reel/server.rb
 - lib/reel/server/http.rb
 - lib/reel/server/https.rb
-- lib/reel/server/unix.rb
 - lib/reel/spy.rb
 - lib/reel/stream.rb
 - lib/reel/version.rb
@@ -390,35 +204,42 @@ files:
 - spec/reel/https_server_spec.rb
 - spec/reel/response/writer_spec.rb
 - spec/reel/response_spec.rb
-- spec/reel/unix_server_spec.rb
 - spec/reel/websocket_spec.rb
 - spec/spec_helper.rb
 - spec/support/create_certs.rb
 - spec/support/example_request.rb
-- tasks/benchmarks.rake
 - tasks/rspec.rake
-- tasks/rubocop.rake
 homepage: https://github.com/celluloid/reel
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 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: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
-summary: A Reel good web server
-test_files: []
+summary: A Reel good HTTP server
+test_files:
+- spec/fixtures/example.txt
+- 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/websocket_spec.rb
+- spec/spec_helper.rb
+- spec/support/create_certs.rb
+- spec/support/example_request.rb

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "culture"]
-	path = culture
-	url = http://github.com/celluloid/culture.git

data/lib/reel/server/unix.rb

@@ -1,18 +0,0 @@
-module Reel
-  class Server
-    class UNIX < Server
-
-      # Create a new Reel HTTPS server
-      #
-      # @option options [String] socket path to bind to
-      # @option options [Fixnum] backlog of requests to accept
-      #
-      # @return [Reel::Server::UNIX] Reel UNIX server actor
-      def initialize(socket_path, options={}, &callback)
-        server = Celluloid::IO::UNIXServer.new(socket_path)
-        options[:socket_path] = socket_path
-        super(server, options, &callback)
-      end
-    end
-  end
-end

data/spec/reel/unix_server_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-require 'net/http'
-
-unless RUBY_PLATFORM == 'java'
-
-  RSpec.describe Reel::Server::UNIX do
-    let(:endpoint) { URI(example_url) }
-    let(:response_body) { "ohai thar" }
-
-    it 'allows connections over UNIX sockets' do
-      ex = nil
-
-      handler = proc do |connection|
-        begin
-          request = connection.request
-          expect( request.method ).to eq 'GET'
-          connection.respond :ok, self.response_body
-        end
-      end
-
-      Dir::Tmpname.create('reel-sock') do |path|
-        begin
-          server  = Reel::Server::UNIX.new(path, &handler)
-          sock    = Net::BufferedIO.new Celluloid::IO::UNIXSocket.new(path)
-          request = Net::HTTP::Get.new('/')
-
-          request.exec(sock, '1.1', path)
-          response = Net::HTTPResponse.read_new(sock)
-          response.reading_body(sock, request.response_body_permitted?) { }
-
-          expect(response.body).to eq(self.response_body)
-        ensure
-          server.terminate if server && server.alive?
-        end
-      end
-
-      raise ex if ex
-    end
-  end
-  
-end

data/tasks/benchmarks.rake

@@ -1,16 +0,0 @@
-require "timeout"
-
-desc "Run Reel benchmarks"
-task :benchmark do
-  begin
-    Timeout.timeout(120) do
-      glob = File.expand_path("../../benchmarks/*.rb", __FILE__)
-      Dir[glob].each { |benchmark| load benchmark }
-    end
-  rescue Exception, Timeout::Error => ex
-    puts "ERROR: Couldn't complete benchmark: #{ex.class}: #{ex}"
-    puts "  #{ex.backtrace.join("\n  ")}"
-
-    exit 1 unless ENV["CI"] # Hax for running benchmarks on Travis
-  end
-end

data/tasks/rubocop.rake

@@ -1,4 +0,0 @@
-unless ENV["CI"]
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new
-end