reel 0.6.0.pre1 → 0.6.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1a993a695b913f3274786678b7a8080749b5e2b
-  data.tar.gz: fcdccf97f738d01e317292f4f5499f8990d3948a
+  metadata.gz: 37c2a121aacbd4e703ab370edb1f7e5a2b6207b5
+  data.tar.gz: 2cadca939df61f1ec640d9043291580f67f49fe3
 SHA512:
-  metadata.gz: a25fb72f593a8f05bae8272a4e5d3aeec408af15673ec05216b9abcaf2fae06f127e08f88b7cccc2f0c42f86a319e0ae2ae26bf6c22e7599c5da3fb52f4d8c76
-  data.tar.gz: 0707f29757b92d69e6b9c025702fc2da0823e8e19164c8b3a81f5347d4de3f2f71fb4b94f7000eb9c6dc4bb5d9609185b4a7df61e3211b86d789b0175658b16a
+  metadata.gz: 22d122ff37bc6e4b755465306d40c09d272c420c67aa4b4979efe1169bffffb6e077c8a7b4b9d48703ad118ea7022abc52a095ff7ce61d2efa44504178bcaf42
+  data.tar.gz: ac2e9e5ebf765d08ee9ab6caa2e43236d77cd818d0234bf513ce6848422a0909e9416792d9513ef96bed778e196150618ce6913130b9513dd7e864f5915899db

data/lib/reel/request/state_machine.rb

@@ -18,9 +18,11 @@ module Reel
         @hijacked = true
       end
 
-      state :closed do
+      # FSM fails open for valid transitions
+      # Set an empty array to disallow transitioning out of closed
+      state :closed, :to => [] do
         @socket.close unless @hijacked || @socket.closed?
       end
     end
   end
-end
+end

data/lib/reel/version.rb

@@ -1,4 +1,4 @@
 module Reel
-  VERSION  = "0.6.0.pre1"
+  VERSION  = "0.6.0.pre2"
   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
 
@@ -98,19 +98,19 @@ module Reel
 
       def_delegators :socket, :write
 
-      def initialize(info, socket)
-        @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)
+      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]}
         @socket = socket
       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'

metadata

@@ -1,150 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre1
+  version: 0.6.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: celluloid
-  prerelease: false
   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
-  type: :runtime
   name: celluloid-io
-  prerelease: false
   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
-  type: :runtime
   name: http
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0.pre
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0.pre
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: http_parser.rb
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: websocket-driver
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
   type: :runtime
-  name: rack
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rake
-  prerelease: false
   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
-  type: :development
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
-  type: :development
   name: certificate_authority
-  prerelease: false
   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
-  type: :development
   name: websocket_parser
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="