em-cometio-client 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.3 2013-3-5
+
+* modify default timeout
+* add timeout property
+
 === 0.0.2 2013-3-4
 
 * add test

data/README.md

@@ -35,10 +35,8 @@ EM::run do
   end
 
   ## push "chat" event to Server
-  EM::defer do
-    loop do
-      client.push :chat, {:message => Time.now.to_s, :name => 'clock'}
-    end
+  EM::add_periodic_timer 10 do
+    client.push :chat, {:message => Time.now.to_s, :name => 'clock'}
   end
 end
 ```

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

@@ -3,17 +3,19 @@ module EventMachine
     class Client
       include EventEmitter
       attr_reader :url, :session
+      attr_accessor :timeout
 
       def initialize(url)
         raise ArgumentError, "invalid URL (#{url})" unless url.kind_of? String and url =~ /^https?:\/\/.+/
         @url = url
         @session = nil
         @running = false
+        @timeout = 120
       end
 
       def push(type, data)
         that = self
-        http = EM::HttpRequest.new(@url, :connect_timeout => 60000).
+        http = EM::HttpRequest.new(@url, :connect_timeout => 10).
           post(:body => {:type => type, :data => data, :session => @session})
         http.callback do |res|
         end
@@ -40,12 +42,13 @@ module EventMachine
 
       private
       def get
-        http = EM::HttpRequest.new("#{@url}?session=#{@session}", :connect_timeout => 60000).get
+        http = EM::HttpRequest.new("#{@url}?session=#{@session}", :connect_timeout => @timeout).get
         http.callback do |res|
           begin
             data = JSON.parse res.response
             self.emit data['type'], data['data']
-          rescue
+          rescue JSON::ParserError
+          rescue StandardError
             self.emit :error, "CometIO get error"
             sleep 10
           end

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

@@ -1,7 +1,7 @@
 module EventMachine
   module CometIO
     class Client
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-cometio-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine