sinatra-cometio 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.3 2013-2-19
+
+* bugfix queing on CometIO.push
+
 === 0.1.2 2013-2-17
 
 * emit event when client disconnect

data/lib/sinatra/application.rb

@@ -41,7 +41,7 @@ module Sinatra
             s.close
           end
         end
-        
+
         EM::add_timer 10 do
           begin
             s.write({:type => :__heartbeat, :data => {:time => Time.now.to_i}}.to_json)

data/lib/sinatra/cometio.rb

@@ -33,22 +33,20 @@ class CometIO
   end
 
   def self.push(type, data, opt={})
-    if opt[:to]
-      self.sessions[opt[:to].to_s][:queue].push :type => type, :data => data
-    else
-      self.sessions.each do |id,s|
-        if s[:queue].empty? and s[:stream] != nil
-          begin
-            s[:stream].write({:type => type, :data => data}.to_json)
-            s[:stream].flush
-            s[:stream].close
-          rescue
-            s[:stream].class
-            s[:queue].push :type => type, :data => data
-          end
-        else
+    session_ids = opt[:to].to_s.empty? ? self.sessions.keys : [opt[:to]]
+    session_ids.each do |id|
+      s = self.sessions[id]
+      if s[:queue].empty? and s[:stream] != nil
+        begin
+          s[:stream].write({:type => type, :data => data}.to_json)
+          s[:stream].flush
+          s[:stream].close
+        rescue
+          s[:stream].close
           s[:queue].push :type => type, :data => data
         end
+      else
+        s[:queue].push :type => type, :data => data
       end
     end
   end

data/lib/sinatra-cometio/version.rb

@@ -1,3 +1,3 @@
 module SinatraCometIO
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack