xmpp4r 0.3.1 → 0.3.2

data/test/version/tc_iqqueryversion.rb

@@ -4,6 +4,7 @@ $:.unshift File::dirname(__FILE__) + '/../../lib'
 
 require 'test/unit'
 require 'xmpp4r/rexmladdons'
+require 'xmpp4r/iq'
 require 'xmpp4r/version/iq/version'
 include Jabber
 
@@ -11,9 +12,9 @@ class Version::IqQueryVersionTest < Test::Unit::TestCase
   def test_create_empty
     x = Version::IqQueryVersion::new
     assert_equal('jabber:iq:version', x.namespace)
-    assert_equal('', x.iname)
-    assert_equal('', x.version)
-    assert_equal(nil, x.os)
+    assert_nil(x.iname)
+    assert_nil(x.version)
+    assert_nil(x.os)
   end
 
   def test_create

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: xmpp4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2007-04-23 00:00:00 +02:00
+  version: 0.3.2
+date: 2007-10-15 00:00:00 +02:00
 summary: Ruby library for Jabber Instant-Messaging
 require_paths: 
 - lib
@@ -38,183 +38,223 @@ files:
 - UPDATING
 - lib/
 - lib/xmpp4r.rb
-- lib/callbacks.rb
 - lib/xmpp4r
-- lib/xmpp4r/iq.rb
-- lib/xmpp4r/errorexception.rb
-- lib/xmpp4r/x.rb
-- lib/xmpp4r/jid.rb
-- lib/xmpp4r/vcard.rb
-- lib/xmpp4r/delay.rb
-- lib/xmpp4r/feature_negotiation.rb
-- lib/xmpp4r/debuglog.rb
+- lib/xmpp4r/component.rb
+- lib/xmpp4r/discovery
+- lib/xmpp4r/discovery/iq
+- lib/xmpp4r/discovery/iq/discoitems.rb
+- lib/xmpp4r/discovery/iq/discoinfo.rb
+- lib/xmpp4r/command
+- lib/xmpp4r/command/iq
+- lib/xmpp4r/command/iq/command.rb
+- lib/xmpp4r/command/helper
+- lib/xmpp4r/command/helper/responder.rb
+- lib/xmpp4r/pubsub.rb
+- lib/xmpp4r/connection.rb
 - lib/xmpp4r/authenticationfailure.rb
+- lib/xmpp4r/error.rb
+- lib/xmpp4r/idgenerator.rb
 - lib/xmpp4r/version.rb
-- lib/xmpp4r/message.rb
-- lib/xmpp4r/dataforms.rb
+- lib/xmpp4r/feature_negotiation.rb
+- lib/xmpp4r/sasl.rb
+- lib/xmpp4r/vcard
+- lib/xmpp4r/vcard/iq
+- lib/xmpp4r/vcard/iq/vcard.rb
+- lib/xmpp4r/vcard/helper
+- lib/xmpp4r/vcard/helper/vcard.rb
 - lib/xmpp4r/rexmladdons.rb
-- lib/xmpp4r/client.rb
+- lib/xmpp4r/delay
+- lib/xmpp4r/delay/x
+- lib/xmpp4r/delay/x/delay.rb
+- lib/xmpp4r/muc.rb
+- lib/xmpp4r/xmpp4r.rb
+- lib/xmpp4r/semaphore.rb
+- lib/xmpp4r/pubsub
+- lib/xmpp4r/pubsub/iq
+- lib/xmpp4r/pubsub/iq/pubsub.rb
+- lib/xmpp4r/pubsub/helper
+- lib/xmpp4r/pubsub/helper/servicehelper.rb
+- lib/xmpp4r/pubsub/helper/nodehelper.rb
+- lib/xmpp4r/pubsub/helper/nodebrowser.rb
+- lib/xmpp4r/pubsub/stanzas
+- lib/xmpp4r/pubsub/stanzas/items.rb
+- lib/xmpp4r/pubsub/stanzas/item.rb
+- lib/xmpp4r/pubsub/stanzas/event.rb
+- lib/xmpp4r/pubsub/stanzas/subscription.rb
+- lib/xmpp4r/query.rb
+- lib/xmpp4r/x.rb
+- lib/xmpp4r/message.rb
+- lib/xmpp4r/debuglog.rb
 - lib/xmpp4r/streamparser.rb
+- lib/xmpp4r/dataforms.rb
+- lib/xmpp4r/dataforms
+- lib/xmpp4r/dataforms/x
+- lib/xmpp4r/dataforms/x/data.rb
 - lib/xmpp4r/discovery.rb
-- lib/xmpp4r/query.rb
-- lib/xmpp4r/presence.rb
-- lib/xmpp4r/idgenerator.rb
-- lib/xmpp4r/component.rb
-- lib/xmpp4r/bytestreams.rb
-- lib/xmpp4r/sasl.rb
-- lib/xmpp4r/connection.rb
+- lib/xmpp4r/muc
+- lib/xmpp4r/muc/iq
+- lib/xmpp4r/muc/iq/mucowner.rb
+- lib/xmpp4r/muc/helper
+- lib/xmpp4r/muc/helper/mucclient.rb
+- lib/xmpp4r/muc/helper/mucbrowser.rb
+- lib/xmpp4r/muc/helper/simplemucclient.rb
+- lib/xmpp4r/muc/x
+- lib/xmpp4r/muc/x/mucuserinvite.rb
+- lib/xmpp4r/muc/x/mucuseritem.rb
+- lib/xmpp4r/muc/x/muc.rb
 - lib/xmpp4r/stream.rb
-- lib/xmpp4r/xmpp4r.rb
-- lib/xmpp4r/error.rb
-- lib/xmpp4r/muc.rb
-- lib/xmpp4r/xmlstanza.rb
+- lib/xmpp4r/roster
+- lib/xmpp4r/roster/iq
+- lib/xmpp4r/roster/iq/roster.rb
+- lib/xmpp4r/roster/helper
+- lib/xmpp4r/roster/helper/roster.rb
+- lib/xmpp4r/roster/x
+- lib/xmpp4r/roster/x/roster.rb
+- lib/xmpp4r/errorexception.rb
 - lib/xmpp4r/roster.rb
+- lib/xmpp4r/version
+- lib/xmpp4r/version/iq
+- lib/xmpp4r/version/iq/version.rb
+- lib/xmpp4r/version/helper
+- lib/xmpp4r/version/helper/simpleresponder.rb
+- lib/xmpp4r/version/helper/responder.rb
+- lib/xmpp4r/rpc
+- lib/xmpp4r/rpc/iq
+- lib/xmpp4r/rpc/iq/rpc.rb
+- lib/xmpp4r/rpc/helper
+- lib/xmpp4r/rpc/helper/server.rb
+- lib/xmpp4r/rpc/helper/xmlrpcaddons.rb
+- lib/xmpp4r/rpc/helper/client.rb
+- lib/xmpp4r/httpbinding
+- lib/xmpp4r/httpbinding/client.rb
+- lib/xmpp4r/xmppelement.rb
 - lib/xmpp4r/bytestreams
 - lib/xmpp4r/bytestreams/iq
 - lib/xmpp4r/bytestreams/iq/si.rb
 - lib/xmpp4r/bytestreams/iq/bytestreams.rb
 - lib/xmpp4r/bytestreams/helper
-- lib/xmpp4r/bytestreams/helper/filetransfer.rb
 - lib/xmpp4r/bytestreams/helper/ibb
 - lib/xmpp4r/bytestreams/helper/ibb/base.rb
 - lib/xmpp4r/bytestreams/helper/ibb/target.rb
 - lib/xmpp4r/bytestreams/helper/ibb/initiator.rb
+- lib/xmpp4r/bytestreams/helper/filetransfer.rb
 - lib/xmpp4r/bytestreams/helper/socks5bytestreams
 - lib/xmpp4r/bytestreams/helper/socks5bytestreams/base.rb
-- lib/xmpp4r/bytestreams/helper/socks5bytestreams/socks5.rb
 - lib/xmpp4r/bytestreams/helper/socks5bytestreams/target.rb
 - lib/xmpp4r/bytestreams/helper/socks5bytestreams/server.rb
 - lib/xmpp4r/bytestreams/helper/socks5bytestreams/initiator.rb
-- lib/xmpp4r/vcard
-- lib/xmpp4r/vcard/iq
-- lib/xmpp4r/vcard/iq/vcard.rb
-- lib/xmpp4r/vcard/helper
-- lib/xmpp4r/vcard/helper/vcard.rb
+- lib/xmpp4r/bytestreams/helper/socks5bytestreams/socks5.rb
+- lib/xmpp4r/vcard.rb
+- lib/xmpp4r/callbacks.rb
+- lib/xmpp4r/presence.rb
+- lib/xmpp4r/jid.rb
+- lib/xmpp4r/rpc.rb
+- lib/xmpp4r/bytestreams.rb
+- lib/xmpp4r/xmppstanza.rb
 - lib/xmpp4r/feature_negotiation
 - lib/xmpp4r/feature_negotiation/iq
 - lib/xmpp4r/feature_negotiation/iq/feature.rb
-- lib/xmpp4r/version
-- lib/xmpp4r/version/iq
-- lib/xmpp4r/version/iq/version.rb
-- lib/xmpp4r/version/helper
-- lib/xmpp4r/version/helper/simpleresponder.rb
-- lib/xmpp4r/version/helper/responder.rb
-- lib/xmpp4r/muc
-- lib/xmpp4r/muc/x
-- lib/xmpp4r/muc/x/muc.rb
-- lib/xmpp4r/muc/x/mucuseritem.rb
-- lib/xmpp4r/muc/x/mucuserinvite.rb
-- lib/xmpp4r/muc/helper
-- lib/xmpp4r/muc/helper/mucbrowser.rb
-- lib/xmpp4r/muc/helper/mucclient.rb
-- lib/xmpp4r/muc/helper/simplemucclient.rb
-- lib/xmpp4r/roster
-- lib/xmpp4r/roster/iq
-- lib/xmpp4r/roster/iq/roster.rb
-- lib/xmpp4r/roster/x
-- lib/xmpp4r/roster/x/roster.rb
-- lib/xmpp4r/roster/helper
-- lib/xmpp4r/roster/helper/roster.rb
-- lib/xmpp4r/discovery
-- lib/xmpp4r/discovery/iq
-- lib/xmpp4r/discovery/iq/discoitems.rb
-- lib/xmpp4r/discovery/iq/discoinfo.rb
-- lib/xmpp4r/delay
-- lib/xmpp4r/delay/x
-- lib/xmpp4r/delay/x/delay.rb
-- lib/xmpp4r/dataforms
-- lib/xmpp4r/dataforms/x
-- lib/xmpp4r/dataforms/x/data.rb
+- lib/xmpp4r/iq.rb
+- lib/xmpp4r/delay.rb
+- lib/xmpp4r/httpbinding.rb
+- lib/xmpp4r/client.rb
 - data/
 - data/doc
 - data/doc/xmpp4r
 - data/doc/xmpp4r/examples
-- data/doc/xmpp4r/examples/buggy
-- data/doc/xmpp4r/examples/buggy/miniedgarr_watch.rb
-- data/doc/xmpp4r/examples/buggy/miniedgarr_cgi.rb
-- data/doc/xmpp4r/examples/buggy/jabber2jabber
-- data/doc/xmpp4r/examples/buggy/jabber2jabber/jabber2jabber.rb
 - data/doc/xmpp4r/examples/advanced
-- data/doc/xmpp4r/examples/advanced/versionpoll.rb
-- data/doc/xmpp4r/examples/advanced/sendfile.conf
-- data/doc/xmpp4r/examples/advanced/sendfile.rb
-- data/doc/xmpp4r/examples/advanced/gtkmucclient.rb
-- data/doc/xmpp4r/examples/advanced/migrate.rb
-- data/doc/xmpp4r/examples/advanced/rosterdiscovery.rb
-- data/doc/xmpp4r/examples/advanced/fileserve.conf
 - data/doc/xmpp4r/examples/advanced/xmppingrc.sample
-- data/doc/xmpp4r/examples/advanced/getonline.rb
-- data/doc/xmpp4r/examples/advanced/fileserve.rb
+- data/doc/xmpp4r/examples/advanced/recvfile.rb
 - data/doc/xmpp4r/examples/advanced/xmpping.rb
+- data/doc/xmpp4r/examples/advanced/sendfile.rb
 - data/doc/xmpp4r/examples/advanced/minimuc.rb
-- data/doc/xmpp4r/examples/advanced/recvfile.rb
+- data/doc/xmpp4r/examples/advanced/versionpoll.rb
 - data/doc/xmpp4r/examples/advanced/shellmgr
-- data/doc/xmpp4r/examples/advanced/shellmgr/shellmgr_test.rb
 - data/doc/xmpp4r/examples/advanced/shellmgr/shellmgr_jabber.rb
 - data/doc/xmpp4r/examples/advanced/shellmgr/shellmgr.rb
+- data/doc/xmpp4r/examples/advanced/shellmgr/shellmgr_test.rb
+- data/doc/xmpp4r/examples/advanced/fileserve.conf
+- data/doc/xmpp4r/examples/advanced/sendfile.conf
+- data/doc/xmpp4r/examples/advanced/fileserve.rb
+- data/doc/xmpp4r/examples/advanced/migrate.rb
+- data/doc/xmpp4r/examples/advanced/gtkmucclient.rb
+- data/doc/xmpp4r/examples/advanced/rosterdiscovery.rb
+- data/doc/xmpp4r/examples/advanced/getonline.rb
 - data/doc/xmpp4r/examples/advanced/adventure
-- data/doc/xmpp4r/examples/advanced/adventure/cube.xml
 - data/doc/xmpp4r/examples/advanced/adventure/README
+- data/doc/xmpp4r/examples/advanced/adventure/cube.xml
+- data/doc/xmpp4r/examples/advanced/adventure/adventure.rb
+- data/doc/xmpp4r/examples/advanced/adventure/tower.xml
 - data/doc/xmpp4r/examples/advanced/adventure/world.rb
 - data/doc/xmpp4r/examples/advanced/adventure/adventuremuc.rb
-- data/doc/xmpp4r/examples/advanced/adventure/tower.xml
-- data/doc/xmpp4r/examples/advanced/adventure/adventure.rb
 - data/doc/xmpp4r/examples/basic
+- data/doc/xmpp4r/examples/basic/component.rb
 - data/doc/xmpp4r/examples/basic/send_vcard.rb
-- data/doc/xmpp4r/examples/basic/change_password.rb
-- data/doc/xmpp4r/examples/basic/rosterrename.rb
-- data/doc/xmpp4r/examples/basic/rosterwatch.rb
+- data/doc/xmpp4r/examples/basic/muc_owner_config.rb
+- data/doc/xmpp4r/examples/basic/remove_registration.rb
+- data/doc/xmpp4r/examples/basic/echo_threaded.rb
 - data/doc/xmpp4r/examples/basic/mass_sender.rb
-- data/doc/xmpp4r/examples/basic/mucsimplebot.rb
-- data/doc/xmpp4r/examples/basic/component.rb
-- data/doc/xmpp4r/examples/basic/mucinfo.rb
-- data/doc/xmpp4r/examples/basic/jabbersend.rb
 - data/doc/xmpp4r/examples/basic/rosterprint.rb
+- data/doc/xmpp4r/examples/basic/jabbersend.rb
+- data/doc/xmpp4r/examples/basic/change_password.rb
+- data/doc/xmpp4r/examples/basic/mucsimplebot.rb
+- data/doc/xmpp4r/examples/basic/rosterrename.rb
 - data/doc/xmpp4r/examples/basic/versionbot.rb
-- data/doc/xmpp4r/examples/basic/echo_nonthreaded.rb
-- data/doc/xmpp4r/examples/basic/remove_registration.rb
+- data/doc/xmpp4r/examples/basic/mucinfo.rb
+- data/doc/xmpp4r/examples/basic/roster.rb
+- data/doc/xmpp4r/examples/basic/rosterwatch.rb
 - data/doc/xmpp4r/examples/basic/register.rb
 - data/doc/xmpp4r/examples/basic/client.rb
-- data/doc/xmpp4r/examples/basic/echo_threaded.rb
-- data/doc/xmpp4r/examples/basic/roster.rb
+- data/doc/xmpp4r/examples/buggy
+- data/doc/xmpp4r/examples/buggy/miniedgarr_cgi.rb
+- data/doc/xmpp4r/examples/buggy/jabber2jabber
+- data/doc/xmpp4r/examples/buggy/jabber2jabber/jabber2jabber.rb
+- data/doc/xmpp4r/examples/buggy/miniedgarr_watch.rb
 - test/
-- test/tc_message.rb
-- test/tc_xmlstanza.rb
-- test/tc_callbacks.rb
-- test/tc_client.rb
-- test/ts_xmpp4r.rb
-- test/tc_iq.rb
-- test/tc_jid.rb
+- test/tc_rexml.rb
+- test/tc_stream.rb
 - test/tc_streamSend.rb
+- test/vcard
+- test/vcard/tc_iqvcard.rb
+- test/vcard/tc_helper.rb
+- test/delay
+- test/delay/tc_xdelay.rb
 - test/tc_streamError.rb
-- test/tc_presence.rb
-- test/tc_idgenerator.rb
+- test/tc_xmppstanza.rb
+- test/pubsub
+- test/pubsub/tc_helper.rb
 - test/tc_iqquery.rb
-- test/tc_streamThreaded.rb
-- test/tc_stream.rb
 - test/tc_error.rb
-- test/tc_class_names.rb
-- test/tc_rexml.rb
-- test/roster
-- test/roster/tc_xroster.rb
-- test/roster/tc_helper.rb
-- test/roster/tc_iqqueryroster.rb
+- test/tc_idgenerator.rb
+- test/tc_callbacks.rb
 - test/lib
 - test/lib/clienttester.rb
+- test/dataforms
+- test/dataforms/tc_data.rb
+- test/muc
+- test/muc/tc_mucowner.rb
+- test/muc/tc_muc_mucclient.rb
+- test/muc/tc_muc_simplemucclient.rb
+- test/roster
+- test/roster/tc_iqqueryroster.rb
+- test/roster/tc_helper.rb
+- test/roster/tc_xroster.rb
+- test/version
+- test/version/tc_helper.rb
+- test/version/tc_iqqueryversion.rb
+- test/tc_jid.rb
+- test/tc_presence.rb
+- test/rpc
+- test/rpc/tc_helper.rb
+- test/tc_iq.rb
 - test/bytestreams
 - test/bytestreams/tc_ibb.rb
 - test/bytestreams/tc_socks5bytestreams.rb
-- test/vcard
-- test/vcard/tc_helper.rb
-- test/vcard/tc_iqvcard.rb
-- test/delay
-- test/delay/tc_xdelay.rb
-- test/version
-- test/version/tc_iqqueryversion.rb
-- test/version/tc_helper.rb
-- test/muc
-- test/muc/tc_muc_simplemucclient.rb
-- test/muc/tc_muc_mucclient.rb
+- test/tc_class_names.rb
+- test/tc_message.rb
+- test/ts_xmpp4r.rb
+- test/tc_streamComponent.rb
+- test/tc_client.rb
 - tools/
 - tools/gen_requires.bash
 - tools/doctoweb.bash

data/data/doc/xmpp4r/examples/basic/echo_nonthreaded.rb

@@ -1,32 +0,0 @@
-#!/usr/bin/ruby
-
-# This bot will reply to every message it receives. To end the game, send 'exit'
-# NON-THREADED VERSION
-
-require 'xmpp4r'
-include Jabber
-
-# settings
-if ARGV.length != 2
-  puts "Run with ./echo_thread.rb user@server/resource password"
-  exit 1
-end
-myJID = JID::new(ARGV[0])
-myPassword = ARGV[1] 
-cl = Client::new(myJID, false)
-cl.connect
-cl.auth(myPassword)
-cl.send(Presence::new)
-puts "Connected ! send messages to #{myJID.strip.to_s}."
-exit = false
-cl.add_message_callback { |m|
-  cl.send(Message::new(m.from, "You sent: #{m.body}"))
-  if m.body == 'exit'
-    cl.send(Message::new(m.from, "Exiting ..."))
-    exit = true
-  end
-}
-while not exit
-  cl.process
-end
-cl.close

data/lib/callbacks.rb

@@ -1,122 +0,0 @@
-# =XMPP4R - XMPP Library for Ruby
-# License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
-# Website::http://home.gna.org/xmpp4r/
-
-##
-# This class manages a list of callbacks.
-#
-# ==Callbacks management and priority
-#
-# Callbacks are managed by the class CallbackList. When they are added, a
-# priority (just a number or anything Comparable with other priorities) is
-# specified. The biggest the priority is, the earliest the callback will be
-# considered.
-#
-# Callbacks are processed for a given set of objects as long as they return
-# false. If you want to stop processing, you must return true. Example :
-#  cbl = CallbackList::new
-#  c1 = false
-#  c2 = false
-#  c3 = false
-#  cbl.add(10) { c1 = true; 1 }
-#  cbl.add(5) { c2 = true; true }
-#  cbl.add(0) { c3 = true }
-#  cbl.process('aa')
-#  puts "#{c1} #{c2} #{c3}"
-# This example would display "true true false" as callbacks processing was
-# stopped after the second callback returned true.
-#
-# In XMPP4R, callbacks' priorities are quite normalized since we want to be
-# able to "cascade" callbacks in a clean way. Here are values your code should
-# take into account :
-# 
-# >= 200::  logging & debugging callbacks. Those callbacks should not consume
-#           elements.
-# 100-199:: Where Helpers register their callbacks. The normal value is 100,
-#           and Helpers shouldn't register something else unless there's a
-#           very good reason to.
-# < 100::   all those numbers are normally available for your application.
-#           That's enough, don't you think ?
-class CallbackList
-
-  # Create a new list of callbacks
-  def initialize
-    @list = []
-  end
-
-  ##
-  # Add a callback to the list
-  #
-  # List will be sorted afterwards
-  #
-  # prio:: [Integer] the callback's priority, the higher, the sooner.
-  # ref:: [String] the callback's reference
-  # block:: [Block] a block to execute
-  # return:: [Jabber::CallbackList] The list, for chaining
-  def add(prio = 0, ref = nil, proc = nil, &block)
-    block = proc if proc
-    @list.push(Callback::new(prio, ref, block))
-    @list.sort! { |a, b| b.priority <=> a.priority }
-    self
-  end
-
-  ##
-  # Delete a callback by reference
-  # ref:: [String] the reference of the callback to delete
-  # return:: [CallBackList] The list, for chaining
-  def delete(ref)
-    @list.delete_if { |item| item.ref == ref }
-    self
-  end
-
-  ##
-  # Number of elements in the list
-  # return:: [Integer] The number of elements
-  def length
-    @list.length
-  end
-
-  ##
-  # Process an element through all my callbacks. returns e.consumed?
-  # e:: [Object] The elements to pass to the callback. You can pass
-  # several, but of course, you block must know how to handle them.
-  # return:: [Boolean] true if the element has been consumed
-  def process(*e)
-    # If somebody adds a new callback the list will get modified
-    # and sorted(!) while still iterating through it. So we use a
-    # local copy of @list. Any freshly added callback will receive
-    # the next stanzas, not the current.
-    list = @list.dup
-
-    # process through callbacks
-    list.each do |item|
-      return true if item.block.call(*e) == true
-    end
-    false
-  end
-end
-
-# This class is used to store callbacks inside CallbackList. See the
-# CallbackList class for more detailed explanations.
-class Callback
-
-  # The Callback's priority
-  attr_reader :priority
-
-  # The Callback's reference, using for deleting purposes
-  attr_reader :ref
-
-  # The Callback's block to execute 
-  attr_reader :block
-
-  ##
-  # Create a new callback
-  # priority:: [Integer] the callback's priority. The higher, the sooner it
-  # will be executed
-  # ref:: [String] The callback's reference
-  def initialize(priority = 0, ref = nil, block = Proc::new {})
-    @priority = priority
-    @ref = ref
-    @block = block
-  end
-end