sinatra-websocketio 0.0.5 → 0.0.6

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sinatra-websocketio.gemspec
 gemspec
+gem 'minitest'
+gem 'thin'

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.6 2013-03-10
+
+* add tests
+
 === 0.0.5 2013-03-10
 
 * handle 10K clients

data/README.md

@@ -159,6 +159,17 @@ chat app
 - https://github.com/shokai/sinatra-websocketio/tree/master/sample
 
 
+Test
+----
+
+    % gem install bundler
+    % bundle install
+    % export PORT=5000
+    % export WS_PORT=8080
+    % export PID_FILE=/tmp/sinatra-websocketio-test.pid
+    % rake test
+
+
 Contributing
 ------------
 1. Fork it

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/test_*.rb"
+end
+
+task :default => :test

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/test/app.rb

@@ -0,0 +1,61 @@
+class App
+
+  def self.running
+    @running ? true : false
+  end
+
+  def self.port
+    ENV['PORT'] || 5000
+  end
+
+  def self.ws_port
+    ENV['WS_PORT'] || 8080
+  end
+
+  def self.websocketio_url
+    "ws://localhost:#{ws_port}"
+  end
+
+  def self.pid_file
+    ENV['PID_FILE'] || "/tmp/sinatra-cometio-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
+    @running = true
+    100.times do
+      if File.exists? pid_file
+        sleep 1
+        return true
+      end
+      sleep 0.1
+    end
+    @running = false
+    return false
+  end
+
+  def self.stop
+    return unless @running
+    system "kill #{pid}"
+    File.delete pid_file if File.exists? pid_file
+    @running = false
+  end
+
+end

data/test/app/config.ru

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+$stdout.sync = true
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+require 'sinatra'
+require 'sinatra/websocketio'
+require File.dirname(__FILE__)+'/main'
+
+set :websocketio, :port => ENV['WS_PORT'].to_i
+
+run TestApp

data/test/app/main.rb

@@ -0,0 +1,31 @@
+pid_file = ENV['PID_FILE'] || "/tmp/sinatra-websocketio-test-pid"
+File.open(pid_file, "w+") do |f|
+  f.write Process.pid.to_s
+end
+
+class TestApp < Sinatra::Application
+
+  get '/' do
+    "sinatra-websocketio v#{Sinatra::WebSocketIO::VERSION}"
+  end
+
+  WebSocketIO.on :connect do |session|
+    puts "new client <#{session}>"
+  end
+
+  WebSocketIO.on :disconnect do |session|
+    puts "disconnect client <#{session}>"
+  end
+
+  WebSocketIO.on :broadcast do |data, from|
+    puts from
+    puts "broadcast <#{from}> - #{data.to_json}"
+    push :broadcast, data
+  end
+
+  WebSocketIO.on :message do |data, from|
+    puts "message <#{from}> - #{data.to_json}"
+    push :message, data, :to => data['to']
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'em-websocketio-client'
+require File.expand_path 'app', File.dirname(__FILE__)
+
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+
+['SIGHUP', 'SIGINT', 'SIGKILL', 'SIGTERM'].each do |sig|
+  Kernel.trap sig do
+    App.stop
+  end
+end

data/test/test_websocketio.rb

@@ -0,0 +1,132 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestWebSocketIO < MiniTest::Unit::TestCase
+
+  def setup
+    App.start
+  end
+
+  def teardown
+    App.stop
+  end
+
+  def test_simple
+    res = nil
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
+    EM::run do
+      client = EM::WebSocketIO::Client.new(App.websocketio_url).connect
+
+      client.on :broadcast do |data|
+        res = data
+        client.close
+      end
+
+      client.on :disconnect do
+        EM.stop_event_loop
+      end
+
+      client.on :connect do |session|
+        push :broadcast, post_data
+      end
+
+      EM::defer do
+        50.times do
+          break if res != nil
+          sleep 0.1
+        end
+        client.close
+      end
+    end
+    assert res != nil, 'server not respond'
+    assert res["time"] == post_data[:time]
+    assert res["msg"] == post_data[:msg]
+  end
+
+  def test_client_to_client2
+    ## client --> server --> client2
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
+    res = nil
+    res2 = nil
+    EM::run do
+      client = EM::WebSocketIO::Client.new(App.websocketio_url).connect
+      client.on :message do |data|
+        res = data
+      end
+
+      client.on :disconnect do
+        EM.stop_event_loop
+      end
+
+      client.on :connect do |session|
+        client2 = EM::WebSocketIO::Client.new(App.websocketio_url).connect
+        client2.on :connect do |session2|
+          post_data['to'] = session2
+          client.push :message, post_data
+        end
+        client2.on :message do |data|
+          res2 = data
+          client2.close
+          client.close
+        end
+      end
+
+      EM::defer do
+        50.times do
+          break if res != nil
+          sleep 0.1
+        end
+        client.close
+      end
+    end
+    assert res2 != nil, 'server not respond'
+    assert res2["time"] == post_data[:time]
+    assert res2["msg"] == post_data[:msg]
+    assert res == nil
+  end
+
+
+  def test_broadcast
+    ## client --> server --> client&client2
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
+    res = nil
+    res2 = nil
+
+    EM::run do
+      client = EM::WebSocketIO::Client.new(App.websocketio_url).connect
+      client.on :broadcast do |data|
+        res = data
+      end
+
+      client.on :disconnect do
+        EM.stop_event_loop
+      end
+
+      client.on :connect do |session|
+        client2 = EM::WebSocketIO::Client.new(App.websocketio_url).connect
+        client2.on :connect do |session2|
+          client.push :broadcast, post_data
+        end
+        client2.on :broadcast do |data|
+          res2 = data
+          client2.close
+        end
+      end
+
+      EM::defer do
+        50.times do
+          break if res != nil and res2 != nil
+          sleep 0.1
+        end
+        client.close
+      end
+    end
+
+    assert res != nil, 'server not respond'
+    assert res["time"] == post_data[:time]
+    assert res["msg"] == post_data[:msg]
+    assert res2 != nil
+    assert res2["time"] == post_data[:time]
+    assert res2["msg"] == post_data[:msg]
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -173,6 +173,11 @@ files:
 - sample/views/index.haml
 - sample/views/main.scss
 - sinatra-websocketio.gemspec
+- test/app.rb
+- test/app/config.ru
+- test/app/main.rb
+- test/test_helper.rb
+- test/test_websocketio.rb
 homepage: https://github.com/shokai/sinatra-websocketio
 licenses: []
 post_install_message: 
@@ -197,4 +202,9 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Node.js like WebSocket I/O plugin for Sinatra.
-test_files: []
+test_files:
+- test/app.rb
+- test/app/config.ru
+- test/app/main.rb
+- test/test_helper.rb
+- test/test_websocketio.rb