sinatra-rocketio 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 33e9321349e2c8ad2b3f8dc6bae895fc702a803d
+  data.tar.gz: 416b39ec174fe75633467e72a4066c9dccc1f09c
+SHA512:
+  metadata.gz: d9cabcb7973308e6325af32e8c7289220c92fa417004a5428c15e5cb825f65115b87c7f4193ed22ee815bebd88e9a68db57311eef8893925529bbacf882d4c2c
+  data.tar.gz: d295ace4d4bcfa0431285529a8664b78df9f0380413a50a83b657e2c7d09d121c6ba85156d8a755d453ece7d917687e4dd9234714a88d17195347762d3430fdf

data/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.ruby-version
 *.tmp
 *~
 *#*

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.2.0 2013-03-31
+
+* add "channel" for grouping clients
+* update tests
+* Sinatra::RocketIO.sessions
+* use Sinatra::RocketIO::ClientInfo in server side events
+
 === 0.1.2 2013-03-25
 
 * retry get /rocketio/settings

data/README.md

@@ -11,15 +11,15 @@ sinatra-rocketio
 Installation
 ------------
 
-    gem install sinatra-rocketio
+    % gem install sinatra-rocketio
 
 
 Requirements
 ------------
 * Ruby 1.8.7 or 1.9.2 or 1.9.3 or 2.0.0
 * Sinatra 1.3.0+
-* EventMachine
-* jQuery
+* [EventMachine](http://rubyeventmachine.com)
+* [jQuery](http://jquery.com)
 
 
 Usage
@@ -67,7 +67,7 @@ io.on("light", function(data){
 Client Side
 
 ```javascript
-io.on("connect", function(session){
+io.on("connect", function(){
   io.push("chat", {name: "shokai", message: "hello"}); // client -> server
 });
 ```
@@ -75,8 +75,8 @@ io.on("connect", function(session){
 Server Side
 
 ```ruby
-io.on :chat do |data, session, type|
-  puts "#{data['name']} : #{data['message']}  <#{session}> type:#{type}"
+io.on :chat do |data, client|
+  puts "#{data['name']} : #{data['message']}  <#{client.session}> type:#{client.type}"
 end
 ## => "shokai : hello  <12abcde345f6g7h8ijk> type:websocket"
 ```
@@ -86,21 +86,21 @@ end
 Client Side
 
 ```javascript
-io.on("connect", function(session){
-  alert("connect!!");
+io.on("connect", function(){
+  alert("connect!! "+io.session);
 });
 ```
 
 Server Side
 
 ```ruby
-io.on :connect do |session, type|
-  puts "new client <#{session}> type:#{type}"
+io.on :connect do |client|
+  puts "new client <#{client.session}> type:#{client.type}"
   io.push :hello, "hello new client!!"
 end
 
-io.on :disconnect do |session, type|
-  puts "client disconnected <#{session}> type:#{type}"
+io.on :disconnect do |client|
+  puts "client disconnected <#{client.session}> type:#{client.type}"
 end
 ```
 
@@ -119,8 +119,8 @@ io.on("error", function(err){
 Server Side
 
 ```ruby
-event_id = io.on :chat do |data, from, type|
-  puts "#{data} - from:#{from} type:#{type}"
+event_id = io.on :chat do |data, client|
+  puts "chat #{data} - from:#{client.session} type:#{client.type}"
 end
 io.removeListener event_id
 ```
@@ -148,6 +148,40 @@ io.removeListener("error");  // remove all "error" listener
 ```
 
 
+### Chanel
+
+make client groups.
+
+Client Side
+```javascript
+var io = new RocketIO({channel: "ch1"}).connect();  // set channel "ch1"
+
+io.on("connect", function(){
+  io.push("hi", "haaaaaaaai!!");
+});
+
+io.on("announce", function(msg){
+  alert(msg);
+  // => alert "new client a1b2cde345fg in ch1"
+});
+```
+
+Server Side
+```ruby
+io = Sinatra::RocketIO
+
+io.on :connect do |client|
+  msg = "new client #{client.session} in #{client.channel}"
+  io.push :announce, msg, :channel => client.channel  # to all clients in Channel "ch1"
+end
+
+io.on :hi do |msg, client|
+  puts "client says #{msg} (channel:#{client.channel})"
+  # => "client says haaaaaaaai!! (channel:ch1)"
+end
+```
+
+
 Sample App
 ----------
 chat app
@@ -157,6 +191,21 @@ chat app
 - https://github.com/shokai/rocketio-arduino-sample
 
 
+Test
+----
+
+    % gem install bundler
+    % bundle install
+
+start server
+
+    % rake test_server
+
+run test
+
+    % rake test
+
+
 Contributing
 ------------
 

data/Rakefile

@@ -5,4 +5,10 @@ Rake::TestTask.new do |t|
   t.pattern = "test/test_*.rb"
 end
 
+desc "Start test server"
+task :test_server do
+  require File.expand_path 'test/app', File.dirname(__FILE__)
+  App.start
+end
+
 task :default => :test

data/lib/js/rocketio.js

@@ -1,10 +1,14 @@
-var RocketIO = function(){
+var RocketIO = function(opts){
   new EventEmitter().apply(this);
   this.type = null; // "comet", "websocket"
   this.session = null;
+  this.channel = null;
   this.io = null;
   var self = this;
   var ws_close_timer = null;
+  if(typeof opts === "object"){
+    this.channel = ""+opts.channel;
+  }
 
   this.connect = function(){
     self.io = function(){
@@ -29,10 +33,13 @@ var RocketIO = function(){
     else if(self.io.url.match(/cometio/)) self.type = "comet";
     else self.type = "unknown";
     self.io.on("*", function(event_name, args){
+      if(event_name === "connect") event_name = "__connect";
       self.emit(event_name, args);
     });
-    self.io.on("connect", function(session_id){
+    self.on("__connect", function(session_id){
       self.session = session_id;
+      io.push("__channel_id", self.channel);
+      self.emit("connect");
     });
     ws_close_timer = setTimeout(function(){
       self.close();

data/lib/sinatra-rocketio/channel.rb

@@ -0,0 +1,18 @@
+module Sinatra
+  module RocketIO
+
+    def self.channels
+      @@channels ||= {}
+    end
+
+  end
+end
+
+Sinatra::RocketIO.on :__channel_id do |channel, client|
+  channels[client[:session]] = channel
+  client.channel = channel
+  emit :connect, client
+end
+Sinatra::RocketIO.on :disconnect do |client, type|
+  channels.delete client[:session]
+end

data/lib/sinatra-rocketio/client_info.rb

@@ -0,0 +1,11 @@
+require 'hashie'
+
+module Sinatra
+  module RocketIO
+    class ClientInfo < Hashie::Mash
+      def to_s
+        "session=\"#{session}\" type=\"#{type}\" channel=\"#{channel}\""
+      end
+    end
+  end
+end

data/lib/sinatra-rocketio/rocketio.rb

@@ -4,13 +4,21 @@ module Sinatra
   module RocketIO
 
     def self.push(type, data, opt={})
-      if options[:websocket]
-        if !opt[:to] or Sinatra::WebSocketIO.sessions.include? opt[:to]
+      if opt.include? :to and opt[:to].kind_of? Array
+        opt[:to].each do |to|
+          push type, data, :to => to
+        end
+      elsif opt.include? :channel
+        channels.select{|session, channel|
+          channel == opt[:channel].to_s
+        }.each do |session|
+          push type, data, :to => session
+        end
+      else
+        if options[:websocket]
           Sinatra::WebSocketIO.push type, data, opt
         end
-      end
-      if options[:comet]
-        if !opt[:to] or Sinatra::CometIO.sessions.include? opt[:to]
+        if options[:comet]
           Sinatra::CometIO.push type, data, opt
         end
       end
@@ -18,8 +26,8 @@ module Sinatra
 
     def self.sessions
       {
-        :websocket => Sinatra::WebSocketIO.sessions,
-        :comet => Sinatra::CometIO.sessions
+        :websocket => Sinatra::WebSocketIO.sessions.keys,
+        :comet => Sinatra::CometIO.sessions.keys
       }
     end
 
@@ -29,19 +37,21 @@ end
 Sinatra::RocketIO.once :start do
   if options[:comet]
     Sinatra::CometIO.on :* do |event_name, *args|
+      event_name = :__connect if event_name == :connect
       if args.size > 1
-        Sinatra::RocketIO.emit event_name, args[0], args[1], :comet
+        Sinatra::RocketIO.emit event_name, args[0], Sinatra::RocketIO::ClientInfo.new(:session => args[1], :channel => Sinatra::RocketIO.channels[args[1]], :type => :comet)
       else
-        Sinatra::RocketIO.emit event_name, args[0], :comet
+        Sinatra::RocketIO.emit event_name, Sinatra::RocketIO::ClientInfo.new(:session => args[0], :channel => Sinatra::RocketIO.channels[args[0]], :type => :comet)
       end
     end
   end
   if options[:websocket]
     Sinatra::WebSocketIO.on :* do |event_name, *args|
+      event_name = :__connect if event_name == :connect
       if args.size > 1
-        Sinatra::RocketIO.emit event_name, args[0], args[1], :websocket
+        Sinatra::RocketIO.emit event_name, args[0], Sinatra::RocketIO::ClientInfo.new(:session => args[1], :channel => Sinatra::RocketIO.channels[args[1]], :type => :websocket)
       else
-        Sinatra::RocketIO.emit event_name, args[0], :websocket
+        Sinatra::RocketIO.emit event_name, Sinatra::RocketIO::ClientInfo.new(:session => args[0], :channel => Sinatra::RocketIO.channels[args[0]], :type => :websocket)
       end
     end
   end

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/lib/sinatra/rocketio.rb

@@ -1,13 +1,16 @@
 require 'eventmachine'
 require 'event_emitter'
+require 'hashie'
 require 'sinatra/cometio'
 require 'sinatra/websocketio_nostart'
 require File.expand_path '../sinatra-rocketio/version', File.dirname(__FILE__)
+require File.expand_path '../sinatra-rocketio/client_info', File.dirname(__FILE__)
 require File.expand_path '../sinatra-rocketio/helpers', File.dirname(__FILE__)
 require File.expand_path '../sinatra-rocketio/options', File.dirname(__FILE__)
 require File.expand_path '../sinatra-rocketio/rocketio', File.dirname(__FILE__)
 require File.expand_path '../sinatra-rocketio/javascript', File.dirname(__FILE__)
 require File.expand_path '../sinatra-rocketio/application', File.dirname(__FILE__)
+require File.expand_path '../sinatra-rocketio/channel', File.dirname(__FILE__)
 
 module Sinatra
   module RocketIO

data/lib/sinatra/rocketio/client.rb

@@ -12,12 +12,13 @@ module Sinatra
       end
 
       include EventEmitter
-      attr_reader :settings, :type, :io
+      attr_reader :settings, :type, :io, :channel
 
       public
-      def initialize(url, opt={:type => :websocket})
+      def initialize(url, opt={:type => :websocket, :channel => nil})
         @url = url
         @type = opt[:type].to_sym
+        @channel = opt[:channel] ? opt[:channel].to_s : nil
         @io = nil
         @settings = nil
         @ws_close_thread = nil
@@ -56,8 +57,13 @@ module Sinatra
           raise Error, "cannot find #{type} IO #{url}"
         end
         @io.on :* do |event_name, *args|
+          event_name = :__connect if event_name == :connect
           this.emit event_name, *args
         end
+        this.on :__connect do
+          this.io.push :__channel_id, this.channel
+          this.emit :connect
+        end
         if @type == :websocket
           @ws_close_thread = Thread.new do
             sleep 3

data/sample/bin/cui_chat_client.rb

@@ -8,11 +8,11 @@ name = `whoami`.strip || 'shokai'
 url = ARGV.shift || 'http://localhost:5000'
 type = ARGV.shift || :websocket
 
-io = Sinatra::RocketIO::Client.new(url, :type => type).connect
+io = Sinatra::RocketIO::Client.new(url, :type => type, :channel => "1").connect
 #io = Sinatra::RocketIO::Client.new('http://localhost:5000', :type => :comet).connect
 
-io.on :connect do |session|
-  puts "#{io.type} connect!! (session_id:#{session})"
+io.on :connect do
+  puts "#{io.type} connect!! (session_id:#{io.session})"
 end
 
 io.on :chat do |data|

data/sample/main.rb

@@ -6,20 +6,20 @@ class ChatApp < Sinatra::Base
     puts "RocketIO start!!!"
   end
 
-  io.on :connect do |session, type|
-    puts "new client <#{session}> (type:#{type})"
-    push :chat, {:name => "system", :message => "new #{type} client <#{session}>"}
-    push :chat, {:name => "system", :message => "welcome <#{session}>"}, {:to => session}
+  io.on :connect do |client|
+    puts "new client  - #{client}"
+    push :chat, {:name => "system", :message => "new #{client.type} client <#{client.session}>"}, :channel => client.channel
+    push :chat, {:name => "system", :message => "welcome <#{client.session}>"}, :to => client.session
   end
 
-  io.on :disconnect do |session, type|
-    puts "disconnect client <#{session}> (type:#{type})"
-    push :chat, {:name => "system", :message => "bye <#{session}>"}
+  io.on :disconnect do |client|
+    puts "disconnect client  - #{client}"
+    push :chat, {:name => "system", :message => "bye <#{client.session}>"}, :channel => client.channel
   end
 
-  io.on :chat do |data, from, type|
-    puts "#{data['name']} : #{data['message']}  (from:#{from} type:#{type})"
-    push :chat, data
+  io.on :chat do |data, client|
+    puts "#{data['name']} : #{data['message']}  - #{client}"
+    push :chat, data, :channel => client.channel
   end
 
   io.on :error do |err|
@@ -27,7 +27,12 @@ class ChatApp < Sinatra::Base
   end
 
   get '/' do
-    haml :index
+    redirect '/chat/1'
+  end
+
+  get '/chat/:channel' do
+    @channel = params[:channel]
+    haml :chat
   end
 
   get '/:source.css' do

data/sample/public/js/{index.js → chat.js}

@@ -1,4 +1,4 @@
-var io = new RocketIO().connect();
+var io = new RocketIO({channel: channel}).connect();
 
 $(function(){
   $("#chat #btn_send").click(post);
@@ -12,12 +12,12 @@ io.on("chat", function(data){
   $("#chat #timeline").prepend(m);
 });
 
-io.on("connect", function(session){
-  console.log("connect!! "+session);
+io.on("connect", function(){
+  console.log("connect!! "+io.session);
   $("#type").text("type : "+io.type);
 });
 
-io.on("disconnect", function(session){
+io.on("disconnect", function(){
   console.log("disconnect!!");
 });
 

data/sample/views/{index.haml → chat.haml}

@@ -4,14 +4,16 @@
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html', :charset => 'UTF-8'}
     %title sinatra-rocketio chat
     %link{:rel => 'stylesheet', :href => "/main.css", :type => 'text/css'}
+    :javascript
+      var channel = "#{@channel}";
     %script{:type => 'text/javascript', :src => "//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"}
     %script{:type => 'text/javascript', :src => rocketio_js}
-    %script{:type => 'text/javascript', :src => "/js/index.js"}
+    %script{:type => 'text/javascript', :src => "/js/chat.js"}
 
   %body
     %div#content
       %div#header
-        %h1 rocketio chat
+        %h1 rocketio chat [ch:#{@channel}]
         %span#type
       %div#main
         %div#chat

data/sinatra-rocketio.gemspec

@@ -25,9 +25,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "httparty"
   gem.add_development_dependency "json"
 
-  gem.add_dependency "sinatra-cometio", ">= 0.4.0"
-  gem.add_dependency "sinatra-websocketio", ">= 0.2.0"
+  gem.add_dependency "sinatra-cometio", ">= 0.4.3"
+  gem.add_dependency "sinatra-websocketio", ">= 0.2.2"
   gem.add_dependency "sinatra"
   gem.add_dependency "eventmachine", ">= 1.0.0"
   gem.add_dependency "event_emitter", ">= 0.2.4"
+  gem.add_dependency "hashie"
 end

data/test/app.rb

@@ -1,5 +1,3 @@
-require 'httparty'
-
 class App
 
   def self.running
@@ -26,48 +24,15 @@ class App
     "http://localhost:#{port}/cometio/io"
   end
 
-  def self.pid_file
-    ENV['PID_FILE'] || "/tmp/sinatra-rocketio-testapp.pid"
-  end
-
   def self.app_dir
     File.expand_path 'app', File.dirname(__FILE__)
   end
 
-  def self.pid
-    return unless @running
-    File.open(pid_file) do |f|
-      pid = f.gets.strip.to_i
-      return pid if pid > 0
-    end
-    return
-  end
-
   def self.start
-    return if @running
-    File.delete pid_file if File.exists? pid_file
-    Thread.new do
-      IO::popen "cd #{app_dir} && PID_FILE=#{pid_file} WS_PORT=#{ws_port} rackup config.ru -p #{port} > /dev/null 2>&1"
-    end
+    return if running
     @running = true
-    100.times do
-      if File.exists? pid_file
-        sleep 2
-        return true
-      end
-      sleep 0.1
-    end
-    @running = false
-    return false
-  end
-
-  def self.stop
-    return unless @running
-    if File.exists? pid_file
-      system "kill -9 #{pid}"
-      File.delete pid_file
-    end
-    @running = false
+    cmd = "cd #{app_dir} && WS_PORT=#{ws_port} rackup config.ru -p #{port}"
+    system cmd
   end
 
 end

data/test/app/main.rb

@@ -1,13 +1,3 @@
-pid_file = ENV['PID_FILE'] || "/tmp/sinatra-rocketio-test-pid"
-EM::defer do
-  while !EM::reactor_running? do
-    sleep 0.1
-  end
-  File.open(pid_file, "w+") do |f|
-    f.write Process.pid.to_s
-  end
-end
-
 class TestApp < Sinatra::Base
   register Sinatra::RocketIO
   io = Sinatra::RocketIO
@@ -16,23 +6,28 @@ class TestApp < Sinatra::Base
     "sinatra-rocketio v#{Sinatra::RocketIO::VERSION}"
   end
 
-  io.on :connect do |session, type|
-    puts "new client <session:#{session}> <type:#{type}>"
+  io.on :connect do |client|
+    puts "new client <session:#{client.session}> <type:#{client.type}>"
   end
 
-  io.on :disconnect do |session, type|
-    puts "disconnect client <session:#{session}> <type:#{type}>"
+  io.on :disconnect do |client|
+    puts "disconnect client <session:#{client.session}> <type:#{client.type}>"
   end
 
-  io.on :broadcast do |data, from, type|
+  io.on :broadcast do |data, client|
     puts from
-    puts "broadcast <session:#{from}> <type:#{type}> - #{data.to_json}"
+    puts "broadcast <session:#{client.session}> <type:#{client.type}> - #{data.to_json}"
     push :broadcast, data
   end
 
-  io.on :message do |data, from, type|
-    puts "message <session:#{from}> <type:#{type}> - #{data.to_json}"
+  io.on :message do |data, client|
+    puts "message <session:#{client.session}> <type:#{client.type}> - #{data.to_json}"
     push :message, data, :to => data['to']
   end
 
+  io.on :to_channel do |data, client|
+    puts "message to channel:#{client.channel} <type:#{client.type}> - #{data.to_json}"
+    push :to_channel, data, :channel => client.channel
+  end
+
 end

data/test/test_channel.rb

@@ -0,0 +1,49 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestChannel < MiniTest::Unit::TestCase
+
+  def test_channel
+    ## client1(comet, channel "aaa") --> server --> client3(websocket, channel "aaa")
+    ## client2(websocket, channel "bbb") not receive data from channel "aaa"
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
+    res = nil
+    res2 = nil
+    res3 = nil
+    client = Sinatra::RocketIO::Client.new(App.url, :type => :comet, :channel => "aaa").connect
+    client.on :to_channel do |data|
+      res = data
+    end
+
+    client.on :connect do
+      client2 = Sinatra::RocketIO::Client.new(App.url, :type => :websocket, :channel => "bbb").connect
+      client2.on :connect do
+        client3 = Sinatra::RocketIO::Client.new(App.url, :type => :websocket, :channel => "aaa").connect
+        client3.on :connect do
+          client.push :to_channel, post_data
+        end
+        client3.on :to_channel do |data|
+          res3 = data
+          client3.close
+        end
+      end
+      client2.on :to_channel do |data|
+        res2 = data
+        client2.close
+      end
+    end
+
+    50.times do
+      break if res != nil and res3 != nil
+      sleep 0.1
+    end
+    client.close
+    assert res != nil, 'comet server not respond'
+    assert res["time"] == post_data[:time]
+    assert res["msg"] == post_data[:msg]
+    assert res3 != nil, 'websocket server not respond'
+    assert res3["time"] == post_data[:time]
+    assert res3["msg"] == post_data[:msg]
+    assert res2 == nil, 'channel error'
+  end
+
+end

data/test/test_helper.rb

@@ -6,10 +6,3 @@ require 'sinatra/rocketio/client'
 require 'httparty'
 require 'json'
 require File.expand_path 'app', File.dirname(__FILE__)
-
-
-['SIGHUP', 'SIGINT', 'SIGKILL', 'SIGTERM'].each do |sig|
-  Kernel.trap sig do
-    App.stop
-  end
-end

data/test/test_push_multi_client.rb

@@ -0,0 +1,49 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestPushMultiClient < MiniTest::Unit::TestCase
+
+  def test_push_multi
+    ## client1(comet) --> server --> client2(comet) & client3(websocket)
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
+    res = nil
+    res2 = nil
+    res3 = nil
+    client = Sinatra::RocketIO::Client.new(App.url, :type => :comet).connect
+    client.on :message do |data|
+      res = data
+    end
+
+    client.on :connect do
+      client2 = Sinatra::RocketIO::Client.new(App.url, :type => :comet).connect
+      client2.on :connect do
+        client3 = Sinatra::RocketIO::Client.new(App.url, :type => :websocket).connect
+        client3.on :connect do
+          post_data[:to] = [client2.session, client3.session]
+          client.push :message, post_data
+        end
+        client3.on :message do |data|
+          res3 = data
+          client3.close
+        end
+      end
+      client2.on :message do |data|
+        res2 = data
+        client2.close
+      end
+    end
+
+    50.times do
+      break if res2 != nil and res3 != nil
+      sleep 0.1
+    end
+    client.close
+    assert res2 != nil, 'server not respond'
+    assert res2["time"] == post_data[:time]
+    assert res2["msg"] == post_data[:msg]
+    assert res3 != nil, 'server not respond'
+    assert res3["time"] == post_data[:time]
+    assert res3["msg"] == post_data[:msg]
+    assert res == nil
+  end
+
+end

data/test/test_rocketio.rb

@@ -2,14 +2,6 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestRocketIO < MiniTest::Unit::TestCase
 
-  def setup
-    App.start
-  end
-
-  def teardown
-    App.stop
-  end
-
   def test_websocket_to_comet
     ## websocket --> server --> comet
     post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
@@ -20,10 +12,10 @@ class TestRocketIO < MiniTest::Unit::TestCase
       res = data
     end
 
-    client.on :connect do |session|
+    client.on :connect do
       client2 = Sinatra::RocketIO::Client.new(App.url, :type => :comet).connect
-      client2.on :connect do |session2|
-        post_data['to'] = session2
+      client2.on :connect do
+        post_data['to'] = client2.session
         client.push :message, post_data
       end
       client2.on :message do |data|
@@ -34,7 +26,7 @@ class TestRocketIO < MiniTest::Unit::TestCase
     end
 
     50.times do
-      break if res != nil
+      break if res2 != nil
       sleep 0.1
     end
     client.close
@@ -54,10 +46,10 @@ class TestRocketIO < MiniTest::Unit::TestCase
       res = data
     end
 
-    client.on :connect do |session|
+    client.on :connect do
       client2 = Sinatra::RocketIO::Client.new(App.url, :type => :websocket).connect
-      client2.on :connect do |session2|
-        post_data['to'] = session2
+      client2.on :connect do
+        post_data['to'] = client2.session
         client.push :message, post_data
       end
       client2.on :message do |data|
@@ -68,7 +60,7 @@ class TestRocketIO < MiniTest::Unit::TestCase
     end
 
     50.times do
-      break if res != nil
+      break if res2 != nil
       sleep 0.1
     end
     client.close

data/test/test_settings.rb

@@ -2,14 +2,6 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestSettingsIO < MiniTest::Unit::TestCase
 
-  def setup
-    App.start
-  end
-
-  def teardown
-    App.stop
-  end
-
   def test_settings
     res = JSON.parse HTTParty.get("#{App.url}/rocketio/settings").body
     assert App.websocketio_url == res['websocket']

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,195 +27,185 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-cometio
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: sinatra-websocketio
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   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: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: event_emitter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: WebSocket/Comet IO plugin for Sinatra
 email:
 - hashimoto@shokai.org
@@ -236,6 +223,8 @@ files:
 - lib/js/rocketio.js
 - lib/sinatra-rocketio.rb
 - lib/sinatra-rocketio/application.rb
+- lib/sinatra-rocketio/channel.rb
+- lib/sinatra-rocketio/client_info.rb
 - lib/sinatra-rocketio/helpers.rb
 - lib/sinatra-rocketio/javascript.rb
 - lib/sinatra-rocketio/options.rb
@@ -247,50 +236,47 @@ files:
 - sample/bin/cui_chat_client.rb
 - sample/config.ru
 - sample/main.rb
-- sample/public/js/index.js
-- sample/views/index.haml
+- sample/public/js/chat.js
+- sample/views/chat.haml
 - sample/views/main.scss
 - sinatra-rocketio.gemspec
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb
+- test/test_channel.rb
 - test/test_helper.rb
+- test/test_push_multi_client.rb
 - test/test_rocketio.rb
 - test/test_settings.rb
 homepage: https://github.com/shokai/sinatra-rocketio
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1593017263457838199
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1593017263457838199
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: WebSocket/Comet IO plugin for Sinatra
 test_files:
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb
+- test/test_channel.rb
 - test/test_helper.rb
+- test/test_push_multi_client.rb
 - test/test_rocketio.rb
 - test/test_settings.rb