sinatra-cometio 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.2 2013-03-26
+
+* refactor Sinatra::CometIO::push
+
 === 0.4.1 2013-03-24
 
 * Sinatra::CometIO::Client#timeout = 120

data/lib/sinatra-cometio/cometio.rb

@@ -27,10 +27,8 @@ module Sinatra
     end
 
     def self.push(type, data, opt={})
-      session_ids = opt[:to].to_s.empty? ? self.sessions.keys : [opt[:to]]
-      session_ids.each do |id|
-        next unless self.sessions.include? id
-        s = self.sessions[id]
+      if opt.include? :to and self.sessions.include? opt[:to]
+        s = self.sessions[opt[:to]]
         if s[:queue].empty? and s[:stream] != nil
           begin
             s[:stream].write([{:type => type, :data => data}].to_json)
@@ -43,6 +41,10 @@ module Sinatra
         else
           s[:queue].push :type => type, :data => data
         end
+      else
+        self.sessions.keys.each do |id|
+          push type, data, :to => id
+        end
       end
     end
 

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/sample/README.md

@@ -8,7 +8,7 @@ Comet Chat
 Install Dependencies
 --------------------
 
-    % gem install bundler foreman
+    % gem install bundler
     % bundle install
 
 

data/test/test_cometio.rb

@@ -22,7 +22,7 @@ class TestCometio < MiniTest::Unit::TestCase
       push :broadcast, post_data
     end
 
-    30.times do
+    50.times do
       break if res != nil
       sleep 0.1
     end
@@ -56,7 +56,7 @@ class TestCometio < MiniTest::Unit::TestCase
       end
     end
 
-    30.times do
+    50.times do
       break if res != nil
       sleep 0.1
     end
@@ -89,7 +89,7 @@ class TestCometio < MiniTest::Unit::TestCase
       end
     end
 
-    30.times do
+    50.times do
       break if res != nil
       sleep 0.1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   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-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3631185313350720463
+      hash: -2773657054308243354
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3631185313350720463
+      hash: -2773657054308243354
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24