ruby_bosh 0.6.0 → 0.7.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :build: 
-:minor: 6
+:minor: 7
 :patch: 0

data/lib/ruby_bosh.rb

@@ -3,8 +3,6 @@ require 'builder'
 require 'rexml/document'
 require 'base64'
 require 'hpricot'
-require 'timeout'
-require 'system_timer'
 
 class RubyBOSH  
   BOSH_XMLNS    = 'http://jabber.org/protocol/httpbind'
@@ -126,32 +124,56 @@ class RubyBOSH
   end
 
   def parse(_response)
-    doc = Hpricot(_response)
+    doc = Hpricot(_response.to_s)
     doc.search("//body").each do |body|
       @sid = body.attributes["sid"].to_s
     end
     _response
   end
 
-  def deliver(xml)
-    SystemTimer.timeout(@timeout) do 
-      send(xml)
-      recv(RestClient.post(@service_url, xml, @headers))
+  begin
+    require 'system_timer'
+    def deliver(xml)
+      SystemTimer.timeout(@timeout) do 
+        send(xml)
+        recv(RestClient.post(@service_url, xml, @headers))
+      end
+    rescue ::Timeout::Error => e
+      raise RubyBOSH::Timeout, e.message
+    rescue Errno::ECONNREFUSED => e
+      raise RubyBOSH::ConnFailed, "could not connect to #{@host}\n#{e.message}"
+    rescue Exception => e
+      raise RubyBOSH::Error, e.message
+    end
+  rescue LoadError
+    warn "WARNING: using the built-in Timeout class which is known to have issues when used for opening connections. Install the SystemTimer gem if you want to make sure the Redis client will not hang." unless RUBY_VERSION >= "1.9" || RUBY_PLATFORM =~ /java/
+
+    require "timeout"
+    def deliver(xml)
+      Timeout.timeout(@timeout) do 
+        send(xml)
+        recv(RestClient.post(@service_url, xml, @headers))
+      end
+    rescue ::Timeout::Error => e
+      raise RubyBOSH::Timeout, e.message
+    rescue Errno::ECONNREFUSED => e
+      raise RubyBOSH::ConnFailed, "could not connect to #{@host}\n#{e.message}"
+    rescue Exception => e
+      raise RubyBOSH::Error, e.message
     end
-  rescue ::Timeout::Error => e
-    raise RubyBOSH::Timeout, e.message
-  rescue Errno::ECONNREFUSED => e
-    raise RubyBOSH::ConnFailed, "could not connect to #{@host}\n#{e.message}"
-  rescue Exception => e
-    raise RubyBOSH::Error, e.message
   end
 
   def send(msg)
-    puts("Ruby-BOSH - SEND\n#{msg}") if @@logging; msg
+    puts("Ruby-BOSH - SEND\n[#{now}]: #{msg}") if @@logging; msg
   end
 
   def recv(msg)
-    puts("Ruby-BOSH - RECV\n#{msg}") if @logging; msg
+    puts("Ruby-BOSH - RECV\n[#{now}]: #{msg}") if @logging; msg
+  end
+
+  private
+  def now 
+    Time.now.strftime("%a %b %d %H:%M:%S %Y")
   end
 end
 

data/ruby_bosh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_bosh}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pradeep Elankumaran"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-05-03}
   s.description = %q{An XMPP BOSH session pre-initializer for Ruby web applications}
   s.email = %q{pradeep@intridea.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_bosh
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Pradeep Elankumaran
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -07:00
+date: 2011-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency