em-rocketio-client 0.0.1 → 0.0.2

data/History.txt

@@ -0,0 +1,9 @@
+=== 0.0.2 2013-03-25
+
+* use EM::HttpRequest to get settings
+* use comet if websocket port close
+
+=== 0.0.1 2013-03-24
+
+* implement EM::RocketIO::Client
+* add tests

data/README.md

@@ -62,6 +62,9 @@ start [chat server](https://github.com/shokai/rocketio-chat-sample)
 sample chat client
 
     % ruby sample/cui_chat_client.rb
+    % ruby sample/cui_chat_client.rb http://localhost:5000 comet
+    % ruby sample/cui_chat_client.rb http://localhost:5000 websocket
+    % ruby sample/cui_chat_client.rb http://rocketio-chat.herokuapp.com
 
 
 Test

data/em-rocketio-client.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "em-cometio-client"
   spec.add_dependency "em-websocketio-client"
+  spec.add_dependency "em-http-request"
   spec.add_dependency "eventmachine"
   spec.add_dependency "event_emitter"
 end

data/lib/em-rocketio-client.rb

@@ -1,7 +1,7 @@
 require "em-cometio-client"
 require "em-websocketio-client"
+require "em-http"
 require "event_emitter"
-require "httparty"
 
 require "em-rocketio-client/version"
 require "em-rocketio-client/client"

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

@@ -8,28 +8,54 @@ module EventMachine
       attr_reader :settings, :type, :io
 
       def initialize(url, opt={:type => :websocket})
-        @settings = JSON.parse HTTParty.get("#{url}/rocketio/settings").body
-        type = opt[:type].to_sym
-        if type == :websocket and @settings.include? 'websocket'
-          @type = :websocket
-          @io = EM::WebSocketIO::Client.new @settings['websocket']
-        elsif type == :comet or @settings.include? 'comet'
-          @type = :comet
-          @io = EM::CometIO::Client.new @settings['comet']
-        else
-          raise Error, "cannot find #{type} IO #{url}"
-        end
-        this = self
-        if @io
-          @io.on :* do |event_name, *args|
-            this.emit event_name, *args
+        http = EM::HttpRequest.new("#{url}/rocketio/settings").get
+        http.callback do |res|
+          begin
+            @settings = JSON.parse res.response
+            emit :__settings
+          rescue => e
+            emit :error, e
           end
         end
+        http.errback do |err|
+          emit :error, err
+        end
+        @settings = nil
+        @type = opt[:type].to_sym
+        @io = nil
+        @ws_close_timer = nil
         self
       end
 
       def connect
-        @io.connect
+        this = self
+        once :__settings do
+          if @type == :websocket and @settings.include? 'websocket'
+            @io = EM::WebSocketIO::Client.new(@settings['websocket']).connect
+            @type = :websocket
+          elsif @type == :comet or @settings.include? 'comet'
+            @io = EM::CometIO::Client.new(@settings['comet']).connect
+            @type = :comet
+          else
+            raise Error, "cannnot found #{@type} IO"
+          end
+          @io.on :* do |event_name, *args|
+            this.emit event_name, *args
+          end
+          if @type == :websocket
+            @ws_close_timer = EM::add_timer 3 do
+              close
+              emit :error, "websocket port is not open"
+              @type = :comet
+              connect
+            end
+            once :connect do
+              EM::cancel_timer @ws_close_timer if @ws_close_timer
+              @ws_close_timer = nil
+            end
+          end
+        end
+        emit :__settings if @settings
         self
       end
 

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

@@ -1,7 +1,7 @@
 module EventMachine
   module RocketIO
     class Client
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/sample/cui_chat_client.rb

@@ -4,13 +4,13 @@ require 'rubygems'
 require 'em-rocketio-client'
 
 name = `whoami`.strip || 'shokai'
+url = ARGV.shift || 'http://localhost:5000'
+type = ARGV.shift || :websocket
 
 EM::run do
-  io = EM::RocketIO::Client.new('http://localhost:5000').connect
+  io = EM::RocketIO::Client.new(url, :type => type).connect
   # io = EM::RocketIO::Client.new('http://localhost:5000', :type => :comet).connect
 
-  puts "waiting #{io.url}"
-
   io.on :connect do |session|
     puts "#{io.type} connect!! (sessin_id:#{session})"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-rocketio-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !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
@@ -164,6 +180,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- History.txt
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -192,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2360181630930510065
+      hash: -1144909537786035636
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2360181630930510065
+      hash: -1144909537786035636
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24