client.rb in sinatra-cometio-0.4.0

- old
+ new
@@ -1,76 +1,78 @@
 require File.expand_path '../../sinatra-cometio/version', File.dirname(__FILE__)
 require 'event_emitter'
 require 'httparty'
 require 'json'
 
-module CometIO
-  class Client
-    class Error < StandardError
-    end
+module Sinatra
+  module CometIO
+    class Client
+      class Error < StandardError
+      end
 
-    include EventEmitter
-    attr_reader :url, :session
+      include EventEmitter
+      attr_reader :url, :session
 
-    def initialize(url)
-      raise ArgumentError, "invalid URL (#{url})" unless url.kind_of? String and url =~ /^https?:\/\/.+/
-      @url = url
-      @session = nil
-      @running = false
-    end
+      def initialize(url)
+        raise ArgumentError, "invalid URL (#{url})" unless url.kind_of? String and url =~ /^https?:\/\/.+/
+        @url = url
+        @session = nil
+        @running = false
+      end
 
-    def push(type, data)
-      begin
-        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"
+      def push(type, data)
+        begin
+          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"
+        end
       end
-    end
 
-    def connect
-      return self if @running
-      self.on :__session_id do |session|
-        @session = session
-        self.emit :connect, @session
+      def connect
+        return self if @running
+        self.on :__session_id do |session|
+          @session = session
+          self.emit :connect, @session
+        end
+        @running = true
+        get
+        return self
       end
-      @running = true
-      get
-      return self
-    end
 
-    def close
-      @running = false
-      self.remove_listener :__session_id
-    end
+      def close
+        @running = false
+        self.remove_listener :__session_id
+      end
 
-    private
-    def get
-      Thread.new do
-        while @running do
-          begin
-            res = HTTParty.get "#{@url}?session=#{@session}", :timeout => 120
-            unless res.code == 200
+      private
+      def get
+        Thread.new do
+          while @running do
+            begin
+              res = HTTParty.get "#{@url}?session=#{@session}", :timeout => 120
+              unless res.code == 200
+                self.emit :error, "CometIO get error"
+                sleep 10
+                next
+              else
+                data_arr = JSON.parse res.body
+                data_arr = [data_arr] unless data_arr.kind_of? Array
+                data_arr.each do |data|
+                  self.emit data['type'], data['data']
+                end
+                next
+              end
+            rescue Timeout::Error, JSON::ParserError
+              next
+            rescue StandardError
               self.emit :error, "CometIO get error"
               sleep 10
               next
-            else
-              data_arr = JSON.parse res.body
-              data_arr = [data_arr] unless data_arr.kind_of? Array
-              data_arr.each do |data|
-                self.emit data['type'], data['data']
-              end
-              next
             end
-          rescue Timeout::Error, JSON::ParserError
-            next
-          rescue StandardError
-            self.emit :error, "CometIO get error"
-            sleep 10
-            next
           end
         end
       end
-    end
 
+    end
   end
 end