sinatra-rocketio 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.5 2013-03-18
+
+* fix gem load flow
+
 === 0.0.4 2013-03-18
 
 * fix gem dependencies

data/README.md

@@ -4,6 +4,7 @@ sinatra-rocketio
 * Node.js like I/O plugin for Sinatra.
 * Automatically selects from Comet and WebSocket.
 * https://github.com/shokai/sinatra-rocketio
+* https://github.com/shokai/sinatra-rocketio/wiki
 * [Handle 10K+ clients on 1 process](https://github.com/shokai/sinatra-websocketio/wiki/C10K)
 
 
@@ -148,6 +149,7 @@ Sample App
 chat app
 
 - https://github.com/shokai/sinatra-rocketio/tree/master/sample
+- http://rocketio-chat.herokuapp.com
 
 
 Contributing

data/lib/sinatra-rocketio/application.rb

@@ -8,12 +8,11 @@ module Sinatra
           sleep 1
         end
         if options[:comet]
-          require 'sinatra/cometio'
           app.register Sinatra::CometIO
         end
         if options[:websocket]
-          require 'sinatra/websocketio'
           app.register Sinatra::WebSocketIO
+          Sinatra::WebSocketIO.start
         end
         app.get '/rocketio/rocketio.js' do
           content_type 'application/javascript'

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/sinatra/rocketio.rb

@@ -1,5 +1,7 @@
 require 'eventmachine'
 require 'event_emitter'
+require 'sinatra/cometio'
+require 'sinatra/websocketio_nostart'
 require File.expand_path '../sinatra-rocketio/version', File.dirname(__FILE__)
 require File.expand_path '../sinatra-rocketio/helpers', File.dirname(__FILE__)
 require File.expand_path '../sinatra-rocketio/options', File.dirname(__FILE__)

data/sample/Gemfile

@@ -5,7 +5,7 @@ gem 'rack'
 gem 'sinatra'
 gem 'thin'
 gem 'event_emitter'
-gem 'sinatra-cometio'
-gem 'sinatra-websocketio'
+gem 'sinatra-cometio', '>= 0.3.5'
+gem 'sinatra-websocketio', '>= 0.1.3'
 gem 'haml'
 gem 'sass'

data/sample/Gemfile.lock

@@ -36,7 +36,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    sinatra-cometio (0.3.4)
+    sinatra-cometio (0.3.5)
       event_emitter (>= 0.2.3)
       eventmachine (>= 1.0.0)
       httparty (>= 0.10.2)
@@ -51,15 +51,15 @@ GEM
       rack-test
       sinatra (~> 1.3.0)
       tilt (~> 1.3)
-    sinatra-websocketio (0.1.1)
-      em-websocket
-      em-websocket-client
-      event_emitter (>= 0.2.0)
-      eventmachine
-      json
-      rack
-      sinatra
-      sinatra-contrib
+    sinatra-websocketio (0.1.3)
+      em-websocket (>= 0.5.0)
+      em-websocket-client (>= 0.1.1)
+      event_emitter (>= 0.2.3)
+      eventmachine (>= 1.0.0)
+      json (>= 1.7.0)
+      rack (>= 1.5.0)
+      sinatra (>= 1.3.6)
+      sinatra-contrib (>= 1.3.2)
     thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -78,6 +78,6 @@ DEPENDENCIES
   rack
   sass
   sinatra
-  sinatra-cometio
-  sinatra-websocketio
+  sinatra-cometio (>= 0.3.5)
+  sinatra-websocketio (>= 0.1.3)
   thin

data/sample/README.md

@@ -15,20 +15,8 @@ Install Dependencies
 Run
 ---
 
+    % export PORT=5000
+    % export WS_PORT=8080
     % foreman start
 
 => http://localhost:5000
-
-
-Deploy Heroku
--------------
-
-    % mkdir ~/rocketio-sample
-    % cp -R ./ ~/rocketio-sample/
-    % cd ~/rocketio-sample
-    % git init
-    % git add ./
-    % git commit -m "first sample chat"
-    % heroku create --stack cedar
-    % git push heroku master
-    % heroku open

data/sample/config.ru

@@ -12,7 +12,7 @@ require File.dirname(__FILE__)+'/main'
 
 set :haml, :escape_html => true
 set :cometio, :timeout => 120
-set :websocketio, :port => 8080
+set :websocketio, :port => (ENV['WS_PORT'].to_i || 8080)
 set :rocketio, :comet => true, :websocket => true
 
 case RUBY_PLATFORM

data/sinatra-rocketio.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "eventmachine", ">= 1.0.0"
   gem.add_dependency "event_emitter", ">= 0.2.3"
   gem.add_dependency "sinatra-contrib", ">= 1.3.2"
-  gem.add_dependency "sinatra-cometio", ">= 0.3.4"
-  gem.add_dependency "sinatra-websocketio", ">= 0.1.2"
+  gem.add_dependency "sinatra-cometio", ">= 0.3.5"
+  gem.add_dependency "sinatra-websocketio", ">= 0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: sinatra-websocketio
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 description: Node.js like WebSocket/Comet I/O plugin for Sinatra
 email:
 - hashimoto@shokai.org