xmpp4r 0.3.2 → 0.4

data/test/tc_xmppstanza.rb

@@ -9,6 +9,7 @@ require 'xmpp4r/xmppstanza'
 require 'xmpp4r/iq'
 require 'xmpp4r/feature_negotiation'
 require 'xmpp4r/dataforms'
+require 'xmpp4r/errors'
 include Jabber
 
 class XMPPStanzaTest < Test::Unit::TestCase
@@ -24,7 +25,7 @@ class XMPPStanzaTest < Test::Unit::TestCase
   end
 
   def test_from
-    x = MyXMPPStanza::new
+    x = MyXMPPStanza.new
     assert_equal(nil, x.from)
     assert_equal(x, x.set_from("blop"))
     assert_equal("blop", x.from.to_s)
@@ -33,7 +34,7 @@ class XMPPStanzaTest < Test::Unit::TestCase
   end
 
   def test_to
-    x = MyXMPPStanza::new
+    x = MyXMPPStanza.new
     assert_equal(nil, x.to)
     assert_equal(x, x.set_to("blop"))
     assert_equal("blop", x.to.to_s)
@@ -42,7 +43,7 @@ class XMPPStanzaTest < Test::Unit::TestCase
   end
 
   def test_id
-    x = MyXMPPStanza::new
+    x = MyXMPPStanza.new
     assert_equal(nil, x.id)
     assert_equal(x, x.set_id("blop"))
     assert_equal("blop", x.id)
@@ -51,7 +52,7 @@ class XMPPStanzaTest < Test::Unit::TestCase
   end
 
   def test_type
-    x = MyXMPPStanza::new
+    x = MyXMPPStanza.new
     assert_equal(nil, x.type)
     assert_equal(x, x.set_type("blop"))
     assert_equal("blop", x.type)
@@ -60,7 +61,7 @@ class XMPPStanzaTest < Test::Unit::TestCase
   end
 
   def test_import
-    x = MyXMPPStanza::new
+    x = MyXMPPStanza.new
     x.id = "heya"
     q = x.add_element("query")
     q.add_namespace("about:blank")
@@ -73,7 +74,7 @@ class XMPPStanzaTest < Test::Unit::TestCase
     assert_raise(RuntimeError) { iq = Iq.import(x) }
     x.name = 'iq'
     iq = Iq.import(x)
-    
+
     assert_equal(x.id, iq.id)
     assert_equal(q.to_s, iq.query.to_s)
     assert_equal(x.to_s, iq.to_s)
@@ -90,16 +91,25 @@ class XMPPStanzaTest < Test::Unit::TestCase
     assert_equal(field.type, feature2.x.fields.first.type)
   end
 
+  def test_import_xml_entities
+    e = REXML::Element.new('e')
+    e.text = '&'
+    assert_equal('<e>&amp;</e>', e.to_s)
+
+    e2 = REXML::Element.new('e').import(e)
+    assert_equal('<e>&amp;</e>', e2.to_s)
+  end
+
   def test_error
-    x = MyXMPPStanza::new
+    x = MyXMPPStanza.new
     assert_equal(nil, x.error)
     x.typed_add(REXML::Element.new('error'))
     assert_equal('<error/>', x.error.to_s)
-    assert_equal(Error, x.error.class)
+    assert_equal(ErrorResponse, x.error.class)
   end
 
   def test_clone_and_dup
-    x = MyXMPPStanza::new
+    x = MyXMPPStanza.new
     x.attributes['xyz'] = '123'
     x.text = 'abc'
 

data/test/ts_xmpp4r.rb

@@ -28,11 +28,20 @@ Find.find(File.dirname(__FILE__)) do |f|
   elsif File::basename(f) =~ /^tc.*\.rb$/
     tc_files << f
   end
-end 
+end
 
 tc_subdirs.each do |dir|
   Find.find(dir) do |f|
     if File::file?(f) and File::basename(f) =~ /^tc.*\.rb$/
+
+      if (RUBY_VERSION.split('.').collect {|n| n.to_i} <=> [1,9,0]) >= 0
+        # TODO: at the moment, these two test cases have timing dependencies
+        # on threaded code.  While they may pass with the green thread
+        # implementation in Ruby 1.8, they often fail with real threads.
+        next if f =~ /tc_helper.rb/
+        next if f =~ /tc_stream.rb/
+      end
+
       tc_files << f
     end
   end

data/test/tune/tc_helper_recv.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/ruby
+
+$:.unshift File::dirname(__FILE__) + '/../../lib'
+
+require 'test/unit'
+require File::dirname(__FILE__) + '/../lib/clienttester'
+
+require 'xmpp4r'
+require 'xmpp4r/tune/helper/helper'
+require 'xmpp4r/tune/tune'
+include Jabber
+
+#Jabber::debug=true
+
+class UserTune::HelperTest < Test::Unit::TestCase
+  include ClientTester
+
+  ##
+  # Test receiving 'now playing' notifications
+  #
+  # See http://www.xmpp.org/extensions/xep-0118.html#protocol-transport,
+  # example 1
+  def test_recv_now_playing
+    state { |presence|
+      send(deliver_usertune)
+    }
+
+    query_waiter = Semaphore.new
+
+    h = UserTune::Helper.new(@client, 'stpeter@jabber.org')
+    h.add_usertune_callback do |tune|
+      assert_kind_of Jabber::UserTune::Tune, tune
+      assert_equal true, tune.playing?
+      assert_equal 'Yes', tune.artist
+      assert_equal 686, tune.length
+      assert_equal 'Yessongs', tune.source
+      assert_equal 'Heart of the Sunrise', tune.title
+      assert_equal '3', tune.track
+      assert_equal 'http://www.yesworld.com/lyrics/Fragile.html#9',tune.uri
+    end
+    @client.add_message_callback do |m|
+      query_waiter.run
+    end
+    @client.send Jabber::Presence.new
+    wait_state
+
+    query_waiter.wait
+  end
+
+  # see example 2 from http://www.xmpp.org/extensions/xep-0118.html#protocol-transport
+  def deliver_usertune
+    "<message
+    from='stpeter@jabber.org'
+    to='maineboy@jabber.org'>
+    <event xmlns='http://jabber.org/protocol/pubsub#event'>
+    <items node='http://jabber.org/protocol/tune'>
+      <item id='bffe6584-0f9c-11dc-84ba-001143d5d5db'>
+        <tune xmlns='http://jabber.org/protocol/tune'>
+          <artist>Yes</artist>
+          <length>686</length>
+          <source>Yessongs</source>
+          <title>Heart of the Sunrise</title>
+          <track>3</track>
+          <uri>http://www.yesworld.com/lyrics/Fragile.html#9</uri>
+        </tune>
+      </item>
+    </items>
+    </event>
+    </message>"
+  end
+
+  # an example from the Wild
+  def psi_usertune
+    "<message from='admin@new-big-computer.local' to='matt@new-big-computer.local/trackbot' xmlns='jabber:client'><event xmlns='http://jabber.org/protocol/pubsub#event'><items node='http://jabber.org/protocol/tune'><item id='current'>
+
+    <tune xmlns='http://jabber.org/protocol/tune'>
+
+
+
+
+
+    <artist>Wes Montgomery</artist><title>Jingles</title><source>Bags Meets Wes</source><track>8</track><length>410</length></tune></item></items></event></message>"
+  end
+end

data/test/tune/tc_helper_send.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/ruby
+
+$:.unshift File::dirname(__FILE__) + '/../../lib'
+
+require 'test/unit'
+require File::dirname(__FILE__) + '/../lib/clienttester'
+
+require 'xmpp4r'
+require 'xmpp4r/tune/helper/helper'
+require 'xmpp4r/tune/tune'
+include Jabber
+
+#Jabber::debug=true
+
+class UserTune::HelperTest < Test::Unit::TestCase
+  include ClientTester
+
+  ##
+  # Test sending 'now playing' notifications
+  #
+  # See http://www.xmpp.org/extensions/xep-0118.html#protocol-transport,
+  # example 1
+  def test_send_now_playing
+    artist = 'Mike Flowers Pops'
+    title = 'Light My Fire'
+    tune_to_send = UserTune::Tune.new(artist, title)
+
+    h = UserTune::Helper.new(@client, nil)
+    assert_kind_of(UserTune::Helper, h)
+
+    state { |now_playing|
+      assert_kind_of(Jabber::Iq, now_playing)
+      assert_equal :set, now_playing.type
+
+      assert_kind_of(Jabber::PubSub::IqPubSub,now_playing.first_element('pubsub'))
+      assert_equal(Jabber::UserTune::NS_USERTUNE,now_playing.first_element('pubsub').first_element('publish').node)
+
+      tune=now_playing.first_element('pubsub').first_element('publish').first_element('item').first_element('tune')
+      assert_kind_of Jabber::UserTune::Tune,tune
+      assert_equal true, tune.playing?
+      assert_equal artist,tune.artist
+      assert_equal title,tune.title
+      assert_equal nil,tune.length
+      assert_equal nil,tune.track
+      assert_equal nil,tune.source
+      assert_equal nil,tune.uri
+
+      send("<iq type='result' id='#{now_playing.id}'/>")
+    }
+    h.now_playing(tune_to_send)
+    wait_state
+  end
+
+  def test_send_stop_playing
+    h = UserTune::Helper.new(@client, nil)
+
+    state { |now_playing|
+      tune = now_playing.first_element('pubsub').first_element('publish').first_element('item').first_element('tune')
+
+      assert_kind_of Jabber::UserTune::Tune, tune
+      assert_equal false, tune.playing?
+      assert_equal nil, tune.artist
+      assert_equal nil, tune.title
+      assert_equal nil,tune.length
+      assert_equal nil,tune.track
+      assert_equal nil,tune.source
+      assert_equal nil,tune.uri
+
+      send("<iq type='result' id='#{now_playing.id}'/>")
+    }
+    h.stop_playing
+    wait_state
+  end
+end

data/test/tune/tc_tune.rb

@@ -0,0 +1,79 @@
+#!/usr/bin/ruby
+
+$:.unshift '../lib'
+
+require 'test/unit'
+require 'xmpp4r/tune/tune.rb'
+
+class Jabber::UserTune::TuneTest < Test::Unit::TestCase
+  def test_create
+    artist='Mike Flowers Pops'
+    title='Light My Fire'
+    length=175
+    track='4'
+    source='A Groovy Place'
+    uri='http://musicbrainz.org/track/d44110e6-4b20-4d16-9e69-74bf0e4f7106.html'
+    rating=10
+
+    t=Jabber::UserTune::Tune.new(artist,title,length,track,source,uri,rating)
+
+    assert_kind_of Jabber::UserTune::Tune,t
+    assert_equal 7,t.elements.size
+    assert_equal true,t.playing?
+    assert_equal artist,t.artist
+    assert_equal track,t.track
+    assert_equal length,t.length
+    assert_equal track,t.track
+    assert_equal source,t.source
+    assert_equal uri,t.uri
+    assert_equal rating,t.rating
+  end
+
+  def test_stop_playing
+    t=Jabber::UserTune::Tune.new
+
+    assert_kind_of Jabber::UserTune::Tune,t
+    assert_equal 0,t.elements.size
+    assert_equal false, t.playing?
+    assert_equal nil,t.artist
+    assert_equal nil,t.track
+    assert_equal nil,t.length
+    assert_equal nil,t.track
+    assert_equal nil,t.source
+    assert_equal nil,t.uri
+  end
+
+  def test_rating_edgecases
+    assert_equal(0, Jabber::UserTune::Tune.new(artist,title,length,track,source,uri,-1.5).rating)
+    assert_equal(10, Jabber::UserTune::Tune.new(artist,title,length,track,source,uri,11.5).rating)
+    assert_equal(nil, Jabber::UserTune::Tune.new(artist,title,length,track,source,uri,'fantastic').rating)
+  end
+
+  def artist
+    'Mike Flowers Pops'
+  end
+
+  def title
+    'Light My Fire'
+  end
+
+  def length
+    175
+  end
+
+  def track
+    '4'
+  end
+
+  def source
+    'A Groovy Place'
+  end
+
+  def uri
+    'http://musicbrainz.org/track/d44110e6-4b20-4d16-9e69-74bf0e4f7106.html'
+  end
+
+  def rating
+    10
+  end
+end

data/test/vcard/tc_helper.rb

@@ -13,13 +13,14 @@ class Vcard::HelperTest < Test::Unit::TestCase
   include ClientTester
 
   def test_create
-    h = Vcard::Helper::new(@client)
+    h = Vcard::Helper.new(@client)
     assert_kind_of(Vcard::Helper, h)
   end
 
   def test_callback
     @server.on_exception{|*e| p e}
     class << @client
+      remove_method(:jid)
       def jid
         JID.new('b@b.com/b')
       end
@@ -46,4 +47,3 @@ class Vcard::HelperTest < Test::Unit::TestCase
     assert_equal('====', res['PHOTO/BINVAL'])
   end
 end
-

data/test/vcard/tc_iqvcard.rb

@@ -27,9 +27,9 @@ class IqVcardTest < Test::Unit::TestCase
     f.each { |s|
       v[s.downcase] = s.upcase
     }
-    
+
     assert_equal(f, v.fields.sort)
-    
+
     f.each { |s|
       assert_equal(s.upcase, v[s.downcase])
       assert_equal(nil, v[s.upcase])
@@ -41,7 +41,7 @@ class IqVcardTest < Test::Unit::TestCase
       'FN' => 'John D. Random',
       'PHOTO/TYPE' => 'image/png',
       'PHOTO/BINVAL' => '===='})
-    
+
       assert_equal(['FN', 'PHOTO/BINVAL', 'PHOTO/TYPE'], v.fields.sort)
       assert_equal('John D. Random', v['FN'])
       assert_equal('image/png', v['PHOTO/TYPE'])
@@ -49,4 +49,14 @@ class IqVcardTest < Test::Unit::TestCase
       assert_equal(nil, v['PHOTO'])
       assert_equal(nil, v['NICKNAME'])
   end
+
+  def test_photo_binval
+    v = Vcard::IqVcard.new({'PHOTO/BINVAL'=>"SGVsbG8gd29ybGQ=\n"})
+    assert_equal('Hello world', v.photo_binval)
+  end
+
+  def test_photo_binval_nil
+    v = Vcard::IqVcard.new({})
+    assert_nil(v.photo_binval)
+  end
 end

data/test/version/tc_helper.rb

@@ -14,14 +14,14 @@ class Version::HelperTest < Test::Unit::TestCase
   include ClientTester
 
   def test_create
-    h = Version::Responder::new(@client)
+    h = Version::Responder.new(@client)
     assert_kind_of(Version::Responder, h)
     assert_respond_to(h, :add_version_callback)
   end
 
   def test_callback
     # Prepare helper
-    h = Version::Responder::new(@client)
+    h = Version::Responder.new(@client)
 
     calls = 0
     h.add_version_callback { |iq,responder|

data/test/version/tc_iqqueryversion.rb

@@ -10,7 +10,7 @@ include Jabber
 
 class Version::IqQueryVersionTest < Test::Unit::TestCase
   def test_create_empty
-    x = Version::IqQueryVersion::new
+    x = Version::IqQueryVersion.new
     assert_equal('jabber:iq:version', x.namespace)
     assert_nil(x.iname)
     assert_nil(x.version)
@@ -18,7 +18,7 @@ class Version::IqQueryVersionTest < Test::Unit::TestCase
   end
 
   def test_create
-    x = Version::IqQueryVersion::new('my test', 'XP')
+    x = Version::IqQueryVersion.new('my test', 'XP')
     assert_equal('jabber:iq:version', x.namespace)
     assert_equal('my test', x.iname)
     assert_equal('XP', x.version)
@@ -26,7 +26,7 @@ class Version::IqQueryVersionTest < Test::Unit::TestCase
   end
 
   def test_create_with_os
-    x = Version::IqQueryVersion::new('superbot', '1.0-final', 'FreeBSD 5.4-RELEASE-p4')
+    x = Version::IqQueryVersion.new('superbot', '1.0-final', 'FreeBSD 5.4-RELEASE-p4')
     assert_equal('jabber:iq:version', x.namespace)
     assert_equal('superbot', x.iname)
     assert_equal('1.0-final', x.version)
@@ -34,23 +34,23 @@ class Version::IqQueryVersionTest < Test::Unit::TestCase
   end
 
   def test_import1
-    iq = Iq::new
-    q = REXML::Element::new('query')
+    iq = Iq.new
+    q = REXML::Element.new('query')
     q.add_namespace('jabber:iq:version')
     iq.add(q)
-    iq2 = Iq::new.import(iq)
+    iq2 = Iq.new.import(iq)
     assert_equal(Version::IqQueryVersion, iq2.query.class)
   end
 
   def test_import2
-    iq = Iq::new
-    q = REXML::Element::new('query')
+    iq = Iq.new
+    q = REXML::Element.new('query')
     q.add_namespace('jabber:iq:version')
     q.add_element('name').text = 'AstroBot'
     q.add_element('version').text = 'XP'
     q.add_element('os').text = 'FreeDOS'
     iq.add(q)
-    iq = Iq::new.import(iq)
+    iq = Iq.new.import(iq)
     assert_equal(Version::IqQueryVersion, iq.query.class)
     assert_equal('AstroBot', iq.query.iname)
     assert_equal('XP', iq.query.version)
@@ -58,7 +58,7 @@ class Version::IqQueryVersionTest < Test::Unit::TestCase
   end
 
   def test_replace
-    x = Version::IqQueryVersion::new('name', 'version', 'os')
+    x = Version::IqQueryVersion.new('name', 'version', 'os')
 
     num = 0
     x.each_element('name') { |e| num += 1 }