sinatra-websocketio 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.7 2013-03-21
+
+* emit "error" on push before websocket connect
+
 === 0.1.6 2013-03-20
 
 * bugfix gem dependencies

data/README.md

@@ -66,7 +66,9 @@ io.on("light", function(data){
 Client Side
 
 ```javascript
-io.push("chat", {name: "shokai", message: "hello"}); // client -> server
+io.on("connect", function{
+  io.push("chat", {name: "shokai", message: "hello"}); // client -> server
+});
 ```
 
 Server Side
@@ -97,6 +99,7 @@ Server Side
 ```ruby
 io.on :connect do |session|
   puts "new client <#{session}>"
+  io.push :hello, "hello!!"
 end
 
 io.on :disconnect do |session|

data/lib/js/event_emitter.js

@@ -1,4 +1,4 @@
-// event_emitter.js v0.0.7
+// event_emitter.js v0.0.8
 // https://github.com/shokai/event_emitter.js
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License
@@ -38,13 +38,15 @@ var EventEmitter = function(){
       switch(e.type){
       case type:
         e.listener(data);
+        if(e.once) e.type = null;
         break
-      case '*':
+      case "*":
         e.listener(type, data);
+        if(e.once) e.type = null;
         break
       }
-      if(e.once) self.removeListener(e.id);
     }
+    self.removeListener();
   };
 
   this.removeListener = function(id_or_type){
@@ -52,10 +54,11 @@ var EventEmitter = function(){
       var e = self.__events[i];
       switch(typeof id_or_type){
       case "number":
-        if(e.id == id_or_type) self.__events.splice(i,1);
+        if(e.id === id_or_type) self.__events.splice(i,1);
         break
       case "string":
-        if(e.type == id_or_type) self.__events.splice(i,1);
+      case "object":
+        if(e.type === id_or_type) self.__events.splice(i,1);
         break
       }
     }
@@ -63,6 +66,6 @@ var EventEmitter = function(){
 
 };
 
-if(typeof module !== 'undefined' && typeof module.exports !== 'undefined'){
+if(typeof module !== "undefined" && typeof module.exports !== "undefined"){
   module.exports = EventEmitter;
 }

data/lib/js/websocketio.js

@@ -15,7 +15,7 @@ var WebSocketIO = function(){
 
   this.connect = function(){
     if(typeof WebSocket === 'undefined'){
-      self.emit("error", "websocket not exists");
+      self.emit("error", "websocket not exists in this browser");
       return null;
     }
     self.running = true;
@@ -27,12 +27,14 @@ var WebSocketIO = function(){
         self.emit(data_.type, data_.data);
       }
       catch(e){
-        self.emit("error", "WebSocketIO get error");
+        self.emit("error", "WebSocketIO data parse error");
       }
     };
     self.websocket.onclose = function(){
-      if(self.connecting) self.emit("disconnect");
-      self.connecting = false;
+      if(self.connecting){
+        self.connecting = false;
+        self.emit("disconnect");
+      }
       if(self.running){
         reconnect_timer_id = setTimeout(self.connect, 10000);
       }
@@ -50,6 +52,10 @@ var WebSocketIO = function(){
   };
 
   this.push = function(type, data){
+    if(!self.connecting){
+      self.emit("error", "websocket not connected");
+      return;
+    }
     self.websocket.send(JSON.stringify({type: type, data: data, session: self.session}));
   };
 };

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/sample/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     em-websocket-client (0.1.1)
       eventmachine
       libwebsocket
-    event_emitter (0.2.3)
+    event_emitter (0.2.4)
     eventmachine (1.0.3)
     foreman (0.62.0)
       thor (>= 0.13.6)

data/sinatra-websocketio.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'em-websocket', '>= 0.5.0'
   gem.add_dependency 'eventmachine', '>= 1.0.0'
   gem.add_dependency 'json', '>= 1.7.0'
-  gem.add_dependency 'event_emitter', '~> 0.2'
+  gem.add_dependency 'event_emitter', '>= 0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.4
 description: WebSocket component for Sinatra RocketIO
 email:
 - hashimoto@shokai.org