xmpp4r-simple 0.8.4 → 0.8.6

data/CHANGELOG

@@ -1,4 +1,20 @@
-xmpp4r-simple (0.8.3)
+xmpp4r-simple (0.8.6)
+
+  [ Blaine Cook ]
+  * Catch a rare exception that's thrown when we are disconnecting.
+
+-- Blaine Cook <blaine@obvious.com> Fri, 26 Jan 2007 11:45:23 -0800
+
+
+xmpp4r-simple (0.8.5)
+
+  [ Blaine Cook ]
+  * Accept Jabber::Message messages as arguments to Jabber::Simple#deliver
+
+-- Blaine Cook <blaine@obvious.com>  Mon, 22 Jan 2007 07:23:09 -0800
+
+
+xmpp4r-simple (0.8.4)
 
   [ Blaine Cook ]
   * Catch broken connections and attempt to reconnect 3 times.

data/Rakefile

@@ -25,7 +25,7 @@ require 'rcov/rcovtask'
 spec = Gem::Specification.new do |s| 
   s.add_dependency('xmpp4r', '>= 0.3.0')
   s.name = "xmpp4r-simple" 
-  s.version = "0.8.4" 
+  s.version = "0.8.6" 
   s.author = "Blaine Cook" 
   s.email = "romeda@gmail.com" 
   s.homepage = "http://xmpp4r-simple.rubyforge.org/" 

data/lib/xmpp4r-simple.rb

@@ -103,15 +103,23 @@ module Jabber
     # If the recipient is not in your contacts list, the message will be queued
     # for later delivery, and the Contact will be automatically asked for
     # authorization (see Jabber::Simple#add).
+    #
+    # message should be a string or a valid Jabber::Message object. In either case,
+    # the message recipient will be set to jid.
     def deliver(jid, message, type=:chat)
       contacts(jid) do |friend|
         unless subscribed_to? friend
           add(friend.jid)
           return deliver_deferred(friend.jid, message, type)
         end
-        msg = Message.new(friend.jid)
-        msg.type = type
-        msg.body = message
+        if message.kind_of?(Jabber::Message)
+          msg = message
+          msg.to = friend.jid
+        else
+          msg = Message.new(friend.jid)
+          msg.type = type
+          msg.body = message
+        end
         send!(msg)
       end
     end
@@ -380,7 +388,12 @@ module Jabber
 
     def disconnect!(auto_reconnect = true)
       if client.respond_to?(:is_connected?) && client.is_connected?
-        client.close
+        begin
+          client.close
+        rescue Errno::EPIPE, IOError => e
+          # probably should log this.
+          nil
+        end
       end
       client = nil
       @disconnected = auto_reconnect

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: xmpp4r-simple
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
-date: 2006-12-23 00:00:00 -08:00
+  version: 0.8.6
+date: 2007-01-26 00:00:00 -08:00
 summary: A simplified Jabber client library.
 require_paths: 
 - lib