test/app/main.rb in em-rocketio-client-0.0.3 vs test/app/main.rb in em-rocketio-client-0.1.0

- old
+ new

@@ -1,38 +1,33 @@ -pid_file = ENV['PID_FILE'] || "/tmp/em-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 get '/' do "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