sinatra-cometio 0.1.4 → 0.1.5

data/Gemfile

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

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.5 2013-3-3
+
+* add tests with ruby client
+
 === 0.1.4 2013-3-2
 
 * add CometIO::Client

data/README.md

@@ -140,6 +140,16 @@ chat app
 - https://github.com/shokai/sinatra-cometio/tree/master/sample
 
 
+Test
+----
+
+    % gem install bundler
+    % bundle install
+    % export PORT=5000
+    % export PID_FILE=/tmp/sinatra-cometio-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-cometio/version.rb

@@ -1,3 +1,3 @@
 module SinatraCometIO
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/sample/views/index.haml

@@ -22,5 +22,6 @@
 
       %hr
       %div#footer
+        sinatra-cometio v#{SinatraCometIO::VERSION} -
         - src_url = 'https://github.com/shokai/sinatra-cometio'
         %a{:href => src_url} #{src_url}

data/test/app.rb

@@ -0,0 +1,57 @@
+class App
+
+  def self.running
+    @running ? true : false
+  end
+
+  def self.port
+    ENV['PORT'] || 5000
+  end
+
+  def self.cometio_url
+    "http://localhost:#{port}/cometio/io"
+  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} 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,10 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+$stdout.sync = true
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+require 'sinatra'
+require 'sinatra/cometio'
+require File.dirname(__FILE__)+'/main'
+
+run Sinatra::Application

data/test/app/main.rb

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

data/test/test_cometio.rb

@@ -0,0 +1,99 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestCometio < MiniTest::Unit::TestCase
+
+  def setup
+    App.start
+  end
+
+  def teardown
+    App.stop
+  end
+
+  def test_simple
+    client = CometIO::Client.new(App.cometio_url).connect
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
+    res = nil
+    client.on :broadcast do |data|
+      res = data
+    end
+
+    client.on :connect do |session|
+      push :broadcast, post_data
+    end
+
+    30.times do
+      break if res != nil
+      sleep 0.1
+    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
+
+    client = CometIO::Client.new(App.cometio_url).connect
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
+    res = nil
+    client.on :message do |data|
+      res = data
+    end
+
+    res2 = nil
+    client.on :connect do |session|
+      client2 = CometIO::Client.new(App.cometio_url).connect
+      client2.on :connect do |session2|
+        post_data['to'] = session2
+        client.push :message, post_data
+      end
+      client2.on :message do |data|
+        res2 = data
+      end
+    end
+
+    30.times do
+      break if res != nil
+      sleep 0.1
+    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
+    client = CometIO::Client.new(App.cometio_url).connect
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
+    res = nil
+    client.on :broadcast do |data|
+      res = data
+    end
+
+    res2 = nil
+    client.on :connect do |session|
+      client2 = CometIO::Client.new(App.cometio_url).connect
+      client2.on :connect do |session2|
+        client.push :broadcast, post_data
+      end
+      client2.on :broadcast do |data|
+        res2 = data
+      end
+    end
+
+    30.times do
+      break if res != nil
+      sleep 0.1
+    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

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'sinatra/cometio/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -155,6 +155,11 @@ files:
 - sample/views/index.haml
 - sample/views/main.scss
 - sinatra-cometio.gemspec
+- test/app.rb
+- test/app/config.ru
+- test/app/main.rb
+- test/test_cometio.rb
+- test/test_helper.rb
 homepage: http://shokai.github.com/sinatra-cometio
 licenses: []
 post_install_message: 
@@ -179,4 +184,9 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Node.js like Comet I/O plugin for Sinatra.
-test_files: []
+test_files:
+- test/app.rb
+- test/app/config.ru
+- test/app/main.rb
+- test/test_cometio.rb
+- test/test_helper.rb