xmpp4r 0.3.2 → 0.4

data/test/pubsub/tc_nodeconfig.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/ruby
+
+$:.unshift File::dirname(__FILE__) + '/../../lib'
+
+require 'test/unit'
+require File::dirname(__FILE__) + '/../lib/clienttester'
+
+require 'xmpp4r'
+require 'xmpp4r/pubsub/children/node_config'
+require 'xmpp4r/dataforms'
+include Jabber
+
+# Jabber.debug = true
+
+class PubSub::NodeConfigTest < Test::Unit::TestCase
+  include ClientTester
+
+  def test_create()
+    config = PubSub::NodeConfig.new()
+    assert_nil(config.form)
+    assert_nil(config.node)
+    assert_equal({}, config.options)
+  end
+
+  def test_create_with_options
+    options = {'pubsub#access_model'=>'open'}
+
+    config = PubSub::NodeConfig.new(nil, options)
+    assert_kind_of(Jabber::Dataforms::XData, config.form)
+    assert_equal(options, config.options)
+    assert_equal(:submit, config.form.type)
+    assert_equal('http://jabber.org/protocol/pubsub#node_config', config.form.field('FORM_TYPE').values.first)
+  end
+
+  def test_create_with_options_and_node
+    node = 'mynode'
+    options = {'pubsub#access_model'=>'open'}
+
+    config = PubSub::NodeConfig.new(node, options)
+    assert_equal(node, config.node)
+    assert_kind_of(Jabber::Dataforms::XData, config.form)
+    assert_equal(options, config.options)
+    assert_equal(:submit, config.form.type)
+    assert_equal('http://jabber.org/protocol/pubsub#node_config', config.form.field('FORM_TYPE').values.first)
+  end
+
+  def test_set_options
+    options = {'pubsub#access_model'=>'open'}
+    config = PubSub::NodeConfig.new()
+    config.options = options
+    assert_kind_of(Jabber::Dataforms::XData, config.form)
+    assert_equal(options, config.options)
+  end
+end

data/test/pubsub/tc_subscriptionconfig.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/ruby
+
+$:.unshift File::dirname(__FILE__) + '/../../lib'
+
+require 'test/unit'
+require File::dirname(__FILE__) + '/../lib/clienttester'
+
+require 'xmpp4r'
+require 'xmpp4r/pubsub/children/subscription_config'
+require 'xmpp4r/dataforms'
+include Jabber
+
+# Jabber.debug = true
+
+class PubSub::SubscriptionConfigTest < Test::Unit::TestCase
+  include ClientTester
+
+  def test_create()
+    config = PubSub::SubscriptionConfig.new()
+    assert_nil(config.form)
+    assert_nil(config.node)
+    assert_equal({}, config.options)
+  end
+
+  def test_create_with_options
+    node = 'mynode'
+    jid = 'test@test.com'
+    options = {'pubsub#access_model'=>'open'}
+    subid = '004-yyy'
+
+    config = PubSub::SubscriptionConfig.new(node, jid, options, subid)
+    assert_equal(node, config.node)
+    assert_equal(subid, config.subid)
+    assert_kind_of(Jabber::JID, config.jid)
+    assert_equal(Jabber::JID.new(jid), config.jid)
+    assert_kind_of(Jabber::Dataforms::XData, config.form)
+    assert_equal(options, config.options)
+    assert_equal(:submit, config.form.type)
+    assert_equal('http://jabber.org/protocol/pubsub#subscribe_options', config.form.field('FORM_TYPE').values.first)
+  end
+end

data/test/roster/tc_helper.rb

@@ -31,7 +31,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     }
 
     query_waiter = Semaphore.new
-    h = Roster::Helper::new(@client)
+    h = Roster::Helper.new(@client)
     h.add_query_callback { |iq|
       query_waiter.run
     }
@@ -74,7 +74,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     }
 
     query_waiter = Semaphore.new
-    h = Roster::Helper::new(@client)
+    h = Roster::Helper.new(@client)
     h.add_query_callback { |iq| query_waiter.run }
     wait_state
     query_waiter.wait
@@ -142,7 +142,7 @@ class Roster::HelperTest < Test::Unit::TestCase
 
     query_waiter = Semaphore.new
     presence_waiter = Semaphore.new
-    h = Roster::Helper::new(@client)
+    h = Roster::Helper.new(@client)
     h.add_query_callback { |iq|
       query_waiter.run
     }
@@ -289,7 +289,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     }
 
     query_waiter = Semaphore.new
-    h = Roster::Helper::new(@client)
+    h = Roster::Helper.new(@client)
     h.add_query_callback { |iq| query_waiter.run }
     wait_state
     query_waiter.wait
@@ -326,7 +326,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     }
 
     query_waiter = Semaphore.new
-    h = Roster::Helper::new(@client)
+    h = Roster::Helper.new(@client)
     h.add_query_callback { |iq| query_waiter.run }
     wait_state
     query_waiter.wait
@@ -369,7 +369,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     }
 
     query_waiter = Semaphore.new
-    h = Roster::Helper::new(@client)
+    h = Roster::Helper.new(@client)
     h.add_query_callback { |iq| query_waiter.run }
     wait_state
     query_waiter.wait
@@ -512,4 +512,3 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_nil(update_args[1])
   end
 end
-

data/test/roster/tc_iqqueryroster.rb

@@ -11,7 +11,7 @@ include Jabber
 
 class Roster::IqQueryRosterTest < Test::Unit::TestCase
   def test_create
-    r = Roster::IqQueryRoster::new
+    r = Roster::IqQueryRoster.new
     assert_equal('jabber:iq:roster', r.namespace)
     assert_equal(r.to_a.size, 0)
     assert_equal(r.to_a, [])
@@ -19,16 +19,16 @@ class Roster::IqQueryRosterTest < Test::Unit::TestCase
   end
 
   def test_import
-    iq = Iq::new
-    q = REXML::Element::new('query')
+    iq = Iq.new
+    q = REXML::Element.new('query')
     q.add_namespace('jabber:iq:roster')
     iq.add(q)
-    iq2 = Iq::new.import(iq)
+    iq2 = Iq.new.import(iq)
     assert_equal(Roster::IqQueryRoster, iq2.query.class)
   end
 
   def test_answer
-    iq = Iq::new_rosterget
+    iq = Iq.new_rosterget
     assert_equal(:get, iq.type)
     assert_nil(iq.to)
     assert_equal('jabber:client', iq.namespace)
@@ -59,7 +59,7 @@ class Roster::IqQueryRosterTest < Test::Unit::TestCase
   end
 
   def test_items
-    r = Roster::IqQueryRoster::new
+    r = Roster::IqQueryRoster.new
     r.add(Roster::RosterItem.new)
     r.add(Roster::RosterItem.new(JID.new('a@b/d'), 'ABC', :none, :subscribe)).groups = ['a']
     itemstr = "<item jid='astro@spaceboyz.net' name='Astro' subscribtion='both'>" \
@@ -88,10 +88,10 @@ class Roster::IqQueryRosterTest < Test::Unit::TestCase
   end
 
   def test_dupitems
-    r = Roster::IqQueryRoster::new
-    jid = JID::new('a@b')
-    jid2 = JID::new('c@d')
-    ri = Roster::RosterItem::new(jid, 'ab')
+    r = Roster::IqQueryRoster.new
+    jid = JID.new('a@b')
+    jid2 = JID.new('c@d')
+    ri = Roster::RosterItem.new(jid, 'ab')
     r.add(ri)
     assert_equal('ab', ri.iname)
     assert_equal('ab', r[jid].iname)
@@ -121,13 +121,13 @@ end
 
 class Roster::RosterItemTest < Test::Unit::TestCase
   def test_create
-    ri = Roster::RosterItem::new
+    ri = Roster::RosterItem.new
     assert_equal(JID.new, ri.jid)
     assert_equal(nil, ri.iname)
     assert_equal(nil, ri.subscription)
     assert_equal(nil, ri.ask)
 
-    ri = Roster::RosterItem::new(JID.new('a@b/c'), 'xyz', :both, nil)
+    ri = Roster::RosterItem.new(JID.new('a@b/c'), 'xyz', :both, nil)
     assert_equal(JID.new('a@b/c'), ri.jid)
     assert_equal('xyz', ri.iname)
     assert_equal(:both, ri.subscription)
@@ -135,11 +135,11 @@ class Roster::RosterItemTest < Test::Unit::TestCase
   end
 
   def test_modify
-    ri = Roster::RosterItem::new(JID.new('a@b/c'), 'xyz', :both, :subscribe)
+    ri = Roster::RosterItem.new(JID.new('a@b/c'), 'xyz', :both, :subscribe)
 
     assert_equal(JID.new('a@b/c'), ri.jid)
     ri.jid = nil
-    assert_equal(JID::new, ri.jid)
+    assert_equal(JID.new, ri.jid)
 
     assert_equal('xyz', ri.iname)
     ri.iname = nil
@@ -155,7 +155,7 @@ class Roster::RosterItemTest < Test::Unit::TestCase
   end
 
   def test_groupdeletion
-    ri = Roster::RosterItem::new
+    ri = Roster::RosterItem.new
     g1 = ['a', 'b', 'c']
     ri.groups = g1
     assert_equal(g1, ri.groups.sort)
@@ -165,7 +165,7 @@ class Roster::RosterItemTest < Test::Unit::TestCase
   end
 
   def test_dupgroups
-    ri = Roster::RosterItem::new
+    ri = Roster::RosterItem.new
     mygroups = ['a', 'a', 'b']
     ri.groups = mygroups
     assert_equal(mygroups.uniq, ri.groups)

data/test/roster/tc_xroster.rb

@@ -33,7 +33,7 @@ class Roster::XRosterTest < Test::Unit::TestCase
     assert_kind_of(Roster::XRosterItem, r.first_element('item'))
     assert_kind_of(Roster::XRosterItem, r.typed_add(REXML::Element.new('item')))
   end
-  
+
   def test_items
     j1 = Roster::XRosterItem.new
     assert_equal(JID.new(nil), j1.jid)

data/test/rpc/tc_helper.rb

@@ -15,6 +15,7 @@ class RPC::HelperTest < Test::Unit::TestCase
 
   def give_client_jid!
     class << @client
+      remove_method(:jid) # avoids warning
       def jid; Jabber::JID.new('client@test.com/clienttester'); end
     end
   end
@@ -28,14 +29,26 @@ class RPC::HelperTest < Test::Unit::TestCase
     assert_kind_of(RPC::Server, sv)
   end
 
+  def echo(msg = nil)
+    msg
+  end
+
   def test_simple
     give_client_jid!
 
     sv = RPC::Server.new(@server)
-    sv.add_handler("echo") do |s| s end
+    sv.add_handler("echo", &method(:echo))
 
     cl = RPC::Client.new(@client, 'a@b/c')
-    assert_equal('Test string', cl.call("echo", 'Test string'))
+    assert_nothing_raised do
+      assert_equal('Test string', cl.call("echo", 'Test string'))
+    end
+
+    # exception during serialisation bug identified on xmpp4r-devel
+    # https://mail.gna.org/public/xmpp4r-devel/2008-05/msg00010.html
+    assert_raise XMLRPC::FaultException do
+      cl.call("echo")
+    end
   end
 
   def test_introspection
@@ -81,4 +94,3 @@ class RPC::HelperTest < Test::Unit::TestCase
     assert(correct)
   end
 end
-

data/test/tc_callbacks.rb

@@ -9,7 +9,7 @@ include Jabber
 class CallbacksTest < Test::Unit::TestCase
   def test_test1
     called = 0
-    cb = Callback::new(5, "toto", Proc::new { called += 1 })
+    cb = Callback.new(5, "toto", Proc.new { called += 1 })
     assert_equal(5, cb.priority)
     assert_equal("toto", cb.ref)
     cb.block.call
@@ -19,7 +19,7 @@ class CallbacksTest < Test::Unit::TestCase
   end
 
   def test_callbacklist1
-    cbl = CallbackList::new
+    cbl = CallbackList.new
     called1 = false
     called2 = false
     called3 = false
@@ -37,7 +37,7 @@ class CallbacksTest < Test::Unit::TestCase
   end
 
   def test_callbacklist2
-    cbl = CallbackList::new
+    cbl = CallbackList.new
     assert(0, cbl.length)
     cbl.add(5, "ref1") { called1 = true }
     assert(1, cbl.length)
@@ -50,7 +50,7 @@ class CallbacksTest < Test::Unit::TestCase
   end
 
   def test_callbacklist4
-    cbl = CallbackList::new
+    cbl = CallbackList.new
     cbl.add(5, "ref1") { false }
     cbl.add(7, "ref1") { false }
     o = "o"
@@ -58,7 +58,7 @@ class CallbacksTest < Test::Unit::TestCase
    end
 
   def test_callbacklist5
-    cbl = CallbackList::new
+    cbl = CallbackList.new
     cbl.add(5, "ref1") { true }
     cbl.add(7, "ref1") { false }
     o = "o"
@@ -66,7 +66,7 @@ class CallbacksTest < Test::Unit::TestCase
    end
 
   def test_callbacklist6
-    cbl = CallbackList::new
+    cbl = CallbackList.new
     ok = false
     c = 'a'
     d = 'b'
@@ -81,7 +81,7 @@ class CallbacksTest < Test::Unit::TestCase
    end
 
   def test_callbacklist7
-    cbl = CallbackList::new
+    cbl = CallbackList.new
     called1 = false
     called2 = false
     called3 = false

data/test/tc_class_names.rb

@@ -9,12 +9,15 @@ require 'xmpp4r'
 class JIDTest < Test::Unit::TestCase
   def test_base
     assert_kind_of(Module, Jabber)
-    assert_kind_of(Class, Jabber::AuthenticationFailure)
+    assert_kind_of(Class, Jabber::JabberError)
+    assert_kind_of(Class, Jabber::ErrorResponse)
+    assert_kind_of(Class, Jabber::ClientAuthenticationFailure)
+    assert_kind_of(Class, Jabber::ComponentAuthenticationFailure)
     assert_kind_of(Class, Jabber::Client)
     assert_kind_of(Class, Jabber::Component)
     assert_kind_of(Class, Jabber::Connection)
-    assert_kind_of(Class, Jabber::Error)
-    assert_kind_of(Class, Jabber::ErrorException)
+    assert_kind_of(Class, Jabber::ErrorResponse)
+    assert_kind_of(Class, Jabber::ServerError)
     assert_kind_of(Class, Jabber::IdGenerator)
     assert_kind_of(Class, Jabber::Iq)
     assert_kind_of(Class, Jabber::IqQuery)
@@ -57,6 +60,7 @@ class JIDTest < Test::Unit::TestCase
 
   def test_bytestreams
     require 'xmpp4r/bytestreams'
+    assert_kind_of(Class, Jabber::SOCKS5Error)
     assert_kind_of(Module, Jabber::FileTransfer)
     assert_kind_of(Module, Jabber::FileTransfer::TransferSource)
     assert_kind_of(Class, Jabber::FileTransfer::FileSource)
@@ -77,10 +81,9 @@ class JIDTest < Test::Unit::TestCase
     assert_kind_of(Class, Jabber::Bytestreams::SOCKS5Bytestreams)
     assert_kind_of(Class, Jabber::Bytestreams::SOCKS5BytestreamsInitiator)
     assert_kind_of(Class, Jabber::Bytestreams::SOCKS5BytestreamsTarget)
-    assert_kind_of(Class, Jabber::Bytestreams::SOCKS5Error)
     assert_kind_of(Class, Jabber::Bytestreams::SOCKS5Socket)
   end
-  
+
   def test_dataforms
     require 'xmpp4r/dataforms'
     assert_kind_of(Module, Jabber::Dataforms)
@@ -90,7 +93,7 @@ class JIDTest < Test::Unit::TestCase
     assert_kind_of(Class, Jabber::Dataforms::XDataField)
     assert_kind_of(Class, Jabber::Dataforms::XDataReported)
   end
-  
+
   def test_delay
     require 'xmpp4r/delay'
     assert_kind_of(Module, Jabber::Delay)
@@ -134,4 +137,10 @@ class JIDTest < Test::Unit::TestCase
     assert_kind_of(Class, Jabber::RPC::Server)
     assert_kind_of(Class, Jabber::RPC::Client)
   end
+
+  def test_pubsub
+    require 'xmpp4r/pubsub'
+    assert_kind_of(Module, Jabber::PubSub)
+    assert_kind_of(Class, Jabber::PubSub::ServiceHelper)
+  end
 end

data/test/tc_client.rb

@@ -9,7 +9,7 @@ include Jabber
 class ClientTest < Test::Unit::TestCase
   def test_client1
 =begin
-    c = Client::new(JID::new('client1@localhost/res'))
+    c = Client.new(JID.new('client1@localhost/res'))
     assert_nothing_raised("Couldn't connect") {
       c.connect
     }
@@ -20,10 +20,10 @@ class ClientTest < Test::Unit::TestCase
   end
 
   def test_jid_is_jid
-    c1 = Client::new(JID::new('user@host/resource'))
+    c1 = Client.new(JID.new('user@host/resource'))
     assert_kind_of(JID, c1.jid)
     assert_equal('user@host/resource', c1.jid.to_s)
-    c2 = Client::new('user@host/resource')
+    c2 = Client.new('user@host/resource')
     assert_kind_of(JID, c2.jid)
     assert_equal('user@host/resource', c2.jid.to_s)
   end

data/test/{tc_error.rb → tc_errors.rb}

@@ -5,13 +5,55 @@ $:.unshift '../lib'
 require 'test/unit'
 require 'xmpp4r'
 require 'xmpp4r/rexmladdons'
-require 'xmpp4r/error'
 require 'xmpp4r/message'
 include Jabber
 
+class ServerErrorTest < Test::Unit::TestCase
+
+  def test_create_with_empty_error
+    e = ErrorResponse.new()
+    ee = ServerError.new(e)
+    assert_equal(nil, e.error)
+  end
+
+  def test_create_with_error_code
+    e = ErrorResponse.new('payment-required')
+    ee = ServerError.new(e)
+    assert_equal("payment-required: ", ee.to_s)
+  end
+
+  def test_create_invalid
+    assert_raise(Jabber::ArgumentError) {
+      e = ErrorResponse.new('invalid error')
+      ee = ServerError.new(e)
+    }
+  end
+
+  def test_to_s_with_error_code_but_no_text
+    e = ErrorResponse.new('payment-required')
+    ee = ServerError.new(e)
+    assert_equal("payment-required: ", ee.to_s)
+    assert_equal('payment-required', e.error)
+    assert_equal(402, ee.error.code)
+    assert_equal(:auth, ee.error.type)
+    assert_equal(nil, ee.error.text)
+  end
+
+  def test_to_s_with_error_code_and_text
+    e = ErrorResponse.new('payment-required', 'cuz you are a deadbeat.')
+    ee = ServerError.new(e)
+    assert_equal("payment-required: cuz you are a deadbeat.", ee.to_s)
+    assert_equal('payment-required', e.error)
+    assert_equal(402, ee.error.code)
+    assert_equal(:auth, ee.error.type)
+    assert_equal("cuz you are a deadbeat.", ee.error.text)
+  end
+
+end
+
 class ErrorTest < Test::Unit::TestCase
   def test_create
-    e = Error::new
+    e = ErrorResponse.new
     assert_equal(nil, e.error)
     assert_equal(nil, e.code)
     assert_equal(nil, e.type)
@@ -19,7 +61,7 @@ class ErrorTest < Test::Unit::TestCase
   end
 
   def test_create2
-    e = Error::new('payment-required')
+    e = ErrorResponse.new('payment-required')
     assert_equal('payment-required', e.error)
     assert_equal(402, e.code)
     assert_equal(:auth, e.type)
@@ -27,7 +69,7 @@ class ErrorTest < Test::Unit::TestCase
   end
 
   def test_create3
-    e = Error::new('gone', 'User moved to afterlife.gov')
+    e = ErrorResponse.new('gone', 'User moved to afterlife.gov')
     assert_equal('gone', e.error)
     assert_equal(302, e.code)
     assert_equal(:modify, e.type)
@@ -35,13 +77,13 @@ class ErrorTest < Test::Unit::TestCase
   end
 
   def test_create_invalid
-    assert_raise(RuntimeError) {
-      e = Error::new('invalid error')
+    assert_raise(Jabber::ArgumentError) {
+      e = ErrorResponse.new('invalid error')
     }
   end
 
   def test_type
-    e = Error::new
+    e = ErrorResponse.new
     assert_nil(e.type)
     e.type = :auth
     assert_equal(:auth, e.type)
@@ -58,7 +100,7 @@ class ErrorTest < Test::Unit::TestCase
   end
 
   def test_code
-    e = Error::new
+    e = ErrorResponse.new
     assert_nil(e.code)
     e.code = 404
     assert_equal(404, e.code)
@@ -68,7 +110,7 @@ class ErrorTest < Test::Unit::TestCase
   end
 
   def test_error
-    e = Error::new
+    e = ErrorResponse.new
     assert_nil(e.error)
     e.error = 'gone'
     assert_equal('gone', e.error)
@@ -80,13 +122,13 @@ class ErrorTest < Test::Unit::TestCase
   def test_stanzas
     m = Message.new
     assert_equal(nil, m.error)
-    m.typed_add(Error.new)
+    m.typed_add(ErrorResponse.new)
     assert_equal('<error/>', m.error.to_s)
   end
 
   def test_sample_normal
     src = '<error code="302" type="modify"><gone xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/><text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">...</text></error>'
-    e = Error.new.import(REXML::Document.new(src).root)
+    e = ErrorResponse.new.import(REXML::Document.new(src).root)
     assert_equal(:modify, e.type)
     assert_equal(302, e.code)
     assert_equal('gone', e.error)
@@ -95,7 +137,7 @@ class ErrorTest < Test::Unit::TestCase
 
   def test_sample_muc
     src = '<error code="409">Please choose a different nickname.</error>'
-    e = Error.new.import(REXML::Document.new(src).root)
+    e = ErrorResponse.new.import(REXML::Document.new(src).root)
     assert_equal(nil, e.type)
     assert_equal(409, e.code)
     assert_equal(nil, e.error)