reel 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce24f419ce91dd55a85503c2540abea3c2c79d9
-  data.tar.gz: 8a5adfc3c0a04db334dbacdc70f4748bab8c5b41
+  metadata.gz: 27ae07b4f60f202562fa1ec10b4830370348b1eb
+  data.tar.gz: d98ee1efa426485d3c2846b93f28efd102ffa26c
 SHA512:
-  metadata.gz: e46d0cb9591419a96bdc072256f6329d5b75272f753137ac90984a06afa89cf52bb8a2f08b92adbc0314f7fef2933f75b524cec26c04ee6018e59d0401c9a9a7
-  data.tar.gz: 40ff868aee4a82390395cf210970ae4e6603e84772bab12c56890fbbee979d6086ef13a6037ed71e7e5be2ab5b23ba8ecf87c721837a51abd1c01c6c3ecee98f
+  metadata.gz: e09edac0eb23863984a25d88c4c27a23ecedbf0334cd0cd1f5eb73a5fda21c86a9f4229548f69c2fe8ab8772b8974efcad7abd8393b67fb05424b9608558ade0
+  data.tar.gz: c917765676238a5191def17263161ca0b481506e6017193671f588dda4c901dd7759e83771ed455db600e1561416db3e5db825a0aed327e464f854c64981eef3

data/CHANGES.md

@@ -1,47 +1,53 @@
-## 0.6.0 (2016-02-13)
+## 0.6.1 (2016-03-14)
 
-* [#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.
+* [#221](https://github.com/celluloid/reel/pull/221)
+  Remove rack dependency. Add WebSocket ping forward.
   (**@kenichi**)
 
-* [#155](https://github.com/celluloid/reel/pull/155):
-  Handle Errno::ECONNRESET in SSL server.
-  (**@czaks**)
+## 0.6.0 "Garland" (2016-02-13)
 
-* [#162](https://github.com/celluloid/reel/pull/162):
-  Fix for #150: Reel::StateError: already processing
-  a request when client is killed.
-  (**@artcom**)
+* [#214](https://github.com/celluloid/reel/pull/214):
+  Fix ChunkStream termination.
+  (**@ogoid**)
 
-* [#166](https://github.com/celluloid/reel/pull/166):
-  Switch to websocket-driver gem.
+* [#182](https://github.com/celluloid/reel/pull/182):
+  Do not allow transitioning out of closed.
+  (**@zanker**)
+
+* [#168](https://github.com/celluloid/reel/pull/168):
+  Revert removal of addr and peeraddr delegates.
   (**@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.
+* [#166](https://github.com/celluloid/reel/pull/166):
+  Switch to websocket-driver gem.
   (**@d-snp**)
 
-* [#182](https://github.com/celluloid/reel/pull/182):
-  Do not allow transitioning out of closed.
-  (**@zanker**)
+* [#162](https://github.com/celluloid/reel/pull/162):
+  Fix for #150: Reel::StateError: already processing
+  a request when client is killed.
+  (**@artcom**)
 
-* [#214](https://github.com/celluloid/reel/pull/214):
-  Fix ChunkStream termination.
-  (**@ogoid**)
+* [#155](https://github.com/celluloid/reel/pull/155):
+  Handle Errno::ECONNRESET in SSL server.
+  (**@czaks**)
+
+* [#152](https://github.com/celluloid/reel/pull/152):
+  Case insensitivity for header field names.
+  (**@kenichi**)
+
+* [#151](https://github.com/celluloid/reel/pull/151):
+  Support for new http.rb gem API.
+  (**@ixti**)
+
+* [#148](https://github.com/celluloid/reel/pull/148):
+  Fix stack level too deep when writing to ChunkStream.
+  (**@bastjan**)
 
-## 0.5.0 (2014-04-15)
+## 0.5.0 "Bette" (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
@@ -51,7 +57,7 @@
 * Ensure response bodies are always closed
 * Support for passing a fixnum status to Connection#respond
 
-## 0.4.0
+## 0.4.0 "Garbo"
 
 * Rack adapter moved to the reel-rack project
 * Pipelining support

data/lib/reel/version.rb

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

data/lib/reel/websocket.rb

@@ -1,6 +1,5 @@
 require 'forwardable'
 require 'websocket/driver'
-require 'rack'
 
 module Reel
   class WebSocket
@@ -10,10 +9,11 @@ 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
 
@@ -94,24 +94,24 @@ module Reel
     class DriverEnvironment
       extend Forwardable
 
-      attr_reader :env, :url, :socket
-
-      def_delegators :socket, :write
-
-      def initialize(info, socket)
-        @url = info.url
+      attr_reader :env, :socket
 
-        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
-        })
+      def_delegator :@info, :url
+      def_delegator :@socket, :write
 
-        @env = ::Rack::MockRequest.env_for(@url, env_hash)
+      RACK_HEADERS = {
+        'HTTP_ORIGIN'                   => 'Origin',
+        'HTTP_SEC_WEBSOCKET_KEY'        => 'Sec-WebSocket-Key',
+        'HTTP_SEC_WEBSOCKET_KEY1'       => 'Sec-WebSocket-Key1',
+        'HTTP_SEC_WEBSOCKET_KEY2'       => 'Sec-WebSocket-Key2',
+        'HTTP_SEC_WEBSOCKET_EXTENSIONS' => 'Sec-WebSocket-Extensions',
+        'HTTP_SEC_WEBSOCKET_PROTOCOL'   => 'Sec-WebSocket-Protocol',
+        'HTTP_SEC_WEBSOCKET_VERSION'    => 'Sec-WebSocket-Version'
+      }.freeze
 
-        @socket = socket
+      def initialize(info, socket)
+        @info, @socket = info, socket
+        @env = Hash.new {|h,k| @info.headers[RACK_HEADERS[k]]}
       end
     end
 

data/reel.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   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 'rack'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>= 2.11.0'

data/spec/reel/websocket_spec.rb

@@ -173,6 +173,20 @@ RSpec.describe Reel::WebSocket do
     end
   end
 
+  it "pings clients" do
+    with_websocket_pair do |client, websocket|
+      websocket.ping "<3"
+
+      pinger = double "pinger"
+      expect(pinger).to receive(:ping) { |msg| expect(msg).to eq("<3") }
+
+      parser = WebSocket::Parser.new
+      parser.on_ping { |msg| pinger.ping msg }
+
+      parser << client.readpartial(4096)
+    end
+  end
+
   def with_websocket_pair
     with_socket_pair do |client, peer|
       connection = Reel::Connection.new(peer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement