websocket-rack 0.3.3 → 0.4.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.0 / 2012-04-16
+
+- require EventMachine ~> 1.0.0.beta.4 (support for old version was to confusing for a lot of users)
+- remove thin-websocket wrapper
+
 ## 0.3.3 / 2012-02-16
 
 - postponse sending messages and closing connection to next tick(prevent locking rest of current request)

data/README.md

@@ -185,10 +185,6 @@ Thin v1.2.8 have --ssl option - just use that! :)
 
 Check [Thin](http://code.macournoyer.com/thin/) config - any option supported by Thin(like demonizing, SSL etc.) is supported by WebSocket-Rack.
 
-### Why (using Thin) user is disconnected after 30 seconds?
-
-This is bug in EventMachine < 1.0.0. Please consider updating to newer version or use thin-websocket wrapper around thin binary.
-
 ## About
 
 Author: Bernard Potocki <<bernard.potocki@imanel.org>>

data/lib/rack/websocket/handler/base/connection.rb

@@ -58,12 +58,6 @@ module Rack
             socket.websocket = self
             socket.comm_inactivity_timeout = 0
 
-            if socket.comm_inactivity_timeout != 0
-              puts "WARNING: You are using old EventMachine version. " +
-                   "Please consider updating to EM version >= 1.0.0 " +
-                   "or running Thin using thin-websocket."
-            end
-
             debug [:initialize]
           end
 

data/lib/rack/websocket/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module WebSocket
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

data/websocket-rack.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rack'
   s.add_dependency 'em-websocket', '~> 0.3.6'
+  s.add_dependency 'eventmachine', '~> 1.0.0.beta.4'
   s.add_dependency 'thin' # Temporary until we support more servers
   s.add_development_dependency 'rspec', '~> 2.4.0'
   s.add_development_dependency 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rack
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70187912377380 !ruby/object:Gem::Requirement
+  requirement: &70359971546820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187912377380
+  version_requirements: *70359971546820
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70187912376880 !ruby/object:Gem::Requirement
+  requirement: &70359971572660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70187912376880
+  version_requirements: *70359971572660
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70359971572160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70359971572160
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70187912376460 !ruby/object:Gem::Requirement
+  requirement: &70359971571780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187912376460
+  version_requirements: *70359971571780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70187912375920 !ruby/object:Gem::Requirement
+  requirement: &70359971571240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70187912375920
+  version_requirements: *70359971571240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70187912375500 !ruby/object:Gem::Requirement
+  requirement: &70359971570820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,12 +76,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187912375500
+  version_requirements: *70359971570820
 description: Rack-based WebSocket server
 email:
 - bernard.potocki@imanel.org
-executables:
-- thin-websocket
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -80,7 +90,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/thin-websocket
 - example/example.ru
 - example/html/FABridge.js
 - example/html/WebSocketMain.swf

data/bin/thin-websocket

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-# Modified Thin command line interface script.
-# This is fallback for WebSocket-Rack.
-# Use it when you have EventMachine version < 1.0.0
-# Rationale:
-#   Older versions of EM have bug that prevent to
-#   clearing connection inactivity once it's set.
-#   This one will set connection timeout to 0 at
-#   default, so there will be no need to overwrite it.
-#   Be aware that this will also change inactivity
-#   timeout for "normal" connection, so it will be
-#   easy to make DoS attack.
-
-require 'rubygems'
-require 'thin'
-
-if EM::VERSION < "1.0.0"
-  begin
-    old_verbose, $VERBOSE = $VERBOSE, nil
-    ::Thin::Server.const_set 'DEFAULT_TIMEOUT', 0
-  ensure
-    $VERBOSE = old_verbose
-  end
-end
-
-Thin::Runner.new(ARGV).run!