xmpp4r 0.3.2 → 0.4

data/data/doc/xmpp4r/examples/advanced/adventure/README

@@ -54,4 +54,3 @@ RFC3920:
 
 Compliant server implementations MUST ensure in-order processing of
 XML stanzas between any two entities."
-

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

@@ -17,7 +17,7 @@ if ARGV.size != 3
   exit
 end
 
-muc = AdventureMUC::new(Jabber::JID::new(ARGV[0]), ARGV[1], ARGV[2])
+muc = AdventureMUC.new(Jabber::JID.new(ARGV[0]), ARGV[1], ARGV[2])
 muc.add_world('tower.xml')
 muc.add_world('cube.xml')
 Thread.stop

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

@@ -3,8 +3,8 @@ require 'world'
 class AdventureMUC
   def initialize(jid, secret, addr, port=5347)
     @worlds = {}
-    
-    @component = Jabber::Component::new(jid)
+
+    @component = Jabber::Component.new(jid)
     @component.connect(addr, port)
     @component.auth(secret)
     @component.on_exception { |e,|
@@ -37,7 +37,7 @@ class AdventureMUC
   end
 
   def send(worldnode, worldresource, stanza)
-    stanza.from = Jabber::JID::new(worldnode, @component.jid.domain, worldresource)
+    stanza.from = Jabber::JID.new(worldnode, @component.jid.domain, worldresource)
     @component.send(stanza)
   end
 
@@ -54,12 +54,12 @@ class AdventureMUC
       false
     end
   end
-  
+
   def handle_disco_info(iq)
     if iq.type != :get
       answer = iq.answer
       answer.type = :error
-      answer.add(Jabber::Error.new('bad-request'))
+      answer.add(Jabber::ErrorResponse.new('bad-request'))
       @component.send(answer) if iq.type != :error
       return
     end
@@ -73,7 +73,7 @@ class AdventureMUC
       world = @worlds[iq.to.node]
       if world.nil?
         answer.type = :error
-        answer.query.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
+        answer.query.add(Jabber::ErrorResponse.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
       else
         answer.query.add(Jabber::Discovery::Identity.new('conference', world.iname, 'text'))
         answer.query.add(Jabber::Discovery::Feature.new(Jabber::Discovery::IqQueryDiscoInfo.new.namespace))
@@ -84,11 +84,11 @@ class AdventureMUC
     end
     @component.send(answer)
   end
-  
+
   def handle_disco_items(iq)
     if iq.type != :get
       answer = iq.answer
-      answer.add(Jabber::Error.new('bad-request'))
+      answer.add(Jabber::ErrorResponse.new('bad-request'))
       @component.send(answer)
       return
     end
@@ -96,7 +96,7 @@ class AdventureMUC
     answer.type = :result
     if iq.to.node == nil
       @worlds.each { |node,world|
-        answer.query.add(Jabber::Discovery::Item.new(Jabber::JID::new(node, @component.jid.domain), world.iname))
+        answer.query.add(Jabber::Discovery::Item.new(Jabber::JID.new(node, @component.jid.domain), world.iname))
       }
     end
     @component.send(answer)
@@ -104,12 +104,12 @@ class AdventureMUC
 
   def handle_presence(pres)
     puts "presence: from #{pres.from} type #{pres.type} to #{pres.to}"
-    
+
     world = @worlds[pres.to.node]
     if world.nil?
       answer = pres.answer
       answer.type = :error
-      answer.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
+      answer.add(Jabber::ErrorResponse.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
       @component.send(answer)
     else
       world.handle_presence(pres)
@@ -125,7 +125,7 @@ class AdventureMUC
     if world.nil?
       answer = msg.answer
       answer.type = :error
-      answer.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
+      answer.add(Jabber::ErrorResponse.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
       @component.send(answer)
     else
       world.handle_message(msg)

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

@@ -24,9 +24,9 @@ class World < REXML::Element
 
   def add(xmlelement)
     if xmlelement.kind_of?(REXML::Element) && (xmlelement.name == 'place')
-      super(Place::new.import(xmlelement))
+      super(Place.new.import(xmlelement))
     elsif xmlelement.kind_of?(REXML::Element) && (xmlelement.name == 'thing') && !xmlelement.kind_of?(Player)
-      super(Thing::new(self).import(xmlelement))
+      super(Thing.new(self).import(xmlelement))
     else
       super(xmlelement)
     end
@@ -135,7 +135,7 @@ class World < REXML::Element
       if thing.kind_of?(Player) && (pres.from == thing.jid) && (player != thing)
         answer = pres.answer(false)
         answer.type = :error
-        answer.add(Jabber::Error.new('not-acceptable', 'Nickchange not allowed'))
+        answer.add(Jabber::ErrorResponse.new('not-acceptable', 'Nickchange not allowed'))
         send(thing.iname, answer)
         return(true)
       end
@@ -146,9 +146,9 @@ class World < REXML::Element
       answer = pres.answer
       answer.type = :error
       if (pres.to.resource.to_s.size > 1)
-        answer.add(Jabber::Error::new('conflict', 'Nickname already used'))
+        answer.add(Jabber::ErrorResponse.new('conflict', 'Nickname already used'))
       else
-        answer.add(Jabber::Error::new('not-acceptable', 'Please use a nickname'))
+        answer.add(Jabber::ErrorResponse.new('not-acceptable', 'Please use a nickname'))
       end
       send(nil, answer)
       return(true)
@@ -171,7 +171,7 @@ class World < REXML::Element
         send(player.iname, pres)
       }
     end
-    
+
     # Remove the player instantly
     if pres.type == :error || pres.type == :unavailable
       move_thing(player, nil)
@@ -190,7 +190,7 @@ class World < REXML::Element
     if player.nil?
       answer = msg.answer
       answer.type = :error
-      answer.add(Jabber::Error::new('forbidden'))
+      answer.add(Jabber::ErrorResponse.new('forbidden'))
       send(msg.to.resource, answer)
       return(true)
     end
@@ -336,7 +336,7 @@ class Thing < REXML::Element
       end
     }
   end
-  
+
   def on_enter(thing, from)
     each_element('on-enter') { |c|
       command(thing, c, [from])
@@ -374,9 +374,9 @@ class Player < Thing
     attributes['name'] = iname
     attributes['jid'] = jid.to_s
   end
-  
+
   def jid
-    attributes['jid'].nil? ? nil : Jabber::JID::new(attributes['jid'])
+    attributes['jid'].nil? ? nil : Jabber::JID.new(attributes['jid'])
   end
 
   def see(place)
@@ -422,4 +422,3 @@ class Player < Thing
     end
   end
 end
-

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

@@ -198,7 +198,7 @@ class FileServe
     @socksserver = Jabber::Bytestreams::SOCKS5BytestreamsServer.new(conf['socks']['port'])
 
     conf['socks']['addresses'].each { |addr| @socksserver.add_address(addr) }
-    
+
     @proxies = []
     conf['socks']['proxies'].collect { |jid|
       puts "Querying proxy #{jid}..."
@@ -207,8 +207,8 @@ class FileServe
       rescue
         puts "Error: #{$!}"
       end
-    } 
-    
+    }
+
     Thread.new { presence }
     Thread.new { cleaner }
 
@@ -253,7 +253,7 @@ class FileServe
     }
 
     @ft.add_incoming_callback { |iq,file|
-      
+
       say = lambda { |text|
         say(iq.from, text)
       }
@@ -261,23 +261,23 @@ class FileServe
       puts "Incoming file transfer from #{iq.from}: #{file.fname} (#{file.size / 1024} KB)"
       filename = file.fname.split(/\//).last
       filename.gsub!(/^\.+/, '')
-      
+
       puts "Range: #{file.range != nil}"
       transfer = Upload.new(@ft, iq, "#{@directory}/#{filename}", file.size, file.range != nil, say)
       @uploads += 1
-      
+
       @transfers_lock.synchronize {
         @transfers.push(transfer)
       }
-    
+
     }
 
     roster = Jabber::Roster::Helper.new(@client)
-    
+
     roster.add_subscription_request_callback { |item,presence|
       roster.accept_subscription(presence.from)
     }
-    
+
   end
 
   def command(from, cmd, arg)
@@ -330,11 +330,11 @@ class FileServe
 
   def cleaner
     loop {
-    
+
       @transfers_lock.synchronize {
         @transfers.delete_if { |t| t.done? }
       }
-    
+
       sleep 1
     }
   end

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

@@ -7,14 +7,14 @@ require 'xmpp4r'
 include Jabber
 
 get = true
-jid = JID::new('lucastest@linux.ensimag.fr/rosterget')
+jid = JID.new('lucastest@linux.ensimag.fr/rosterget')
 password = 'lucastest'
 domains = []
 
-OptionParser::new do |opts|
+OptionParser.new do |opts|
   opts.banner = 'Usage: roster.rb -j jid -p password -d domain'
   opts.separator ''
-  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID::new(j) }
+  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID.new(j) }
   opts.on('-p', '--password PASSWORD', 'sets the password') { |p| password = p }
   opts.on('-d', '--domain DOMAIN', 'sets the domain') { |d| domains << d }
   opts.on_tail('-h', '--help', 'Show this message') {
@@ -24,13 +24,13 @@ OptionParser::new do |opts|
   opts.parse!(ARGV)
 end
 
-cl = Client::new(jid, false)
+cl = Client.new(jid)
 cl.connect
 cl.auth(password)
 exit = false
 nb = 0
 cl.add_iq_callback { |i|
-  fjid = JID::new(i.from)
+  fjid = JID.new(i.from)
   if i.type == :result and fjid.resource == "admin"
     domain = fjid.domain
     items = nil
@@ -47,8 +47,8 @@ cl.add_iq_callback { |i|
   end
 }
 for d in domains do
-	cl.send(Iq::new_browseget.set_to("#{d}/admin"))
-	nb += 1
+  cl.send(Iq.new_browseget.set_to("#{d}/admin"))
+  nb += 1
 end
 while nb > 0
   cl.process(1)

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

@@ -57,7 +57,7 @@ class SetupWindow < Gtk::Window
     @entry_resource.show
     layout1.attach(@entry_resource, 1, 2, 3, 4)
 
-    
+
     frame2 = Gtk::Frame.new('Multi-User Chat Settings')
     frame2.set_border_width(4)
     frame2.show
@@ -174,7 +174,7 @@ class ChatWindow < Gtk::Window
     roster_scroll.show
     roster_scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
     layout_mid.pack2(roster_scroll, true, true)
-    
+
     @roster = Gtk::ListStore.new(String)
     @roster.set_sort_column_id(0)
     roster_view = Gtk::TreeView.new(@roster)
@@ -196,7 +196,7 @@ class ChatWindow < Gtk::Window
 
     print_buffer "Welcome to the XMPP4R sample GTK2 Multi-User Chat client"
     print_buffer "Commands start with a slash, type \"/help\" for a list"
-    
+
     @client = Jabber::Client.new(jid)
     Jabber::Version::SimpleResponder.new(@client, "XMPP4R example: GtkMUCClient", Jabber::XMPP4R_VERSION, IO.popen("uname -sr").readlines.to_s.strip)
     Thread.new {

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

@@ -2,29 +2,29 @@
 
 # This script can be used to migrate from one jabber account to another
 
-$:.unshift '../lib'
+$:.unshift '../../../../../lib'
 
 require 'optparse'
 require 'xmpp4r'
 include Jabber
 
-jidfrom = JID::new('lucas@linux.ensimag.fr/JabberMigrate')
+jidfrom = JID.new('lucas@linux.ensimag.fr/JabberMigrate')
 pwfrom = 'z'
-jidto = JID::new('lucas@nussbaum.fr/JabberMigrate')
+jidto = JID.new('lucas@nussbaum.fr/JabberMigrate')
 pwto = 'z'
 
 BOTHOLD = "Hi, you are subscribed to my presence. I just changed my JID. The new one is #{jidto.strip}. You might want to update your roster. Thank you, and sorry for the inconvenience !"
 BOTHNEW = "Hi, you are subscribed to the presence of my previous JID : #{jidfrom.strip}. I just changed my JID, and this is the new one. You might want to update your roster. Thank you, and sorry for the inconvenience !"
 
-clfrom = Client::new(jidfrom, false)
+clfrom = Client.new(jidfrom)
 clfrom.connect
 clfrom.auth(pwfrom)
-clto = Client::new(jidto, false)
+clto = Client.new(jidto)
 clto.connect
 clto.auth(pwto)
-#clfrom.send(Presence::new)
-#clto.send(Presence::new)
-clfrom.send(Iq::new_rosterget)
+#clfrom.send(Presence.new)
+#clto.send(Presence.new)
+clfrom.send(Iq.new_rosterget)
 exit = false
 clfrom.add_iq_callback { |i|
   if i.type == :result and i.queryns == 'jabber:iq:roster'
@@ -47,35 +47,35 @@ clfrom.add_iq_callback { |i|
       when 'from'
         # il veut me voir, je veux pas le voir.
         # envoi unsubscribed
-        clfrom.send(Presence::new.set_to(jid).set_type(:unsubscribed))
+        clfrom.send(Presence.new.set_to(jid).set_type(:unsubscribed))
         # envoi message d'info OLD & NEW
-        clfrom.send(Message::new(jid, BOTHOLD).set_type(:chat))
-        clto.send(Message::new(jid, BOTHNEW).set_type(:chat))
+        clfrom.send(Message.new(jid, BOTHOLD).set_type(:chat))
+        clto.send(Message.new(jid, BOTHNEW).set_type(:chat))
       when 'to'
         # je veux le voir, il veut pas me voir
         # envoi unsubscribe
-        clfrom.send(Presence::new.set_to(jid).set_type(:unsubscribe))
+        clfrom.send(Presence.new.set_to(jid).set_type(:unsubscribe))
         # envoi subscribe avec message
-        pres = Presence::new.set_to(jid).set_type(:subscribe)
-        pres.add(Element::new('status').add_text("Hi, I was previously subscribed to your presence with my JID #{jidfrom.strip}. Can I re-subscribe to your presence ? Thank you."))
+        pres = Presence.new.set_to(jid).set_type(:subscribe)
+        pres.add(Element.new('status').add_text("Hi, I was previously subscribed to your presence with my JID #{jidfrom.strip}. Can I re-subscribe to your presence ? Thank you."))
         clto.send(pres)
       when 'both'
         # envoi unsubscribed
-        clfrom.send(Presence::new.set_to(jid).set_type(:unsubscribed))
+        clfrom.send(Presence.new.set_to(jid).set_type(:unsubscribed))
         # envoi unsubscribe
-        clfrom.send(Presence::new.set_to(jid).set_type(:unsubscribe))
+        clfrom.send(Presence.new.set_to(jid).set_type(:unsubscribe))
         # update roster
-        iq = Iq::new_rosterset
+        iq = Iq.new_rosterset
         e.delete_attribute('ask')
         e.delete_attribute('subscription')
         iq.query.add_element(e)
         clto.send(iq)
         # envoi message d'info OLD & NEW
-        clfrom.send(Message::new(jid, BOTHOLD).set_type(:chat))
-        pres = Presence::new.set_to(jid).set_type(:subscribe)
-        pres.add(Element::new('status').add_text("Hi, I was previously subscribed to your presence with my JID #{jidfrom.strip}. Can I re-subscribe to your presence ? Thank you."))
+        clfrom.send(Message.new(jid, BOTHOLD).set_type(:chat))
+        pres = Presence.new.set_to(jid).set_type(:subscribe)
+        pres.add(Element.new('status').add_text("Hi, I was previously subscribed to your presence with my JID #{jidfrom.strip}. Can I re-subscribe to your presence ? Thank you."))
         clto.send(pres)
-        clto.send(Message::new(jid, BOTHNEW).set_type(:chat))
+        clto.send(Message.new(jid, BOTHNEW).set_type(:chat))
       end
     end
   end
@@ -86,4 +86,3 @@ while not exit
 end
 clfrom.close
 clto.close
-

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

@@ -14,10 +14,10 @@ class Room
   class RoomException < Exception
     attr_reader :error
     def initialize(error, msg)
-      @error = Jabber::Error.new(error, msg)
+      @error = Jabber::ErrorResponse.new(error, msg)
     end
   end
-  
+
   def initialize(stream, name)
     @users = {}   # nick => jid
     @stream = stream
@@ -37,7 +37,7 @@ class Room
     msg.from = nil
     @users.each { |nick,jid|
       if jid == origin
-        msg.from = Jabber::JID::new(@name.node, @name.domain, nick)
+        msg.from = Jabber::JID.new(@name.node, @name.domain, nick)
       end
     }
     unless msg.from.nil?
@@ -49,7 +49,7 @@ class Room
 
   def handle_presence(pres)
     reason = nil
-    
+
     # Check if nick already registered
     @users.each { |nick,jid|
       if pres.from != jid && pres.to.resource == nick
@@ -71,12 +71,12 @@ class Room
       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)
+        userinfo.from = Jabber::JID.new(@name.node, @name.domain, nick)
         print " #{nick} (#{jid})"
         @stream.send(userinfo)
       }
       puts " Ok"
-      
+
       # Add the new user
       puts "Adding #{pres.from} as #{pres.to}"
       @users[pres.to.resource] = pres.from
@@ -97,7 +97,7 @@ class Room
         reason = "#{was_nick} has left #{@name.node}"
       end
     end
-    
+
     # Advertise users presence to all
     puts "Advertising user to all"
     x = Jabber::XMUCUserItem.new(:none, :participant, pres.from)
@@ -108,13 +108,13 @@ class Room
   end
 
   def send_message(body)
-    msg = Jabber::Message::new
-    msg.from = Jabber::JID::new(@name.node, @name.domain, "")
+    msg = Jabber::Message.new
+    msg.from = Jabber::JID.new(@name.node, @name.domain, "")
     msg.type = :groupchat
     msg.body = body
     broadcast(msg)
   end
-  
+
   def broadcast(stanza)
     x = stanza.class::import(stanza)
     @users.each { |nick,jid|
@@ -127,8 +127,8 @@ end
 class MUC
   def initialize(jid, secret, addr, port=5347)
     @rooms = {}
-    
-    @component = Jabber::Component::new(jid, addr, port)
+
+    @component = Jabber::Component.new(jid, addr, port)
     @component.connect
     @component.auth(secret)
 
@@ -168,7 +168,7 @@ class MUC
     elsif room.nil? && pres.type != :error
       pres.to, pres.from = pres.from, pres.to
       pres.type = :error
-      pres.add(Jabber::Error.new('item-not-found'))
+      pres.add(Jabber::ErrorResponse.new('item-not-found'))
       @component.send(pres)
       return(true)
     end
@@ -195,11 +195,11 @@ class MUC
     else
       msg.to, msg.from = msg.from, msg.to
       msg.type = :error
-      msg.add(Jabber::Error.new('item-not-found', 'The chatroom you are trying to reach is currently not available.'))
+      msg.add(Jabber::ErrorResponse.new('item-not-found', 'The chatroom you are trying to reach is currently not available.'))
       @component.send(msg)
     end
   end
-  
+
   def handle_disco_info(iq)
     if (iq.type == :get)
       iq.type = :result
@@ -210,7 +210,7 @@ class MUC
         room = @rooms[iq.to]
         if room.nil?
           iq.type = :error
-          iq.add_element(Jabber::Error.new('item-not-found'))
+          iq.add_element(Jabber::ErrorResponse.new('item-not-found'))
         else
           iq.query.add(Jabber::DiscoIdentity.new('conference', "#{iq.to.node} (#{room.num_users})", 'text'))
         end
@@ -223,7 +223,7 @@ class MUC
       }
     else
       iq.type = :error
-      iq.add_element(Jabber::Error.new('bad-request'))
+      iq.add_element(Jabber::ErrorResponse.new('bad-request'))
     end
     iq.to, iq.from = iq.from, iq.to
     @component.send(iq)
@@ -234,22 +234,22 @@ class MUC
       iq.type = :result
       if iq.to.node == nil
         @rooms.each { |name,room|
-          iq.query.add(Jabber::DiscoItem::new(Jabber::JID::new(name, @component.jid.domain), name))
+          iq.query.add(Jabber::DiscoItem.new(Jabber::JID.new(name, @component.jid.domain), name))
         }
       elsif iq.to.resource == nil
         room = @rooms[iq.to.strip]
         unless room.nil?
           room.each_user { |nick,jid|
-            iq.query.add(Jabber::DiscoItem::new(jid, nick))
+            iq.query.add(Jabber::DiscoItem.new(jid, nick))
           }
         else
           iq.type = :error
-          iq.add_element(Jabber::Error.new('item-not-found'))
+          iq.add_element(Jabber::ErrorResponse.new('item-not-found'))
         end
       end
     else
       iq.type = :error
-      iq.add_element(Jabber::Error.new('bad-request'))
+      iq.add_element(Jabber::ErrorResponse.new('bad-request'))
     end
     iq.to, iq.from = iq.from, iq.to
     @component.send(iq)
@@ -262,5 +262,5 @@ if ARGV.size != 3
   exit
 end
 
-muc = MUC::new(Jabber::JID::new(ARGV[0]), ARGV[1], ARGV[2])
+muc = MUC.new(Jabber::JID.new(ARGV[0]), ARGV[1], ARGV[2])
 Thread.stop