xmpp4r 0.4 → 0.5

data/test/pubsub/tc_helper.rb

@@ -107,7 +107,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
                 <subscription node='#{iq.pubsub.children.first.attributes['node']}' jid='#{iq.from.strip}'
 				          subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3'
                   subscription='pending'/>
-			
+
               </pubsub>
             </iq>")
     }
@@ -336,7 +336,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
       assert_equal(1, iq.pubsub.children[0].children.size)
       assert_equal('item', iq.pubsub.children[0].children[0].name)
       assert_equal(1, iq.pubsub.children[0].children[0].children.size)
-      assert_equal(item1.children.to_s, iq.pubsub.children[0].children[0].children[0].to_s)
+      assert_equal(item1.children[0].to_s, iq.pubsub.children[0].children[0].children[0].to_s)
       send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'/>")
     }
     assert_nothing_raised { h.publish_item_to(node, item1) }
@@ -362,7 +362,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
       assert_equal('item', iq.pubsub.children[0].children[0].name)
       assert_equal('blubb', iq.pubsub.children[0].children[0].attributes['id'] )
       assert_equal(1, iq.pubsub.children[0].children[0].children.size)
-      assert_equal(item1.children.to_s, iq.pubsub.children[0].children[0].children[0].to_s)
+      assert_equal(item1.children[0].to_s, iq.pubsub.children[0].children[0].children[0].to_s)
       send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'/>")
     }
     assert_nothing_raised { h.publish_item_with_id_to('mynode', item1,"blubb") }
@@ -379,7 +379,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
 
     assert_raise RuntimeError do h.publish_item_with_id_to('mynode', item1,"blubb") end
   end
-  
+
   ##
   # publish item and trap server-side error
   # examples 88 from
@@ -401,7 +401,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
       assert_equal('item', iq.pubsub.children[0].children[0].name)
       assert_equal('blubb', iq.pubsub.children[0].children[0].attributes['id'] )
       assert_equal(1, iq.pubsub.children[0].children[0].children.size)
-      assert_equal(item1.children.to_s, iq.pubsub.children[0].children[0].children[0].to_s)
+      assert_equal(item1.children[0].to_s, iq.pubsub.children[0].children[0].children[0].to_s)
       send("<iq type='error' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'/>
       <pubsub xmlns='http://jabber.org/protocol/pubsub'>
         <publish node='#{iq.pubsub.children[0].attributes['node']}'>
@@ -419,7 +419,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
   ##
   # retrieve all items
   # examples 70 and 71 from
-  # http://www.xmpp.org/extensions/xep-0060.html#subscriber-retrieve-returnall 
+  # http://www.xmpp.org/extensions/xep-0060.html#subscriber-retrieve-returnall
   def test_items
     item1 = Jabber::PubSub::Item.new("1")
     item1.text = 'foobar'
@@ -427,7 +427,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
     item2.text = 'barfoo'
 
     h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
-    
+
     state { |iq|
       assert_kind_of(Jabber::Iq, iq)
       assert_equal(:get, iq.type)
@@ -453,6 +453,30 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
     wait_state
   end
 
+  ##
+  # retrieve some items
+  # example 76 from
+  # http://xmpp.org/extensions/xep-0060.html#subscriber-retrieve-requestsome
+  def test_items_with_max_items
+    node_name = "mynode"
+    max_items = 2
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:get, iq.type)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('items', iq.pubsub.children.first.name)
+      assert_equal(node_name, iq.pubsub.children.first.attributes['node'])
+      assert_equal(max_items.to_s, iq.pubsub.children.first.attributes['max_items'])
+      # response doesn't matter; was previously tested, so send a simple result
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}' />")
+    }
+
+    h.get_items_from(node_name, max_items)
+    wait_state
+  end
+
   ##
   # get affiliation
   # example 184 and 185 from
@@ -487,6 +511,25 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
     wait_state
   end
 
+  # http://xmpp.org/extensions/xep-0060.html#owner-affiliations-modify
+  def test_set_affiliations
+    h = PubSub::ServiceHelper.new(@client,'pubsub.shakespeare.lit')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:set, iq.type)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('affiliations', iq.pubsub.children[0].name)
+      assert_equal('affiliation', iq.pubsub.children[0].children[0].name)
+      assert_equal('bard@shakespeare.lit', iq.pubsub.children[0].children[0].attributes['jid'])
+      assert_equal('publisher', iq.pubsub.children[0].children[0].attributes['affiliation'])
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'/>")
+    }
+
+    a = h.set_affiliations('princely_musings', 'bard@shakespeare.lit', :publisher)
+    wait_state
+  end
+
   ##
   # get_subscriptions_from
   # example 171 and 172 from
@@ -596,7 +639,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
   end
 
   ##
-  # get all subscriptions with no subscriptions 
+  # get all subscriptions with no subscriptions
   def test_get_all_subscriptions_with_no_subscriptions
     h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
 
@@ -655,6 +698,86 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase
     wait_state
   end
 
+  ##
+  # owner set configuration for a node
+  # example 133
+  # http://xmpp.org/extensions/xep-0060.html#owner-configure
+  def test_set_node_config
+    node = 'princely_musings'
+    pubsub = 'pubsub.shakespeare.lit'
+    h = PubSub::ServiceHelper.new(@client,pubsub)
+    
+    state { |iq|
+      assert_kind_of(Jabber::Iq,iq)
+      assert_equal(:set, iq.type)
+      assert_equal(pubsub, iq.to.to_s)
+
+      config = iq.pubsub.first_element('configure')
+      assert_kind_of(Jabber::PubSub::OwnerNodeConfig, config)
+      assert_kind_of(Jabber::Dataforms::XData, config.form)
+
+      assert_equal(config.options["pubsub#title"], "Princely Musings (Atom)")
+      assert_equal(config.options["pubsub#deliver_notifications"], "1")
+      assert_equal(config.options["pubsub#deliver_payloads"], "1")
+      assert_equal(config.options["pubsub#persist_items"], "1")
+      assert_equal(config.options["pubsub#max_items"], "10")
+      assert_equal(config.options["pubsub#access_model"], "open")
+      assert_equal(config.options["pubsub#publish_model"], "publishers")
+      assert_equal(config.options["pubsub#send_last_published_item"], "never")
+      assert_equal(config.options["pubsub#presence_based_delivery"], "false")
+      assert_equal(config.options["pubsub#notify_config"], "0")
+      assert_equal(config.options["pubsub#notify_delete"], "0")
+      assert_equal(config.options["pubsub#notify_retract"], "0")
+      assert_equal(config.options["pubsub#notify_sub"], "0")
+      assert_equal(config.options["pubsub#max_payload_size"], "1028")
+      assert_equal(config.options["pubsub#type"], "http://www.w3.org/2005/Atom")
+      assert_equal(config.options["pubsub#body_xslt"], "http://jabxslt.jabberstudio.org/atom_body.xslt")
+
+      send("<iq type='result' from='#{iq.to}' to='#{iq.from}' id='#{iq.id}'/>")
+    }
+
+    config = Jabber::PubSub::OwnerNodeConfig.new(node)
+    config.options = {
+      "pubsub#title" => "Princely Musings (Atom)",
+      "pubsub#deliver_notifications" => "1",
+      "pubsub#deliver_payloads" => "1",
+      "pubsub#persist_items" => "1",
+      "pubsub#max_items" => "10",
+      "pubsub#access_model" => "open",
+      "pubsub#publish_model" => "publishers",
+      "pubsub#send_last_published_item" => "never",
+      "pubsub#presence_based_delivery" => "false",
+      "pubsub#notify_config" => "0",
+      "pubsub#notify_delete" => "0",
+      "pubsub#notify_retract" => "0",
+      "pubsub#notify_sub" => "0",
+      "pubsub#max_payload_size" => "1028",
+      "pubsub#type" => "http://www.w3.org/2005/Atom",
+      "pubsub#body_xslt" => "http://jabxslt.jabberstudio.org/atom_body.xslt"
+    }
+
+    assert_kind_of(Jabber::PubSub::OwnerNodeConfig, config)
+    h.set_config_for(node, config)
+    wait_state
+  end
+
+  def test_delete_item
+    pubsub = 'pubsub.example.org'
+    h = PubSub::ServiceHelper.new(@client, pubsub)
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_kind_of(Jabber::PubSub::IqPubSub, iq.pubsub)
+      assert_kind_of(Jabber::PubSub::Retract, iq.pubsub.first_element('retract'))
+      assert_equal(1, iq.pubsub.first_element('retract').items.size)
+      assert_equal('ae890ac52d0df67ed7cfdf51b644e901', iq.pubsub.first_element('retract').items[0].id)
+      send(iq.answer.set_type(:result))
+    }
+
+    h.delete_item_from('princely_musings', 'ae890ac52d0df67ed7cfdf51b644e901')
+    wait_state
+  end
+
   def test_to_s
     h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
     assert_equal('pubsub.example.org',h.to_s)

data/test/pubsub/tc_nodeconfig.rb

@@ -51,4 +51,11 @@ class PubSub::NodeConfigTest < Test::Unit::TestCase
     assert_kind_of(Jabber::Dataforms::XData, config.form)
     assert_equal(options, config.options)
   end
+
+  def test_create_with_array_in_options
+    options = {'pubsub#collection'=>['parent1','parent2']}
+    config = PubSub::OwnerNodeConfig.new(nil, options)
+
+    assert_equal(options, config.options)
+  end
 end

data/test/reliable/tc_disconnect_cleanup.rb

@@ -0,0 +1,334 @@
+#!/usr/bin/ruby
+
+$:.unshift "#{File.dirname(__FILE__)}/../../lib"
+
+require 'test/unit'
+require 'xmpp4r'
+
+# Jabber::debug = true
+# Jabber::warnings = true
+
+class ClientDisconnectCleanupTest < Test::Unit::TestCase
+  class ControledClient < Jabber::Client
+    attr_accessor :tcpserver, :socket_override
+    def connect
+      begin
+        @port = 1024 + rand(32768 - 1024)
+        @tcpserver = TCPServer.new("127.0.0.1", @port)
+      rescue Errno::EADDRINUSE, Errno::EACCES
+        @tcpserver.close rescue nil
+        retry
+      end
+      super("127.0.0.1", @port)
+    end
+    def start
+      @socket = socket_override
+      super
+    end
+  end
+
+  def test_regular_stream_end
+    rd, wr = IO.pipe
+    rd.instance_eval do
+      def write(*args)
+      end
+      def flush
+      end
+    end
+    client = ControledClient.new("test@localhost")
+    @exceptions_caught = 0
+    client.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    Thread.new do
+      client.socket_override = rd
+      client.instance_eval{ @keepalive_interval = 0.1 }
+      client.connect
+      client.auth_nonsasl("password", false)
+    end
+    sleep(0.1)
+    assert client.is_connected?
+    
+    wr.write('<stream:stream xmlns:stream="http://etherx.jabber.org/streams">')
+    wr.write("</stream:stream>")
+    sleep(0.2)
+    
+    assert !client.is_connected?
+    assert client.instance_eval{ @parser_thread.nil? || !@parser_thread.alive? }
+    assert client.instance_eval{ @keepaliveThread.nil? || !@keepaliveThread.alive? }
+    assert @exceptions_caught > 0
+  end
+
+  def test_error_on_send
+    rd, wr = IO.pipe
+    rd.instance_eval do
+      def write(*args)
+      end
+      def flush
+      end
+    end
+    client = ControledClient.new("test@localhost")
+    @exceptions_caught = 0
+    client.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    Thread.new do
+      client.socket_override = rd
+      client.connect
+      client.auth_nonsasl("password", false)
+    end
+    sleep(0.1)
+    assert client.is_connected?
+
+    rd.instance_eval do
+      def write(*args)
+        raise "No writting for you, you disconnect now"
+      end
+    end
+    wr.write(%Q{<stream:stream from='localhost' id="acecf234be084aecdc16509077573c7d7200912f" version='1.0'  xmlns:stream="http://etherx.jabber.org/streams" xmlns="jabber:client"><stream:features><auth xmlns='http://jabber.org/features/iq-auth'/></stream:features> })
+    sleep(0.1)
+    
+    assert !client.is_connected?
+    assert client.instance_eval{ @parser_thread.nil? || !@parser_thread.alive? }
+    assert client.instance_eval{ @keepaliveThread.nil? || !@keepaliveThread.alive? }   
+    assert @exceptions_caught > 0
+  end
+
+  def test_client_disconnect
+    rd, wr = IO.pipe
+    rd.instance_eval do
+      def write(*args)
+      end
+      def flush
+      end
+    end
+    client = ControledClient.new("test@localhost")
+    @exceptions_caught = 0
+    client.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    Thread.new do
+      client.socket_override = rd
+      client.connect
+      client.auth_nonsasl("password", false)
+    end
+    wr.write(%Q{<stream:stream from='localhost' id="acecf234be084aecdc16509077573c7d7200912f" version='1.0'  xmlns:stream="http://etherx.jabber.org/streams" xmlns="jabber:client"><stream:features><auth xmlns='http://jabber.org/features/iq-auth'/></stream:features> })
+    sleep(0.1)
+    assert client.is_connected?
+    assert client.instance_eval{ @parser_thread.alive? }
+    assert client.instance_eval{ @keepaliveThread.alive? }
+
+    wr.close
+    sleep(0.1)
+    
+    assert !client.is_connected?
+    assert client.instance_eval{ @parser_thread.nil? || !@parser_thread.alive? }
+    assert client.instance_eval{ @keepaliveThread.nil? || !@keepaliveThread.alive? }   
+    assert @exceptions_caught > 0
+  end
+
+end
+
+class ConnectionDisconnectCleanupTest < Test::Unit::TestCase
+  class PipeConnection < Jabber::Connection
+    attr_accessor :socket_override
+    def connect
+      begin
+        @port = 1024 + rand(32768 - 1024)
+        tcpsocket = TCPServer.new("127.0.0.1", @port)
+      rescue Errno::EADDRINUSE, Errno::EACCES
+        tcpsocket.close rescue nil
+        retry
+      end
+      super("127.0.0.1", @port)
+    end
+    def accept_features
+      #do nothing
+    end
+    def start
+      @socket = self.socket_override
+      super
+    end
+  end
+  
+  def test_cleanup_when_disconnected_during_keepalive
+    rd, wr = IO.pipe
+    conn = PipeConnection.new
+    @exceptions_caught = 0
+    conn.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    Thread.new do
+      conn.socket_override = rd
+      #this will raise exception in keepalive thread, when attempts to send blank space shortly after connect
+      conn.instance_eval{ @keepalive_interval = 0.1 }
+      conn.connect
+    end
+    
+    sleep(0.2)
+    
+    assert rd.closed?
+    assert !conn.is_connected?
+    assert !conn.instance_eval{ @parser_thread }.alive?
+    assert !conn.instance_eval{ @keepaliveThread }.alive?
+    assert @exceptions_caught > 0
+  end
+  
+  def test_cleanup_after_stream_close
+    rd, wr = IO.pipe
+    conn = PipeConnection.new
+    @exceptions_caught = 0
+    conn.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    Thread.new do
+      conn.socket_override = rd
+      conn.connect
+    end
+    
+    wr.write("<hi/>")    
+    wr.close
+    sleep(0.1)
+    
+    assert rd.closed?
+    assert !conn.is_connected?
+    assert !conn.instance_eval{ @parser_thread }.alive?
+    assert !conn.instance_eval{ @keepaliveThread }.alive?
+    assert @exceptions_caught > 0
+  end
+  
+  def test_cleanup_after_stream_end
+    rd, wr = IO.pipe    
+    conn = PipeConnection.new
+    @exceptions_caught = 0
+    conn.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    Thread.new do
+      conn.socket_override = rd
+      conn.connect
+    end
+    
+    wr.write('<stream:stream xmlns:stream="http://etherx.jabber.org/streams">')
+    wr.write("</stream:stream>")
+    # wr.close
+    sleep(0.1)
+    
+    assert rd.closed?
+    assert !conn.is_connected?
+    assert !conn.instance_eval{ @parser_thread }.alive?
+    assert !conn.instance_eval{ @keepaliveThread }.alive?
+    assert @exceptions_caught > 0
+  end
+  
+end
+
+class StreamDisconnectCleanupTest < Test::Unit::TestCase
+  
+  def test_cleanup_when_errors_on_send
+    rd, wr = IO.pipe
+    
+    stream = Jabber::Stream.new
+    @exceptions_caught = 0
+    stream.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    assert !stream.is_connected?
+
+    stream.start(rd)
+    wr.write("<hi/>")
+    assert stream.is_connected?
+    #should raise error trying to write to stream that can't be written to, and catch should close it.
+    begin
+      stream.send("<hi/>")
+    rescue
+    end
+    sleep(0.1)
+    
+    assert rd.closed?
+    assert !stream.is_connected?
+    assert !stream.instance_eval{ @parser_thread }.alive?
+    assert @exceptions_caught > 0
+  end
+  
+  def test_cleanup_after_stream_close
+    rd, wr = IO.pipe
+    
+    stream = Jabber::Stream.new
+    @exceptions_caught = 0
+    stream.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+
+    assert !stream.is_connected?
+
+    stream.start(rd)
+    wr.write("<hi/>")
+    assert stream.is_connected?
+
+    wr.close
+    sleep(0.1)
+    
+    assert rd.closed?
+    assert !stream.is_connected?
+    assert !stream.instance_eval{ @parser_thread }.alive?
+    assert @exceptions_caught > 0
+  end
+
+  def test_cleanup_after_stream_end
+    rd, wr = IO.pipe
+    
+    stream = Jabber::Stream.new
+    @exceptions_caught = 0
+    stream.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    assert !stream.is_connected?
+
+    stream.start(rd)
+    wr.write('<stream:stream xmlns:stream="http://etherx.jabber.org/streams">')
+    wr.write("</stream:stream>")
+    assert stream.is_connected?
+
+    # wr.close
+    sleep(0.1)
+    
+    assert rd.closed?
+    assert !stream.is_connected?
+    assert !stream.instance_eval{ @parser_thread }.alive?
+    assert @exceptions_caught > 0
+  end
+
+  def test_cleanup_after_parse_failure
+    rd, wr = IO.pipe
+    
+    stream = Jabber::Stream.new
+    @exceptions_caught = 0
+    stream.on_exception do |e, connection, where_failed|
+      @exceptions_caught += 1
+    end
+    
+    assert !stream.is_connected?
+
+    stream.start(rd)
+    wr.write('<this is bad xml>>')
+    wr.close
+    assert stream.is_connected?
+
+    sleep(0.1)
+    
+    assert rd.closed?
+    assert !stream.is_connected?
+    assert !stream.instance_eval{ @parser_thread }.alive?
+    assert @exceptions_caught > 0
+  end
+  
+end