sinatra-rocketio 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.1 2013-03-25
+
+* ruby client - use comet if websocket port close
+* fix sample cui_chat_client
+
 === 0.1.0 2013-03-24
 
 * add ruby client library - Sinatra::RocketIO::Client

data/lib/js/rocketio.js

@@ -21,7 +21,7 @@ var RocketIO = function(){
     }();
     if(typeof self.io === "undefined"){
       setTimeout(function(){
-        self.emit("error", "WebSocketIO and CometIO are not available")
+        self.emit("error", "WebSocketIO and CometIO are not available");
       }, 100);
       return self;
     };
@@ -39,13 +39,13 @@ var RocketIO = function(){
       self.type = "comet";
       self.connect();
     }, 3000);
+    self.once("connect", function(){
+      if(ws_close_timer) clearTimeout(ws_close_timer);
+      ws_close_timer = null;
+    });
     return self;
   };
 
-  self.on("connect", function(){
-    clearTimeout(ws_close_timer);
-  });
-
   this.close = function(){
     self.io.close();
   };

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/sinatra/rocketio/client.rb

@@ -15,36 +15,44 @@ module Sinatra
       attr_reader :settings, :type, :io
 
       def initialize(url, opt={:type => :websocket})
+        @type = opt[:type].to_sym
+        @io = nil
         @settings = JSON.parse HTTParty.get("#{url}/rocketio/settings").body
-        type = opt[:type].to_sym
+        @ws_close_thread = nil
+        self
+      end
 
-        if type == :websocket and @settings['websocket']
-          @type = :websocket
-          @io = Sinatra::WebSocketIO::Client.new @settings['websocket']
-        elsif type == :comet and @settings['comet']
+      def connect
+        this = self
+        if @type == :websocket and @settings.include? 'websocket'
+          @io = Sinatra::WebSocketIO::Client.new(@settings['websocket']).connect
+        elsif type == :comet or @settings.include? 'comet'
+          @io = Sinatra::CometIO::Client.new(@settings['comet']).connect
           @type = :comet
-          @io = Sinatra::CometIO::Client.new @settings['comet']
         else
           raise Error, "cannot find #{type} IO #{url}"
         end
-        this = self
-        if @io
-          @io.on :* do |event_name, *args|
-            if args.size > 1
-              this.emit event_name, args[0], args[1]
-            else
-              this.emit event_name, args[0]
+        @io.on :* do |event_name, *args|
+          this.emit event_name, *args
+        end
+        if @type == :websocket
+          @ws_close_thread = Thread.new do
+            sleep 3
+            Thread.new do
+              close
             end
+            emit :error, "websocket port is not open"
+            @type = :comet
+            connect
+          end
+          once :connect do
+            Thread.kill @ws_close_thread if @ws_close_thread
+            @ws_close_thread = nil
           end
         end
         self
       end
 
-      def connect
-        @io.connect
-        self
-      end
-
       def close
         @io.close
       end

data/sample/README.md

@@ -20,3 +20,11 @@ Run
     % rackup config.ru -p 5000
 
 => http://localhost:5000
+
+
+Ruby Client
+-----------
+
+    % ruby bin/cui_chat_client.rb
+    % ruby bin/cui_chat_client.rb http://localhost:5000 websocket
+    % ruby bin/cui_chat_client.rb http://localhost:5000 comet

data/sample/bin/cui_chat_client.rb

@@ -5,8 +5,10 @@ $:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
 require 'sinatra/rocketio/client'
 
 name = `whoami`.strip || 'shokai'
+url = ARGV.shift || 'http://localhost:5000'
+type = ARGV.shift || :websocket
 
-io = Sinatra::RocketIO::Client.new('http://localhost:5000').connect
+io = Sinatra::RocketIO::Client.new(url, :type => type).connect
 #io = Sinatra::RocketIO::Client.new('http://localhost:5000', :type => :comet).connect
 
 io.on :connect do |session|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -271,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4356497738858812236
+      hash: -1955004754093144162
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4356497738858812236
+      hash: -1955004754093144162
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24