sinatra-cometio 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.7 2013-3-3
+
+* bugfix CometIO Ruby client
+* change config key xhr_interval -> timeout
+
 === 0.1.6 2013-3-3
 
 * add IO close function - CometIO.close()

data/README.md

@@ -141,7 +141,7 @@ require 'sinatra'
 require 'sinatra/cometio'
 require File.dirname(__FILE__)+'/main'
 
-set :cometio, :xhr_interval => 20
+set :cometio, :timeout => 60
 
 run Sinatra::Application
 ```

data/lib/js/cometio.js

@@ -60,7 +60,7 @@ var CometIO = function(){
         },
         type : "GET",
         dataType : "json",
-        timeout : <%= (CometIO.options[:xhr_interval]+10)*1000 %>
+        timeout : <%= (CometIO.options[:timeout]+10)*1000 %>
       }
     );
   };

data/lib/sinatra-cometio/application.rb

@@ -48,7 +48,7 @@ module Sinatra::CometIO
         end
       end
 
-      EM::add_timer CometIO.options[:xhr_interval] do
+      EM::add_timer CometIO.options[:timeout] do
         begin
           s.write({:type => :__heartbeat, :data => {:time => Time.now.to_i}}.to_json)
           s.flush

data/lib/sinatra-cometio/options.rb

@@ -2,7 +2,7 @@ class CometIO
 
   def self.default_options
     {
-      :xhr_interval => [15, lambda{|v| v.kind_of? Fixnum and v >= 10 }]
+      :timeout => [120, lambda{|v| v.kind_of? Fixnum and v >= 20 }]
     }
   end
 

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/lib/sinatra/cometio.rb

@@ -21,7 +21,7 @@ class CometIO
 
   def self.gc
     self.sessions.each do |id, s|
-      next unless s[:last] and s[:last] < Time.now-CometIO.options[:xhr_interval]*2-10
+      next unless s[:last] and s[:last] < Time.now-CometIO.options[:timeout]*2-10
       self.sessions.delete id rescue next
       self.emit :disconnect, id
     end
@@ -30,7 +30,7 @@ class CometIO
   EM::defer do
     loop do
       self.gc
-      sleep CometIO.options[:xhr_interval]+5
+      sleep CometIO.options[:timeout]+5
     end
   end
 

data/lib/sinatra/cometio/client.rb

@@ -20,11 +20,10 @@ class CometIO
 
     def push(type, data)
       begin
-        res = HTTParty.post @url, :body => {:type => type, :data => data, :session => @session}
+        res = HTTParty.post @url, :timeout => 10, :body => {:type => type, :data => data, :session => @session}
+        emit :error, "CometIO push error" unless res.code == 200
       rescue StandardError, Timeout::Error => e
         emit :error, "CometIO push error"
-      ensure
-        emit :error, "CometIO push error" unless res.code == 200
       end
     end
 
@@ -49,7 +48,7 @@ class CometIO
       Thread.new do
         while @running do
           begin
-            res = HTTParty.get "#{@url}?session=#{@session}", :timeout => 60000
+            res = HTTParty.get "#{@url}?session=#{@session}", :timeout => 120
             unless res.code == 200
               self.emit :error, "CometIO get error"
               sleep 10
@@ -57,9 +56,12 @@ class CometIO
             else
               data = JSON.parse res.body
               self.emit data['type'], data['data']
+              next
             end
-          rescue StandardError, Timeout::Error
-            self.emit :error, "CometIO get error"
+          rescue Timeout::Error, JSON::ParserError
+            next
+          rescue StandardError
+            self.emit :error, "CometIO get error 2"
             sleep 10
             next
           end

data/sample/config.ru

@@ -10,6 +10,6 @@ require 'sinatra/cometio'
 require File.dirname(__FILE__)+'/main'
 
 set :haml, :escape_html => true
-set :cometio, :xhr_interval => 20
+set :cometio, :timeout => 60
 
 run Sinatra::Application

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack