sinatra-rocketio 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33e9321349e2c8ad2b3f8dc6bae895fc702a803d
-  data.tar.gz: 416b39ec174fe75633467e72a4066c9dccc1f09c
+  metadata.gz: b78d8087665e017740b97926a9cd955e841740e4
+  data.tar.gz: a2996cfe08f7ccd37dd9f630d6a41bc2db2cb3c0
 SHA512:
-  metadata.gz: d9cabcb7973308e6325af32e8c7289220c92fa417004a5428c15e5cb825f65115b87c7f4193ed22ee815bebd88e9a68db57311eef8893925529bbacf882d4c2c
-  data.tar.gz: d295ace4d4bcfa0431285529a8664b78df9f0380413a50a83b657e2c7d09d121c6ba85156d8a755d453ece7d917687e4dd9234714a88d17195347762d3430fdf
+  metadata.gz: 68af554cc31883a1e5606a1ab7a848ec6690e073e0cb4b2dccbfe2f7a08bfdc7c7b1bf3873b73972257513b220db47f789b2f39659d9950d9edb180fd8aa701e
+  data.tar.gz: 4ff0b6de2002be72904f338bc4cbe6fe0743fffb9624a7e44a9de4993dd2e251e2d3d44896a5c7c975c506388b75fba29e0e69c4531e519fb8ad3126b71fdd59

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.1 2013-04-01
+
+* bugfix client connect event
+
 === 0.2.0 2013-03-31
 
 * add "channel" for grouping clients

data/lib/js/rocketio.js

@@ -9,16 +9,21 @@ var RocketIO = function(opts){
   if(typeof opts === "object"){
     this.channel = ""+opts.channel;
   }
+  self.on("__connect", function(session_id){
+    self.session = session_id;
+    self.io.push("__channel_id", self.channel);
+    self.emit("connect");
+  });
 
   this.connect = function(){
     self.io = function(){
       if(self.type === "comet") return;
-      if(typeof WebSocketIO === "undefined") return;
+      if(typeof WebSocketIO !== "function") return;
       var io = new WebSocketIO();
       io.session = self.session;
       return io.connect();
     }() || function(){
-      if(typeof CometIO === "undefined") return;
+      if(typeof CometIO !== "function") return;
       var io = new CometIO();
       io.session = self.session;
       return io.connect();
@@ -36,11 +41,6 @@ var RocketIO = function(opts){
       if(event_name === "connect") event_name = "__connect";
       self.emit(event_name, args);
     });
-    self.on("__connect", function(session_id){
-      self.session = session_id;
-      io.push("__channel_id", self.channel);
-      self.emit("connect");
-    });
     ws_close_timer = setTimeout(function(){
       self.close();
       self.type = "comet";

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/sinatra/rocketio/client.rb

@@ -22,6 +22,10 @@ module Sinatra
         @io = nil
         @settings = nil
         @ws_close_thread = nil
+        on :__connect do
+          io.push :__channel_id, channel
+          emit :connect
+        end
         self
       end
 
@@ -60,10 +64,6 @@ module Sinatra
           event_name = :__connect if event_name == :connect
           this.emit event_name, *args
         end
-        this.on :__connect do
-          this.io.push :__channel_id, this.channel
-          this.emit :connect
-        end
         if @type == :websocket
           @ws_close_thread = Thread.new do
             sleep 3

data/sinatra-rocketio.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "json"
 
   gem.add_dependency "sinatra-cometio", ">= 0.4.3"
-  gem.add_dependency "sinatra-websocketio", ">= 0.2.2"
+  gem.add_dependency "sinatra-websocketio", ">= 0.2.3"
   gem.add_dependency "sinatra"
   gem.add_dependency "eventmachine", ">= 1.0.0"
-  gem.add_dependency "event_emitter", ">= 0.2.4"
+  gem.add_dependency "event_emitter", ">= 0.2.5"
   gem.add_dependency "hashie"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement