xmpp4r-simple 0.8.1 → 0.8.4

data/CHANGELOG

@@ -1,3 +1,29 @@
+xmpp4r-simple (0.8.3)
+
+  [ Blaine Cook ]
+  * Catch broken connections and attempt to reconnect 3 times.
+
+-- Blaine Cook <blaine@obvious.com>  Fri, 23 Dec 2006 00:12:09 -0800
+
+
+xmpp4r-simple (0.8.3)
+
+  [ Blaine Cook ]
+  * Update presence_updates to only store one presence_update per user.
+		Changes methods, will break code that uses presence_updates if not updated
+		correspondingly, check the documenation for the new semantics.
+
+-- Blaine Cook <blaine@obvious.com>  Thu, 07 Dec 2006 12:45:52 -0800
+
+
+xmpp4r-simple (0.8.2)
+
+  [ Blaine Cook ]
+  * Add presence_updates?, received_messages?, and new_subscriptions? methods.
+
+-- Blaine Cook <blaine@obvious.com>  Wed, 06 Dec 2006 09:40:28 -0800
+
+
 xmpp4r-simple (0.8.1)
 
   [ Blaine Cook ]

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.1" 
+  s.version = "0.8.4" 
   s.author = "Blaine Cook" 
   s.email = "romeda@gmail.com" 
   s.homepage = "http://xmpp4r-simple.rubyforge.org/" 

data/lib/xmpp4r-simple.rb

@@ -212,6 +212,12 @@ module Jabber
       dequeue(:received_messages, &block)
     end
 
+    # Returns true if there are unprocessed received messages waiting in the
+    # queue, false otherwise.
+    def received_messages?
+      !queue(:received_messages).empty?
+    end
+
     # Returns an array of presence updates received since the last time
     # presence_updates was called. Passing a block will yield each update in
     # turn, allowing you to break part-way through processing (especially
@@ -220,11 +226,28 @@ module Jabber
     #
     # e.g.:
     #
-    #   jabber.presence_updates do |friend, old_presence, new_presence|
-    #     puts "Received presence update from #{friend.to_s}: #{new_presence}"
+    #   jabber.presence_updates do |friend, new_presence|
+    #     puts "Received presence update from #{friend}: #{new_presence}"
     #   end
     def presence_updates(&block)
-      dequeue(:presence_updates, &block)
+      updates = []
+      @presence_mutex.synchronize do
+        dequeue(:presence_updates) do |friend|
+          presence = @presence_updates[friend]
+          next unless presence
+          new_update = [friend, presence[0], presence[1]]
+          yield new_update if block_given?
+          updates << new_update
+          @presence_updates.delete(friend)
+        end
+      end
+      return updates
+    end
+    
+    # Returns true if there are unprocessed presence updates waiting in the
+    # queue, false otherwise.
+    def presence_updates?
+      !queue(:presence_updates).empty?
     end
 
     # Returns an array of subscription notifications received since the last
@@ -242,6 +265,12 @@ module Jabber
       dequeue(:new_subscriptions, &block)
     end
     
+    # Returns true if there are unprocessed presence updates waiting in the
+    # queue, false otherwise.
+    def new_subscriptions?
+      !queue(:new_subscriptions).empty?
+    end
+    
     # Returns an array of subscription notifications received since the last
     # time subscription_requests was called. Passing a block will yield each update
     # in turn, allowing you to break part-way through processing (especially
@@ -256,7 +285,6 @@ module Jabber
     def subscription_requests(&block)
       dequeue(:subscription_requests, &block)
     end
-
  
     # Returns true if auto-accept subscriptions (friend requests) is enabled
     # (default), false otherwise.
@@ -284,7 +312,17 @@ module Jabber
     
     # Send a Jabber stanza over-the-wire.
     def send!(msg)
-      client.send(msg)
+      attempts = 0
+      begin
+        attempts += 1
+        client.send(msg)
+      rescue Errno::EPIPE, IOError => e
+        sleep 0.33
+        disconnect
+        reconnect
+        retry unless attempts > 3
+        raise e
+      end
     end
 
     # Use this to force the client to reconnect after a force_disconnect.
@@ -367,8 +405,21 @@ module Jabber
         end
       end
 
+      @presence_updates = {}
+      @presence_mutex = Mutex.new
       roster.add_presence_callback do |roster_item, old_presence, new_presence|
-        queue(:presence_updates) << [roster_item, old_presence, new_presence]
+        simple_jid = roster_item.jid.strip.to_s
+        presence = case new_presence.type
+                   when nil: new_presence.show || :online
+                   when :unavailable: :unavailable
+                   else
+                     nil
+                   end
+
+        if presence && @presence_updates[simple_jid] != presence
+          queue(:presence_updates) << simple_jid
+          @presence_mutex.synchronize { @presence_updates[simple_jid] = [presence, new_presence.status] }
+        end
       end
     end
 
@@ -397,9 +448,9 @@ module Jabber
       @queues[queue]
     end
 
-    def dequeue(queue, non_blocking = true, &block)
+    def dequeue(queue, non_blocking = true, max_items = 100, &block)
       queue_items = []
-      loop do
+      max_items.times do
         queue_item = queue(queue).pop(non_blocking) rescue nil
         break if queue_item.nil?
         queue_items << queue_item

data/test/test_xmpp4r_simple.rb

@@ -145,6 +145,7 @@ class JabberSimpleTest < Test::Unit::TestCase
   def test_presence_updates_should_be_received
 
     @client2.add(@client1)
+    @client1.add(@client2)
 
     assert_before(60) { assert @client2.subscribed_to?(@jid1) }
     assert_before(60) { assert_equal 0, @client2.presence_updates.size }
@@ -158,9 +159,9 @@ class JabberSimpleTest < Test::Unit::TestCase
     end
 
     new_status = new_statuses.first
-    assert_equal @jid1, new_status[0].jid.strip.to_s
-    assert_equal "Doing something else.", new_status[2].status
-    assert_equal :away, new_status[2].show
+    assert_equal @jid1, new_status[0]
+    assert_equal "Doing something else.", new_status[2]
+    assert_equal :away, new_status[1]
   end
 
   def test_disable_auto_accept_subscription_requests

metadata

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