sinatra-rocketio 0.0.3 → 0.0.4

data/Gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sinatra-rocketio.gemspec
 gemspec
+gem 'minitest'
 gem 'thin'
+gem 'em-cometio-client'

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.4 2013-03-18
+
+* fix gem dependencies
+
 === 0.0.3 2013-03-18
 
 * delete routes of cometio.js and websocketio.js

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-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/sample/Gemfile.lock

@@ -36,14 +36,14 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    sinatra-cometio (0.3.3)
-      event_emitter (>= 0.2.0)
-      eventmachine
-      httparty
-      json
-      rack
-      sinatra
-      sinatra-contrib
+    sinatra-cometio (0.3.4)
+      event_emitter (>= 0.2.3)
+      eventmachine (>= 1.0.0)
+      httparty (>= 0.10.2)
+      json (>= 1.7.0)
+      rack (>= 1.5.0)
+      sinatra (>= 1.3.6)
+      sinatra-contrib (>= 1.3.2)
     sinatra-contrib (1.3.2)
       backports (>= 2.0)
       eventmachine
@@ -65,7 +65,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.17.0)
-    tilt (1.3.5)
+    tilt (1.3.6)
     websocket (1.0.7)
 
 PLATFORMS

data/sinatra-rocketio.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency "rack"
-  gem.add_dependency "sinatra"
-  gem.add_dependency "eventmachine"
-  gem.add_dependency "event_emitter"
-  gem.add_dependency "sinatra-contrib"
-  gem.add_dependency "sinatra-cometio"
-  gem.add_dependency "sinatra-websocketio"
+  gem.add_dependency "rack", ">= 1.5.0"
+  gem.add_dependency "sinatra", ">= 1.3.6"
+  gem.add_dependency "eventmachine", ">= 1.0.0"
+  gem.add_dependency "event_emitter", ">= 0.2.3"
+  gem.add_dependency "sinatra-contrib", ">= 1.3.2"
+  gem.add_dependency "sinatra-cometio", ">= 0.3.4"
+  gem.add_dependency "sinatra-websocketio", ">= 0.1.2"
 end

data/test/app.rb

@@ -0,0 +1,70 @@
+require 'httparty'
+
+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.cometio_url
+    "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
+    @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
+  end
+
+end

data/test/app/config.ru

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

data/test/app/main.rb

@@ -0,0 +1,38 @@
+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
+
+  get '/' do
+    "sinatra-rocketio v#{Sinatra::RocketIO::VERSION}"
+  end
+
+  io.on :connect do |session, type|
+    puts "new client <session:#{session}> <type:#{type}>"
+  end
+
+  io.on :disconnect do |session, type|
+    puts "disconnect client <session:#{session}> <type:#{type}>"
+  end
+
+  io.on :broadcast do |data, from, type|
+    puts from
+    puts "broadcast <session:#{from}> <type:#{type}> - #{data.to_json}"
+    push :broadcast, data
+  end
+
+  io.on :message do |data, from, type|
+    puts "message <session:#{from}> <type:#{type}> - #{data.to_json}"
+    push :message, data, :to => data['to']
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'bundler/setup'
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'minitest/autorun'
+require 'em-cometio-client'
+require 'em-websocketio-client'
+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_rocketio.rb

@@ -0,0 +1,100 @@
+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}
+    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::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
+          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_comet_to_websocket
+    ## comet --> server --> websocket
+    post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
+    res = nil
+    res2 = nil
+    EM::run do
+      client = EM::CometIO::Client.new(App.cometio_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
+        client2.on :disconnect do
+          EM.stop_event_loop
+        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
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: event_emitter
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: sinatra-cometio
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: sinatra-websocketio
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 description: Node.js like WebSocket/Comet I/O plugin for Sinatra
 email:
 - hashimoto@shokai.org
@@ -157,6 +157,11 @@ files:
 - sample/views/index.haml
 - sample/views/main.scss
 - sinatra-rocketio.gemspec
+- test/app.rb
+- test/app/config.ru
+- test/app/main.rb
+- test/test_helper.rb
+- test/test_rocketio.rb
 homepage: https://github.com/shokai/sinatra-rocketio
 licenses: []
 post_install_message: 
@@ -181,4 +186,9 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Node.js like WebSocket/Comet 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_rocketio.rb