xmpp4r 0.3.1 → 0.3.2

data/ChangeLog

@@ -1,3 +1,15 @@
+XMPP4R 0.3.2 (15/10/2007)
+=========================
+* Serious bug involving Ruby threading fixed (caused exceptions with
+  ruby 1.8.6)
+* vCard helper fixes
+* Jabber RPC (JEP0009) support
+* HTTP Binding (JEP0124) support
+* Publish-Subscribe support
+* XMPPElement: a framework for classes representing XML elements
+* Ad-hoc commands support
+* Improvements to Dataforms: XData, XDataTitle and XDataInstructions
+
 XMPP4R 0.3.1 (23/04/2007)
 =========================
 * SASL fixes

data/Rakefile

@@ -16,7 +16,7 @@ end
 # Globals
 
 PKG_NAME = 'xmpp4r'
-PKG_VERSION = '0.3.1'
+PKG_VERSION = '0.3.2'
 
 PKG_FILES = ['ChangeLog', 'README', 'COPYING', 'LICENSE', 'setup.rb', 'Rakefile', 'UPDATING']
 Find.find('lib/', 'data/', 'test/', 'tools/') do |f|
@@ -34,7 +34,7 @@ task :default => [:package]
 
 Rake::TestTask.new do |t|
 	t.libs << "test"
-	t.test_files = FileList['test/tc_*.rb']
+	t.test_files = ['test/ts_xmpp4r.rb']
 end
 
 Rake::RDocTask.new do |rd|
@@ -69,12 +69,10 @@ end
 Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |p|
 	p.need_tar = true
 	p.package_files = PKG_FILES
-	p p.package_files
 end
 
 if RCOV
 	Rcov::RcovTask.new do |t|
-		#t.test_files = FileList['test/tc_*.rb'] + FileList['test/*/tc_*.rb'] - ['test/tc_streamError.rb']
 		t.test_files = ['test/ts_xmpp4r.rb']
 	end
 end

data/data/doc/xmpp4r/examples/advanced/adventure/adventuremuc.rb

@@ -57,13 +57,13 @@ class AdventureMUC
   
   def handle_disco_info(iq)
     if iq.type != :get
-      answer = Jabber::XMLStanza.answer(iq)
+      answer = iq.answer
       answer.type = :error
       answer.add(Jabber::Error.new('bad-request'))
       @component.send(answer) if iq.type != :error
       return
     end
-    answer = Jabber::XMLStanza.answer(iq)
+    answer = iq.answer
     answer.type = :result
     if iq.to.node == nil
       answer.query.add(Jabber::Discovery::Identity.new('conference', 'Adventure component', 'text'))
@@ -87,12 +87,12 @@ class AdventureMUC
   
   def handle_disco_items(iq)
     if iq.type != :get
-      answer = Jabber::XMLStanza.answer(iq)
+      answer = iq.answer
       answer.add(Jabber::Error.new('bad-request'))
       @component.send(answer)
       return
     end
-    answer = Jabber::XMLStanza.answer(iq)
+    answer = iq.answer
     answer.type = :result
     if iq.to.node == nil
       @worlds.each { |node,world|
@@ -107,7 +107,7 @@ class AdventureMUC
     
     world = @worlds[pres.to.node]
     if world.nil?
-      answer = Jabber::XMLStanza.answer(pres)
+      answer = pres.answer
       answer.type = :error
       answer.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
       @component.send(answer)
@@ -123,7 +123,7 @@ class AdventureMUC
 
     world = @worlds[msg.to.node]
     if world.nil?
-      answer = Jabber::XMLStanza.answer(msg)
+      answer = msg.answer
       answer.type = :error
       answer.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
       @component.send(answer)

data/data/doc/xmpp4r/examples/advanced/adventure/world.rb

@@ -133,7 +133,7 @@ class World < REXML::Element
 
       # Disallow nick changes
       if thing.kind_of?(Player) && (pres.from == thing.jid) && (player != thing)
-        answer = Jabber::XMLStanza.answer(pres, false)
+        answer = pres.answer(false)
         answer.type = :error
         answer.add(Jabber::Error.new('not-acceptable', 'Nickchange not allowed'))
         send(thing.iname, answer)
@@ -143,7 +143,7 @@ class World < REXML::Element
 
     # Either nick-collission or empty nick
     unless (player.nil? || pres.from == player.jid) && (pres.to.resource.to_s.size > 1)
-      answer = Jabber::XMLStanza.answer(pres)
+      answer = pres.answer
       answer.type = :error
       if (pres.to.resource.to_s.size > 1)
         answer.add(Jabber::Error::new('conflict', 'Nickname already used'))
@@ -188,7 +188,7 @@ class World < REXML::Element
     }
 
     if player.nil?
-      answer = Jabber::XMLStanza.answer(msg)
+      answer = msg.answer
       answer.type = :error
       answer.add(Jabber::Error::new('forbidden'))
       send(msg.to.resource, answer)

data/data/doc/xmpp4r/examples/advanced/minimuc.rb

@@ -68,7 +68,7 @@ class Room
       # Push user-list
       userinfo = Jabber::Presence.import(pres)
       userinfo.to = pres.from
-      userinfo.add(Jabber::XMucUser.new).add(Jabber::XMucUserItem.new(:none, :participant))
+      userinfo.add(Jabber::XMUCUser.new).add(Jabber::XMUCUserItem.new(:none, :participant))
       print "Sending all users for #{pres.to} to #{pres.from}:"
       @users.each { |nick,jid|
         userinfo.from = Jabber::JID::new(@name.node, @name.domain, nick)
@@ -100,9 +100,9 @@ class Room
     
     # Advertise users presence to all
     puts "Advertising user to all"
-    x = Jabber::XMucUserItem.new(:none, :participant, pres.from)
+    x = Jabber::XMUCUserItem.new(:none, :participant, pres.from)
     x.reason = reason
-    pres.add(Jabber::XMucUser.new).add(x)
+    pres.add(Jabber::XMUCUser.new).add(x)
     pres.from = pres.to
     broadcast(pres)
   end
@@ -217,8 +217,8 @@ class MUC
       end
       [Jabber::IqQueryDiscoInfo.new.namespace,
        Jabber::IqQueryDiscoItems.new.namespace,
-       Jabber::XMuc.new.namespace,
-       Jabber::XMucUser.new.namespace].each { |ns|
+       Jabber::XMUC.new.namespace,
+       Jabber::XMUCUser.new.namespace].each { |ns|
           iq.query.add(Jabber::DiscoFeature.new(ns))
       }
     else

data/data/doc/xmpp4r/examples/advanced/xmpping.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+# =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 is PING for Jabber
 #
@@ -6,6 +10,7 @@
 
 
 require 'xmpp4r'
+require 'xmpp4r/httpbinding'
 require 'xmpp4r/version/iq/version'
 require 'xmpp4r/discovery/iq/discoinfo'
 require 'optparse'
@@ -69,8 +74,13 @@ end
 # Connection
 ##
 
-cl = Jabber::Client.new(Jabber::JID.new(account['jid']))
-cl.connect(account['host'], (account['port'] ? account['port'].to_i : 5222))
+if account['http bind']
+  cl = Jabber::HTTPBinding::Client.new(Jabber::JID.new(account['jid']))
+  cl.connect(account['http bind'])
+else
+  cl = Jabber::Client.new(Jabber::JID.new(account['jid']))
+  cl.connect(account['host'], (account['port'] ? account['port'].to_i : 5222))
+end
 cl.auth(account['password'])
 
 ##
@@ -79,7 +89,7 @@ cl.auth(account['password'])
 
 def print_reply(iq, roundtrip)
   roundtrip_s = ((roundtrip * 100).round / 100.0).to_s + " sec"
-  output = "Received a #{iq.query.namespace} #{iq.type} from #{iq.from} (#{roundtrip_s}): "
+  output = "Received a #{iq.query.namespace} #{iq.type} (id: #{iq.id}) from #{iq.from} (#{roundtrip_s}): "
 
   if iq.query.kind_of?(Jabber::Version::IqQueryVersion)
     output += "#{iq.query.iname}-#{iq.query.version} #{iq.query.os}"
@@ -102,6 +112,9 @@ end
 ##
 # Main loop
 ##
+  
+  require 'mprofiler'
+  MemoryProfiler.start(:string_debug=>true)
 
 puts "XMPPING #{cl.jid} -> #{jid}"
 query_methods = ['jabber:iq:version', 'jabber:iq:time', 'http://jabber.org/protocol/disco#info']
@@ -128,7 +141,7 @@ loop {
   if query_method >= query_methods.size
     query_method = 0
   end
-  
+
   sleep(interval)
 }
 

data/data/doc/xmpp4r/examples/advanced/xmppingrc.sample

@@ -7,3 +7,8 @@ other_account:
   password: xxx
   host: 127.0.0.1
   port: 65222
+
+web_account:
+  jid: me@domain/ping
+  password: xxx
+  http bind: http://domain/http-bind/

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

@@ -21,9 +21,13 @@ puts "Connected ! send messages to #{myJID.strip.to_s}."
 mainthread = Thread.current
 cl.add_message_callback do |m|
   if m.type != :error
-    cl.send(Message::new(m.from, "You sent: #{m.body}"))
+    m2 = Message::new(m.from, "You sent: #{m.body}")
+    m2.type = m.type
+    cl.send(m2)
     if m.body == 'exit'
-      cl.send(Message::new(m.from, "Exiting ..."))
+      m2 = Message::new(m.from, "Exiting ...")
+      m2.type = m.type
+      cl.send(m2)
       mainthread.wakeup
     end
   end

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

@@ -0,0 +1,13 @@
+require 'xmpp4r'
+require 'xmpp4r/muc'
+
+client = Jabber::Client.new('admin@myserver.co.uk/ruby')
+muc = Jabber::MUC::MUCClient.new(client)
+client.connect
+client.auth('admin')
+muc.join('room@conference.myserver.co.uk/admin')
+muc.configure(
+      'muc#roomconfig_roomname' => 'roomname',
+      'muc#roomconfig_persistentroom' => 1
+)
+

data/lib/xmpp4r.rb

@@ -59,12 +59,6 @@
 # But instead check for the query's class:
 # <tt>iq.query.kind_of?(Jabber::IqQueryDiscoInfo)</tt>
 #
-# ==Threaded and non-threaded modes
-#
-# From the user's point of view, the library can be used either in threaded mode,
-# or in non-threaded mode, using a call to <tt>Jabber::Stream#process</tt> to
-# receive pending messages.
-#
 # ==Where to begin?
 #
 # Because it is built in an extensible way, it might be hard for newcomers to

data/lib/xmpp4r/bytestreams/helper/filetransfer.rb

@@ -2,8 +2,7 @@
 # License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
 # Website::http://home.gna.org/xmpp4r/
 
-require 'callbacks'
-
+require 'xmpp4r/callbacks'
 require 'xmpp4r/bytestreams/iq/si'
 require 'xmpp4r/dataforms/x/data'
 require 'xmpp4r/bytestreams/helper/ibb/base'
@@ -199,8 +198,8 @@ module Jabber
         si.feature.x.type = :submit
         stream_method = si.feature.x.field('stream-method')
 
-        if stream_method.options.keys.include?(Bytestreams::IqQueryBytestreams::NS_BYTESTREAMS) and @allow_bytestreams
-          stream_method.values = [Bytestreams::IqQueryBytestreams::NS_BYTESTREAMS]
+        if stream_method.options.keys.include?(Bytestreams::NS_BYTESTREAMS) and @allow_bytestreams
+          stream_method.values = [Bytestreams::NS_BYTESTREAMS]
           stream_method.options = []
           @stream.send(answer)
 
@@ -254,7 +253,7 @@ module Jabber
 
         offered_methods = {}
         if @allow_bytestreams
-          offered_methods[Bytestreams::IqQueryBytestreams::NS_BYTESTREAMS] = nil
+          offered_methods[Bytestreams::NS_BYTESTREAMS] = nil
         end
         if @allow_ibb
           offered_methods[Bytestreams::IBB::NS_IBB] = nil
@@ -262,7 +261,7 @@ module Jabber
 
         iq = Iq::new(:set, jid)
         iq.from = from
-        si = iq.add(Bytestreams::IqSi.new(session_id, Bytestreams::IqSi::PROFILE_FILETRANSFER, source.mime))
+        si = iq.add(Bytestreams::IqSi.new(session_id, Bytestreams::PROFILE_FILETRANSFER, source.mime))
 
         file = si.add(Bytestreams::IqSiFile.new(source.filename, source.size))
         file.hash = source.md5
@@ -304,7 +303,7 @@ module Jabber
           end
         end
 
-        if stream_method == Bytestreams::IqQueryBytestreams::NS_BYTESTREAMS and @allow_bytestreams
+        if stream_method == Bytestreams::NS_BYTESTREAMS and @allow_bytestreams
           Bytestreams::SOCKS5BytestreamsInitiator.new(@stream, session_id, from, jid)
         elsif stream_method == Bytestreams::IBB::NS_IBB and @allow_ibb
           Bytestreams::IBBInitiator.new(@stream, session_id, from, jid)

data/lib/xmpp4r/bytestreams/helper/ibb/base.rb

@@ -38,8 +38,7 @@ module Jabber
         @seq_recv = 0
         @queue = []
         @queue_lock = Mutex.new
-        @pending = Mutex.new
-        @pending.lock
+        @pending = Semaphore.new
         @sendbuf = ''
         @sendbuf_lock = Mutex.new
 
@@ -105,7 +104,7 @@ module Jabber
             }
 
             # No data? Wait for next to arrive...
-            @pending.lock unless res
+            @pending.wait unless res
           end
 
           if res.type == :data
@@ -188,12 +187,12 @@ module Jabber
               if msg.type == nil
                 @queue_lock.synchronize {
                   @queue.push IBBQueueItem.new(:data, data.attributes['seq'], data.text.to_s)
-                  @pending.unlock
+                  @pending.run
                 }
               elsif msg.type == :error
                 @queue_lock.synchronize {
                   @queue << IBBQueueItem.new(:close)
-                  @pending.unlock
+                  @pending.run
                 }
               end
               true
@@ -211,7 +210,7 @@ module Jabber
 
               @queue_lock.synchronize {
                 @queue << IBBQueueItem.new(:close)
-                @pending.unlock
+                @pending.run
               }
               true
             else

data/lib/xmpp4r/bytestreams/helper/ibb/target.rb

@@ -19,8 +19,7 @@ module Jabber
       # Wait for the initiator side to start
       # the stream.
       def accept
-        connect_lock = Mutex.new
-        connect_lock.lock
+        connect_sem = Semaphore.new
 
         @stream.add_iq_callback(200, self) { |iq|
           open = iq.first_element('open')
@@ -33,15 +32,14 @@ module Jabber
             reply.type = :result
             @stream.send(reply)
 
-            connect_lock.unlock
+            connect_sem.run
             true
           else
             false
           end
         }
 
-        connect_lock.lock
-        connect_lock.unlock
+        connect_sem.wait
         true
       end
     end

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/base.rb

@@ -7,7 +7,7 @@ require 'thread'
 require 'timeout'
 require 'digest/sha1'
 
-require 'callbacks'
+require 'xmpp4r/callbacks'
 
 module Jabber
   module Bytestreams

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/server.rb

@@ -35,21 +35,23 @@ module Jabber
           socket = TCPServer.new(port)
         end
 
-        Thread.new {
-          loop {
+        Thread.new do
+          Thread.current.abort_on_exception = true
+          loop do
             peer = SOCKS5BytestreamsPeer.new(socket.accept)
-            Thread.new {
+            Thread.new do
+              Thread.current.abort_on_exception = true
               begin
                 peer.start
               rescue
                 Jabber::debuglog("SOCKS5 BytestreamsServer: Error accepting peer: #{$!}")
               end
-            }
-            @peers_lock.synchronize {
+            end
+            @peers_lock.synchronize do
               @peers << peer
-            }
-          }
-        }
+            end
+          end
+        end
       end
 
       ##

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/target.rb

@@ -13,8 +13,7 @@ module Jabber
       # May raise various exceptions
       def accept
         error = nil
-        connect_lock = Mutex.new
-        connect_lock.lock
+        connect_sem = Semaphore.new
 
         @stream.add_iq_callback(200, self) { |iq|
           if iq.type == :set and iq.from == @initiator_jid and iq.to == @target_jid and iq.query.kind_of?(IqQueryBytestreams)
@@ -47,15 +46,14 @@ module Jabber
               error = e
             end
               
-            connect_lock.unlock
+            connect_sem.run
             true
           else
             false
           end
         }
 
-        connect_lock.lock
-        connect_lock.unlock
+        connect_sem.wait
         raise error if error
         (@socks != nil)
       end