sinatra-cometio 0.3.8 → 0.3.9

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.9 2013-03-21
+
+* emit "error" on push before connect
+
 === 0.3.8 2013-03-19
 
 * bugfix gem dependencies

data/lib/js/cometio.js

@@ -6,6 +6,10 @@ var CometIO = function(){
   var self = this;
 
   this.push = function(type, data){
+    if(!self.session){
+      self.emit("error", "CometIO not connected");
+      return;
+    }
     $.ajax(
       {
         url : self.url,

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/sinatra-cometio/application.rb

@@ -41,9 +41,10 @@ module Sinatra
       end
 
       app.post '/cometio/io' do
+        from = params[:session]
+        halt 400, 'no session' if from.empty?
         type = params[:type]
         data = params[:data]
-        from = params[:session]
         EM::defer do
           CometIO.emit type, data, from unless type.to_s.empty?
         end

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.3.8'
+    VERSION = '0.3.9'
   end
 end

data/sample/Gemfile.lock

@@ -3,11 +3,11 @@ GEM
   specs:
     backports (3.1.1)
     daemons (1.1.9)
-    event_emitter (0.2.3)
+    event_emitter (0.2.4)
     eventmachine (1.0.3)
     foreman (0.62.0)
       thor (>= 0.13.6)
-    haml (4.0.0)
+    haml (4.0.1)
       tilt
     httparty (0.10.2)
       multi_json (~> 1.0)

data/sinatra-cometio.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sinatra', '>= 1.3.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'
   gem.add_dependency 'httparty', '>= 0.10.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   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
@@ -80,17 +80,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
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement