em-rocketio-client 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: be3c3fd9b1d6aad850a146c222942eced15b0bd8
+  data.tar.gz: f38e6bb9809160bb9fd8936dbe1ee906ec992385
+SHA512:
+  metadata.gz: 3f6a42bbfffbd243929871741d4a02d01e3be031ac89b935952d4f409b3cad8e5d156e1ef179ffe12e82b460d927d08c255dae238a1298a26be94260a2e566d2
+  data.tar.gz: ab4236ac8877dd8022f1dfe20e6870d7aef17849c1465accaa8ed454fcac0a5f5437cb9aa9e38ecf04a0b19c85adac433af5f30591b753f95a2fdd0c430112e2

data/.gitignore

@@ -1,8 +1,11 @@
+*~
+*#*
 *.gem
 *.rbc
 .bundle
 .config
 .yardoc
+.ruby-version
 InstalledFiles
 _yardoc
 coverage

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.0 2013-04-01
+
+* support Sinatra::RocketIO v0.2.0
+
 === 0.0.3 2013-03-25
 
 * retry get /rocketio/settings

data/README.md

@@ -20,7 +20,7 @@ require 'em-rocketio-client'
 EM::run do
   io = EM::RocketIO::Client.new('http://localhost:5000').connect
   # io = EM::RocketIO::Client.new('http://localhost:5000', :type => :comet).connect
-
+  # io = EM::RocketIO::Client.new('http://localhost:5000', :channel => '1').connect
   io.on :connect do |session|
     puts "#{io.type} connect!! (sessin_id:#{session})"
   end
@@ -72,9 +72,15 @@ Test
 
     % gem install bundler
     % bundle install
+
+start server
+
     % export PORT=5000
     % export WS_PORT=8080
-    % export PID_FILE=/tmp/em-rocketio-client-testapp.pid
+    % rake test_server
+
+run test
+
     % rake test
 
 

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

@@ -5,12 +5,13 @@ module EventMachine
       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
         @settings = nil
         @io = nil
         @ws_close_timer = nil
@@ -37,7 +38,7 @@ module EventMachine
           if e.error == Errno::ECONNREFUSED
             emit :error, "connection refused (#{url})"
           else
-            emit :error, "#{err.error} (#{url})"
+            emit :error, "#{e.error} (#{url})"
           end
           EM::add_timer 10 do
             get_settings
@@ -58,8 +59,13 @@ module EventMachine
             raise Error, "cannnot found #{@type} IO"
           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_timer = EM::add_timer 3 do
               close
@@ -82,7 +88,7 @@ module EventMachine
       end
 
       def push(type, data={})
-        @io.push type, data
+        @io.push type, data if @io
       end
 
       def method_missing(name, *args)

data/lib/em-rocketio-client/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
   module RocketIO
     class Client
-      VERSION = "0.0.3"
+      VERSION = "0.1.0"
     end
   end
 end

data/sample/cui_chat_client.rb

@@ -11,8 +11,8 @@ EM::run do
   io = EM::RocketIO::Client.new(url, :type => type).connect
   # io = EM::RocketIO::Client.new('http://localhost:5000', :type => :comet).connect
 
-  io.on :connect do |session|
-    puts "#{io.type} connect!! (sessin_id:#{session})"
+  io.on :connect do
+    puts "#{io.type} connect!! (sessin_id:#{io.session})"
   end
 
   io.on :disconnect do

data/test/app.rb

@@ -24,48 +24,15 @@ class App
     "http://localhost:#{port}/cometio/io"
   end
 
-  def self.pid_file
-    ENV['PID_FILE'] || "/tmp/em-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/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
@@ -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,54 @@
+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
+    EM::run do
+      client = EM::RocketIO::Client.new(App.url, :type => :comet, :channel => "aaa").connect
+      client.on :to_channel do |data|
+        res = data
+      end
+
+      client.on :connect do
+        client2 = EM::RocketIO::Client.new(App.url, :type => :websocket, :channel => "bbb").connect
+        client2.on :connect do
+          client3 = EM::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
+
+      EM::defer do
+        50.times do
+          break if res != nil and res3 != nil
+          sleep 0.1
+        end
+        client.close
+        EM::stop
+      end
+    end
+    assert res != nil, 'server not respond'
+    assert res["time"] == post_data[:time]
+    assert res["msg"] == post_data[:msg]
+    assert res3 != nil, '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_em_rocketio_client.rb

@@ -2,14 +2,6 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestEmRocketioClient < 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}
@@ -30,10 +22,10 @@ class TestEmRocketioClient < MiniTest::Unit::TestCase
         end
       end
 
-      client.on :connect do |session|
+      client.on :connect do
         client2 = EM::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|
@@ -74,10 +66,10 @@ class TestEmRocketioClient < MiniTest::Unit::TestCase
         end
       end
 
-      client.on :connect do |session|
+      client.on :connect do
         client2 = EM::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|

data/test/test_helper.rb

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: em-rocketio-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-04-01 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,145 +27,127 @@ 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: sinatra-rocketio
   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: em-cometio-client
   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: em-websocketio-client
   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: em-http-request
   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: '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: event_emitter
   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'
 description: Sinatra RocketIO client for eventmachine
@@ -192,42 +171,37 @@ files:
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb
+- test/test_channel.rb
 - test/test_em_rocketio_client.rb
 - test/test_helper.rb
 homepage: https://github.com/shokai/em-rocketio-client
 licenses:
 - MIT
+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: 489993316475369448
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 489993316475369448
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sinatra RocketIO client for eventmachine
 test_files:
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb
+- test/test_channel.rb
 - test/test_em_rocketio_client.rb
 - test/test_helper.rb