sinatra-rocketio 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.2 2013-03-25
+
+* retry get /rocketio/settings
+
 === 0.1.1 2013-03-25
 
 * ruby client - use comet if websocket port close

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/sinatra/rocketio/client.rb

@@ -14,15 +14,38 @@ module Sinatra
       include EventEmitter
       attr_reader :settings, :type, :io
 
+      public
       def initialize(url, opt={:type => :websocket})
+        @url = url
         @type = opt[:type].to_sym
         @io = nil
-        @settings = JSON.parse HTTParty.get("#{url}/rocketio/settings").body
+        @settings = nil
         @ws_close_thread = nil
         self
       end
 
+      private
+      def get_settings
+        url = "#{@url}/rocketio/settings"
+        begin
+          res = HTTParty.get url
+          unless res.code == 200
+            emit :error, "#{res.code} get error (#{url})"
+            sleep 10
+            get_settings
+          else
+            @settings = JSON.parse res.body
+          end
+        rescue => e
+          emit :error, "#{e} (#{url})"
+          sleep 10
+          get_settings
+        end
+      end
+
+      public
       def connect
+        get_settings unless @settings
         this = self
         if @type == :websocket and @settings.include? 'websocket'
           @io = Sinatra::WebSocketIO::Client.new(@settings['websocket']).connect
@@ -54,11 +77,11 @@ module Sinatra
       end
 
       def close
-        @io.close
+        @io.close if @io
       end
 
       def push(type, data)
-        @io.push type, data
+        @io.push type, data if @io
       end
 
       def method_missing(name, *args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -271,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1955004754093144162
+      hash: 1593017263457838199
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1955004754093144162
+      hash: 1593017263457838199
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24