sinatra-rocketio 0.0.1 → 0.0.2

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sinatra-rocketio.gemspec
 gemspec
+gem 'thin'

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.2 2013-03-18
+
+* sinatra config - set :rocketio, :cometio => true, :websocket => true
+
 === 0.0.1 2013-03-17
 
 * first release

data/README.md

@@ -32,6 +32,7 @@ require 'sinatra'
 require 'sinatra/rocketio'
 set :cometio, :timeout => 120
 set :websocketio, :port => 8080
+set :rocketio, :websocket => true, :comet => true # enable WebSocket and Comet
 
 run Sinatra::Application
 ```

data/lib/js/rocketio.js

@@ -1,6 +1,6 @@
 var RocketIO = function(){
   new EventEmitter().apply(this);
-  this.type = null; // comet, websocket
+  this.type = null; // "comet", "websocket"
   this.session = null;
   this.io = null;
   var self = this;
@@ -9,14 +9,22 @@ var RocketIO = function(){
   this.connect = function(){
     self.io = function(){
       if(self.type === "comet") return;
+      if(typeof WebSocketIO === "undefined") return;
       var io = new WebSocketIO();
       io.session = self.session;
       return io.connect();
     }() || function(){
+      if(typeof CometIO === "undefined") return;
       var io = new CometIO();
       io.session = self.session;
       return io.connect();
     }();
+    if(typeof self.io === "undefined"){
+      setTimeout(function(){
+        self.emit("error", "WebSocketIO and CometIO are not available")
+      }, 100);
+      return self;
+    };
     if(self.io.url.match(/^ws:\/\/.+/)) self.type = "websocket";
     else if(self.io.url.match(/cometio/)) self.type = "comet";
     else self.type = "unknown";

data/lib/sinatra/rocketio.rb

@@ -1,6 +1,5 @@
 require 'eventmachine'
-require 'sinatra/cometio'
-require 'sinatra/websocketio'
+require 'event_emitter'
 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/lib/sinatra-rocketio/application.rb

@@ -2,13 +2,24 @@ module Sinatra
   module RocketIO
 
     def self.registered(app)
-      app.register Sinatra::CometIO
-      app.register Sinatra::WebSocketIO
       app.helpers Sinatra::RocketIO::Helpers
-
-      app.get '/rocketio/rocketio.js' do
-        content_type 'application/javascript'
-        @js ||= ERB.new(Sinatra::RocketIO.javascript).result(binding)
+      EM::defer do
+        while !EM::reactor_running? do
+          sleep 1
+        end
+        if options[:comet]
+          require 'sinatra/cometio'
+          app.register Sinatra::CometIO
+        end
+        if options[:websocket]
+          require 'sinatra/websocketio'
+          app.register Sinatra::WebSocketIO
+        end
+        app.get '/rocketio/rocketio.js' do
+          content_type 'application/javascript'
+          @js ||= ERB.new(Sinatra::RocketIO.javascript).result(binding)
+        end
+        Sinatra::RocketIO.emit :regist_events
       end
     end
 

data/lib/sinatra-rocketio/javascript.rb

@@ -7,9 +7,9 @@ module Sinatra
       js_file_names.each do |i|
         js += case i
               when 'cometio.js'
-                Sinatra::CometIO.javascript 'cometio.js'
+                options[:comet] ? Sinatra::CometIO.javascript('cometio.js') : ''
               when 'websocketio.js'
-                Sinatra::WebSocketIO.javascript 'websocketio.js'
+                options[:websocket] ? Sinatra::WebSocketIO.javascript('websocketio.js') : ''
               else
                 j = ''
                 File.open(File.expand_path "../js/#{i}", File.dirname(__FILE__)) do |f|

data/lib/sinatra-rocketio/options.rb

@@ -11,6 +11,8 @@ module Sinatra
 
     def self.default_options
       {
+        :comet => [true, lambda{|v| [true, false].include? v }],
+        :websocket => [true, lambda{|v| [true, false].include? v }]
       }
     end
 

data/lib/sinatra-rocketio/rocketio.rb

@@ -2,8 +2,8 @@ module Sinatra
   module RocketIO
 
     def self.push(type, data, opt={})
-      Sinatra::CometIO.push type, data, opt
-      Sinatra::WebSocketIO.push type, data, opt
+      Sinatra::CometIO.push type, data, opt if options[:comet]
+      Sinatra::WebSocketIO.push type, data, opt if options[:websocket]
     end
 
     def self.sessions
@@ -15,18 +15,26 @@ module Sinatra
 
   end
 end
+
 EventEmitter.apply Sinatra::RocketIO
-Sinatra::CometIO.on :* do |event_name, *args|
-  if args.size > 1
-    Sinatra::RocketIO.emit event_name, args[0], args[1], :comet
-  else
-    Sinatra::RocketIO.emit event_name, args[0], :comet
+
+Sinatra::RocketIO.once :regist_events do
+  if options[:comet]
+    Sinatra::CometIO.on :* do |event_name, *args|
+      if args.size > 1
+        Sinatra::RocketIO.emit event_name, args[0], args[1], :comet
+      else
+        Sinatra::RocketIO.emit event_name, args[0], :comet
+      end
+    end
   end
-end
-Sinatra::WebSocketIO.on :* do |event_name, *args|
-  if args.size > 1
-    Sinatra::RocketIO.emit event_name, args[0], args[1], :websocket
-  else
-    Sinatra::RocketIO.emit event_name, args[0], :websocket
+  if options[:websocket]
+    Sinatra::WebSocketIO.on :* do |event_name, *args|
+      if args.size > 1
+        Sinatra::RocketIO.emit event_name, args[0], args[1], :websocket
+      else
+        Sinatra::RocketIO.emit event_name, args[0], :websocket
+      end
+    end
   end
 end

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/sample/Gemfile

@@ -1,9 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'foreman'
 gem 'rack'
 gem 'sinatra'
 gem 'thin'
+gem 'event_emitter'
 gem 'sinatra-cometio'
 gem 'sinatra-websocketio'
 gem 'haml'

data/sample/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     addressable (2.3.3)
     backports (3.1.1)
@@ -72,6 +72,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  event_emitter
   foreman
   haml
   rack

data/sample/config.ru

@@ -13,6 +13,7 @@ require File.dirname(__FILE__)+'/main'
 set :haml, :escape_html => true
 set :cometio, :timeout => 120
 set :websocketio, :port => 8080
+set :rocketio, :comet => true, :websocket => true
 
 case RUBY_PLATFORM
 when /linux/i then EM.epoll

data/sinatra-rocketio.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.version       = Sinatra::RocketIO::VERSION
   gem.authors       = ["Sho Hashimoto"]
   gem.email         = ["hashimoto@shokai.org"]
-  gem.description   = %q{Node.js like I/O plugin for Sinatra}
+  gem.description   = %q{Node.js like WebSocket/Comet I/O plugin for Sinatra}
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/shokai/sinatra-rocketio"
 
@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rack"
   gem.add_dependency "sinatra"
   gem.add_dependency "eventmachine"
+  gem.add_dependency "event_emitter"
   gem.add_dependency "sinatra-contrib"
   gem.add_dependency "sinatra-cometio"
   gem.add_dependency "sinatra-websocketio"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: event_emitter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Node.js like I/O plugin for Sinatra
+description: Node.js like WebSocket/Comet I/O plugin for Sinatra
 email:
 - hashimoto@shokai.org
 executables: []
@@ -164,5 +180,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Node.js like I/O plugin for Sinatra
+summary: Node.js like WebSocket/Comet I/O plugin for Sinatra
 test_files: []