sinatra-cometio 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.2 2012-11-15
+
+* support session
+
 === 0.0.1 2012-11-10
 
 * release

data/Manifest.txt

@@ -15,11 +15,8 @@ sample/Gemfile
 sample/Gemfile.lock
 sample/Procfile
 sample/README.md
-sample/bootstrap.rb
 sample/config.ru
-sample/controllers/css.rb
-sample/controllers/main.rb
-sample/helpers/helper.rb
+sample/main.rb
 sample/public/js/index.js
 sample/views/index.haml
 sample/views/main.scss

data/README.rdoc

@@ -18,7 +18,8 @@ server
   require 'sinatra/cometio'
 
   ## echo
-  CometIO.on :chat do |data|
+  CometIO.on :chat do |data, session|
+    puts "#{data['name']} : #{data['message']}  <#{session}>"
     self.push :chat, data
   end
 
@@ -41,6 +42,9 @@ client JavaScript
   // client --> server
   io.push("chat", {name: "shokai", message: "hello"});
 
+
+see sample app => http://cometio-chat.herokuapp.com
+
 == REQUIREMENTS:
 
 * Ruby 1.8.7+ or 1.9.2+

data/Rakefile

@@ -15,8 +15,9 @@ $hoe = Hoe.spec 'sinatra-cometio' do
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [['sinatra','>= 1.3.3'],
                              ['eventmachine', '>= 1.0.0'],
+                             ['json'],
                              ['sinatra-contrib', '>= 1.3.2'],
-                             ['event_emitter', '>= 0.0.7']]
+                             ['event_emitter', '>= 0.1.0']]
 
 end
 

data/lib/js/cometio.js

@@ -1,12 +1,31 @@
 var CometIO = function(){
   this.url = "<%= cometio_url %>";
+  this.session = null;
   var self = this;
 
   this.push = function(type, data){
-    $.post(self.url, {type : type, data : data});
+    $.ajax(
+      {
+        url : self.url,
+        data : {type : type, data : data, session : self.session},
+        success : function(data){
+        },
+        error : function(req, stat, e){
+        },
+        complete : function(e){
+        },
+        type : "POST",
+        dataType : "json",
+        timeout : 10000
+      }
+    );
   };
 
   this.connect = function(){
+    self.on("set_session_id", function(session){
+      self.session = session;
+      self.emit("connect", self.session);
+    });
     self.get();
     return self;
   };
@@ -15,6 +34,7 @@ var CometIO = function(){
     $.ajax(
       {
         url : self.url,
+        data : {session : self.session},
         success : function(data){
           if(data){
             self.emit(data.type, data.data);

data/lib/sinatra-cometio.rb

@@ -1,3 +1,3 @@
 module SinatraCometio
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/sinatra/application.rb

@@ -22,27 +22,29 @@ module Sinatra
 
     get '/cometio/io' do
       stream :keep_open do |s|
-        sid = CometIO.channel.subscribe do |msg|
+        session = params[:session].to_s.empty? ? CometIO.create_session : params[:session]
+        CometIO.sessions[session][:stream] = s
+        CometIO.sessions[session][:last] = Time.now
+        CometIO.emit :connect, session if params[:session].to_s.empty?
+
+        unless CometIO.sessions[session][:queue].empty?
           begin
-            s.write msg.to_json
+            s.write CometIO.sessions[session][:queue].shift.to_json
             s.flush
             s.close
           rescue
             s.close
           end
-          CometIO.channel.unsubscribe sid
         end
-        CometIO.emit :connect, sid
         
         EM::add_timer 10 do
           begin
-            s.write({:type => :cometio_heartbeat, :data => {:time => Time.now.to_s}}.to_json)
+            s.write({:type => :__heartbeat, :data => {:time => Time.now.to_i}}.to_json)
             s.flush
             s.close
           rescue
             s.close
           end
-          CometIO.channel.unsubscribe sid
         end
       end
     end
@@ -50,8 +52,9 @@ module Sinatra
     post '/cometio/io' do
       type = params[:type]
       data = params[:data]
-      CometIO.emit type, data if type.size > 0
-      {:type => type, :data => data}.to_json
+      from = params[:session]
+      CometIO.emit type, data, from if type.size > 0
+      {:session => session, :type => type, :data => data}.to_json
     end
     
   end

data/lib/sinatra/cometio.rb

@@ -1,16 +1,58 @@
 require 'json'
+require 'digest/md5'
 require 'event_emitter'
 require 'sinatra/streaming'
 require File.expand_path 'application', File.dirname(__FILE__)
 require File.expand_path '../sinatra-cometio', File.dirname(__FILE__)
 
 class CometIO
-  def self.channel
-    @@channel ||= EM::Channel.new
+  def self.sessions
+    @@sessions ||= Hash.new{|h,session_id|
+      h[session_id] = {
+        :queue => [{:type => :set_session_id, :data => session_id}],
+        :stream => nil,
+        :last => nil
+      }
+    }
   end
-  
-  def self.push(type, data)
-    self.channel.push :type => type, :data => data
+
+  def self.gc
+    self.sessions.each do |id, s|
+      next unless s[:last] and s[:last] < Time.now-60
+      self.sessions.delete id rescue next
+    end
+  end
+
+  EM::defer do
+    loop do
+      self.gc
+      sleep 60
+    end
+  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
+          s[:queue].push :type => type, :data => data
+        end
+      end
+    end
+  end
+
+  def self.create_session
+    Digest::MD5.hexdigest "#{Time.now.to_i}_#{Time.now.usec}"
   end
 end
 EventEmitter.apply CometIO

data/sample/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     backports (2.6.5)
     daemons (1.1.9)
-    event_emitter (0.0.7)
+    event_emitter (0.1.0)
     eventmachine (1.0.0)
     foreman (0.60.2)
       thor (>= 0.13.6)

data/sample/config.ru

@@ -7,9 +7,7 @@ if development?
   $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 end
 require 'sinatra/cometio'
-
-require File.dirname(__FILE__)+'/bootstrap'
-Bootstrap.init :helpers, :controllers
+require File.dirname(__FILE__)+'/main'
 
 set :haml, :escape_html => true
 

data/sample/main.rb

@@ -0,0 +1,25 @@
+CometIO.on :chat do |data, from|
+  puts "#{data['name']} : #{data['message']}  (from:#{from})"
+  self.push :chat, data
+end
+
+CometIO.on :connect do |session|
+  puts "new client <#{session}>"
+  CometIO.push :chat, {:name => "system", :message => "new client <#{session}>"}
+  CometIO.push :chat, {:name => "system", :message => "welcome <#{session}>"}, {:to => session}
+end
+
+EM::defer do
+  loop do
+    CometIO.push :chat, :name => 'clock', :message => Time.now.to_s
+    sleep 60
+  end
+end
+
+get '/' do
+  haml :index
+end
+
+get '/:source.css' do
+  scss params[:source].to_sym
+end

data/sample/public/js/index.js

@@ -5,7 +5,8 @@ io.on("chat", function(data){
   $("#chat #timeline").prepend(m);
 });
 
-$(function(){
+io.on("connect", function(session){
+  alert("connect!! "+session);
   $("#chat #btn_send").click(post);
   $("#chat #message").keydown(function(e){
     if(e.keyCode == 13) post();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -151,11 +167,8 @@ files:
 - sample/Gemfile.lock
 - sample/Procfile
 - sample/README.md
-- sample/bootstrap.rb
 - sample/config.ru
-- sample/controllers/css.rb
-- sample/controllers/main.rb
-- sample/helpers/helper.rb
+- sample/main.rb
 - sample/public/js/index.js
 - sample/views/index.haml
 - sample/views/main.scss
@@ -181,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -865335438881697336
+      hash: -3646192139090074998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/sample/bootstrap.rb

@@ -1,14 +0,0 @@
-class Bootstrap
-  def self.default
-    []
-  end
-
-  def self.init(*inits)
-    [default, inits].flatten.uniq.each do |cat|
-      Dir.glob("#{File.dirname(__FILE__)}/#{cat}/*.rb").each do |rb|
-        puts "load #{rb}"
-        require rb
-      end
-    end
-  end
-end

data/sample/controllers/css.rb

@@ -1,3 +0,0 @@
-get '/:source.css' do
-  scss params[:source].to_sym
-end

data/sample/controllers/main.rb

@@ -1,18 +0,0 @@
-CometIO.on :chat do |data|
-  self.push :chat, data
-end
-
-CometIO.on :connect do |id|
-  puts "comet <#{id}> connect."
-end
-
-EM::defer do
-  loop do
-    CometIO.push :chat, :name => 'clock', :message => Time.now.to_s
-    sleep 60
-  end
-end
-
-get '/' do
-  haml :index
-end

data/sample/helpers/helper.rb

@@ -1,4 +0,0 @@
-
-def app_root
-  "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}"
-end