sinatra-cometio 0.1.9 → 0.2.0

data/History.txt

@@ -1,48 +1,52 @@
-=== 0.1.9 2013-3-7
+=== 0.2.0 2013-03-12
+
+* push multiple queued data at once
+
+=== 0.1.9 2013-03-07
 
 * use stream on post
 
-=== 0.1.8 2013-3-6
+=== 0.1.8 2013-03-06
 
 * update event_emitter.js
 
-=== 0.1.7 2013-3-3
+=== 0.1.7 2013-03-03
 
 * bugfix CometIO Ruby client
 * change config key xhr_interval -> timeout
 
-=== 0.1.6 2013-3-3
+=== 0.1.6 2013-03-03
 
 * add IO close function - CometIO.close()
 * set :cometio, :xhr_interval => 15
 * use Sinatra.register
 
-=== 0.1.5 2013-3-3
+=== 0.1.5 2013-03-03
 
 * add tests with ruby client
 
-=== 0.1.4 2013-3-2
+=== 0.1.4 2013-03-02
 
 * add CometIO::Client
 
-=== 0.1.3 2013-2-19
+=== 0.1.3 2013-02-19
 
 * bugfix queing on CometIO.push
 
-=== 0.1.2 2013-2-17
+=== 0.1.2 2013-02-17
 
 * emit event when client disconnect
 * create session_ID from IP Addr
 
-=== 0.1.1 2013-2-7
+=== 0.1.1 2013-02-07
 
 * little fix
 
-=== 0.1.0 2013-2-6
+=== 0.1.0 2013-02-06
 
 * use EventEmitter.js
 
-=== 0.0.9 2013-1-4
+=== 0.0.9 2013-01-04
 
 * use bundler gem template
 

data/README.md

@@ -29,6 +29,11 @@ Server Side
 ```ruby
 require 'sinatra'
 require 'sinatra/cometio'
+set :cometio, :timeout => 120
+
+run Sinatra::Application
+```
+```ruby
 CometIO.push :temperature, 35  # to all clients
 CometIO.push :light, {:value => 150}, {:to => session_id} # to specific client
 ```
@@ -132,19 +137,6 @@ or
 io.removeListener("error");  // remove all "error" listener
 ```
 
-Config
-------
-
-config.ru
-```ruby
-require 'sinatra'
-require 'sinatra/cometio'
-require File.dirname(__FILE__)+'/main'
-
-set :cometio, :timeout => 60
-
-run Sinatra::Application
-```
 
 Sample App
 ----------

data/lib/js/cometio.js

@@ -46,9 +46,10 @@ var CometIO = function(){
       {
         url : self.url,
         data : {session : self.session},
-        success : function(data){
-          if(data){
-            self.emit(data.type, data.data);
+        success : function(data_arr){
+          for(var i = 0; i < data_arr.length; i++){
+            var data = data_arr[i];
+            if(data) self.emit(data.type, data.data);
           }
           self.get();
         },

data/lib/sinatra/cometio/client.rb

@@ -54,8 +54,11 @@ class CometIO
               sleep 10
               next
             else
-              data = JSON.parse res.body
-              self.emit data['type'], data['data']
+              data_arr = JSON.parse res.body
+              data_arr = [data_arr] unless data_arr.kind_of? Array
+              data_arr.each do |data|
+                self.emit data['type'], data['data']
+              end
               next
             end
           rescue Timeout::Error, JSON::ParserError

data/lib/sinatra/cometio.rb

@@ -5,56 +5,7 @@ require 'event_emitter'
 require 'sinatra/streaming'
 require File.expand_path '../sinatra-cometio/version', File.dirname(__FILE__)
 require File.expand_path '../sinatra-cometio/options', File.dirname(__FILE__)
+require File.expand_path '../sinatra-cometio/cometio', File.dirname(__FILE__)
 require File.expand_path '../sinatra-cometio/application', File.dirname(__FILE__)
-Sinatra.register Sinatra::CometIO
-
-class CometIO
-  def self.sessions
-    @@sessions ||= Hash.new{|h,session_id|
-      h[session_id] = {
-        :queue => [{:type => :__session_id, :data => session_id}],
-        :stream => nil,
-        :last => nil
-      }
-    }
-  end
-
-  def self.gc
-    self.sessions.each do |id, s|
-      next unless s[:last] and s[:last] < Time.now-CometIO.options[:timeout]*2-10
-      self.sessions.delete id rescue next
-      self.emit :disconnect, id
-    end
-  end
 
-  EM::defer do
-    loop do
-      self.gc
-      sleep CometIO.options[:timeout]+5
-    end
-  end
-
-  def self.push(type, data, opt={})
-    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
-
-  def self.create_session(ip_addr)
-    Digest::MD5.hexdigest "#{Time.now.to_i}_#{Time.now.usec}_#{ip_addr}"
-  end
-end
-EventEmitter.apply CometIO
+Sinatra.register Sinatra::CometIO

data/lib/sinatra-cometio/application.rb

@@ -40,17 +40,18 @@ module Sinatra::CometIO
 
       unless CometIO.sessions[session][:queue].empty?
         begin
-          s.write CometIO.sessions[session][:queue].shift.to_json
+          s.write CometIO.sessions[session][:queue].to_json
           s.flush
           s.close
         rescue
           s.close
         end
+        CometIO.sessions[session][:queue] = []
       end
 
       EM::add_timer CometIO.options[:timeout] do
         begin
-          s.write({:type => :__heartbeat, :data => {:time => Time.now.to_i}}.to_json)
+          s.write([{:type => :__heartbeat, :data => {:time => Time.now.to_i}}].to_json)
           s.flush
           s.close
         rescue

data/lib/sinatra-cometio/cometio.rb

@@ -0,0 +1,51 @@
+class CometIO
+
+  def self.sessions
+    @@sessions ||= Hash.new{|h,session_id|
+      h[session_id] = {
+        :queue => [{:type => :__session_id, :data => session_id}],
+        :stream => nil,
+        :last => nil
+      }
+    }
+  end
+
+  def self.gc
+    self.sessions.each do |id, s|
+      next unless s[:last] and s[:last] < Time.now-CometIO.options[:timeout]*2-10
+      self.sessions.delete id rescue next
+      self.emit :disconnect, id
+    end
+  end
+
+  EM::defer do
+    loop do
+      self.gc
+      sleep CometIO.options[:timeout]+5
+    end
+  end
+
+  def self.push(type, data, opt={})
+    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
+
+  def self.create_session(ip_addr)
+    Digest::MD5.hexdigest "#{Time.now.to_i}_#{Time.now.usec}_#{ip_addr}"
+  end
+end
+EventEmitter.apply CometIO

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.1.9'
+    VERSION = '0.2.0'
   end
 end

data/sample/views/index.haml

@@ -4,7 +4,7 @@
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html', :charset => 'UTF-8'}
     %title comet chat
     %link{:rel => 'stylesheet', :href => "/main.css", :type => 'text/css'}
-    %script{:type => 'text/javascript', :src => "//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"}
+    %script{:type => 'text/javascript', :src => "//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"}
     - ## load cometio.js
     %script{:type => 'text/javascript', :src => cometio_js}
     %script{:type => 'text/javascript', :src => "/js/index.js"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -140,6 +140,7 @@ files:
 - lib/js/event_emitter.js
 - lib/sinatra-cometio.rb
 - lib/sinatra-cometio/application.rb
+- lib/sinatra-cometio/cometio.rb
 - lib/sinatra-cometio/options.rb
 - lib/sinatra-cometio/version.rb
 - lib/sinatra/cometio.rb