@@ -20,11 +20,11 @@ PKG_VERSION = '0.3.2' PKG_FILES = ['ChangeLog', 'README', 'COPYING', 'LICENSE', 'setup.rb', 'Rakefile', 'UPDATING'] Find.find('lib/', 'data/', 'test/', 'tools/') do |f| - if FileTest.directory?(f) and f =~ /\.svn/ - Find.prune - else - PKG_FILES << f - end + if FileTest.directory?(f) and f =~ /\.svn/ + Find.prune + else + PKG_FILES << f + end end @@ -33,8 +33,8 @@ end task :default => [:package] Rake::TestTask.new do |t| - t.libs << "test" - t.test_files = ['test/ts_xmpp4r.rb'] + t.libs << "test" + t.test_files = ['test/ts_xmpp4r.rb'] end Rake::RDocTask.new do |rd| @@ -61,42 +61,42 @@ Rake::RDocTask.new do |rd| end task :doctoweb => [:rdoc] do |t| - # copies the rdoc to the CVS repository for xmpp4r website - # repository is in $CVSDIR (default: ~/dev/xmpp4r-web) - sh "tools/doctoweb.bash" + # copies the rdoc to the CVS repository for xmpp4r website + # repository is in $CVSDIR (default: ~/dev/xmpp4r-web) + sh "tools/doctoweb.bash" end Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |p| - p.need_tar = true - p.package_files = PKG_FILES + p.need_tar = true + p.package_files = PKG_FILES end if RCOV - Rcov::RcovTask.new do |t| - t.test_files = ['test/ts_xmpp4r.rb'] - end + Rcov::RcovTask.new do |t| + t.test_files = ['test/ts_xmpp4r.rb'] + end end # "Gem" part of the Rakefile begin - require 'rake/gempackagetask' - - spec = Gem::Specification.new do |s| - s.platform = Gem::Platform::RUBY - s.summary = "Ruby library for Jabber Instant-Messaging" - s.name = PKG_NAME - s.version = PKG_VERSION - s.requirements << 'none' - s.require_path = 'lib' - s.autorequire = 'xmpp4r' - s.files = PKG_FILES - s.description = "Ruby library for Jabber Instant-Messaging" - s.has_rdoc = true - end - - Rake::GemPackageTask.new(spec) do |pkg| - pkg.need_zip = true - pkg.need_tar = true - end + require 'rake/gempackagetask' + + spec = Gem::Specification.new do |s| + s.platform = Gem::Platform::RUBY + s.summary = "Ruby library for Jabber Instant-Messaging" + s.name = PKG_NAME + s.version = PKG_VERSION + s.requirements << 'none' + s.require_path = 'lib' + s.autorequire = 'xmpp4r' + s.files = PKG_FILES + s.description = "Ruby library for Jabber Instant-Messaging" + s.has_rdoc = true + end + + Rake::GemPackageTask.new(spec) do |pkg| + pkg.need_zip = true + pkg.need_tar = true + end rescue LoadError end Rakefile @@ -54,4 +54,3 @@ RFC3920: Compliant server implementations MUST ensure in-order processing of XML stanzas between any two entities." - data/doc/xmpp4r/examples/advanced/adventure/README @@ -3,7 +3,7 @@ require 'world' class AdventureMUC def initialize(jid, secret, addr, port=5347) @worlds = {} - + @component = Jabber::Component::new(jid) @component.connect(addr, port) @component.auth(secret) @@ -54,7 +54,7 @@ class AdventureMUC false end end - + def handle_disco_info(iq) if iq.type != :get answer = iq.answer @@ -84,7 +84,7 @@ class AdventureMUC end @component.send(answer) end - + def handle_disco_items(iq) if iq.type != :get answer = iq.answer @@ -104,7 +104,7 @@ 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 data/doc/xmpp4r/examples/advanced/adventure/adventuremuc.rb @@ -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) @@ -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,7 +374,7 @@ class Player < Thing attributes['name'] = iname attributes['jid'] = jid.to_s end - + def jid attributes['jid'].nil? ? nil : Jabber::JID::new(attributes['jid']) end @@ -422,4 +422,3 @@ class Player < Thing end end end - data/doc/xmpp4r/examples/advanced/adventure/world.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/doc/xmpp4r/examples/advanced/fileserve.rb @@ -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/doc/xmpp4r/examples/advanced/getonline.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/doc/xmpp4r/examples/advanced/gtkmucclient.rb @@ -86,4 +86,3 @@ while not exit end clfrom.close clto.close - data/doc/xmpp4r/examples/advanced/migrate.rb @@ -17,7 +17,7 @@ class Room @error = Jabber::Error.new(error, msg) end end - + def initialize(stream, name) @users = {} # nick => jid @stream = stream @@ -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 @@ -76,7 +76,7 @@ class Room @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) @@ -114,7 +114,7 @@ class Room msg.body = body broadcast(msg) end - + def broadcast(stanza) x = stanza.class::import(stanza) @users.each { |nick,jid| @@ -127,7 +127,7 @@ end class MUC def initialize(jid, secret, addr, port=5347) @rooms = {} - + @component = Jabber::Component::new(jid, addr, port) @component.connect @component.auth(secret) @@ -199,7 +199,7 @@ class MUC @component.send(msg) end end - + def handle_disco_info(iq) if (iq.type == :get) iq.type = :result data/doc/xmpp4r/examples/advanced/minimuc.rb @@ -82,4 +82,3 @@ puts "Waiting." Thread.stop cl.close - data/doc/xmpp4r/examples/advanced/recvfile.rb @@ -84,11 +84,11 @@ cl.add_iq_callback { |iq| if iq.query.node.nil? # Make items from group names groups = [] - + roster.items.each { |jid,item| groups += item.groups } - + groups.uniq.each { |group| iq.query.add(Jabber::DiscoItem.new(cl.jid, group, group)) } @@ -127,4 +127,3 @@ loop do end cl.close - data/doc/xmpp4r/examples/advanced/rosterdiscovery.rb @@ -19,7 +19,7 @@ cl = Client::new(myjid) cl.connect cl.auth(mypassword) mainthread = Thread.current -sh = Shell::new { |str| +sh = Shell::new { |str| puts "-----RECEIVING-----\n#{str}" cl.send(Message::new(authjid, str)) } cl.add_message_callback do |m| data/doc/xmpp4r/examples/advanced/shellmgr/shellmgr_jabber.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby -w +#!/usr/bin/ruby -w require 'shellmgr' data/doc/xmpp4r/examples/advanced/shellmgr/shellmgr_test.rb @@ -112,7 +112,7 @@ end ## # Main loop ## - + require 'mprofiler' MemoryProfiler.start(:string_debug=>true) @@ -144,4 +144,3 @@ loop { sleep(interval) } - data/doc/xmpp4r/examples/advanced/xmpping.rb @@ -12,7 +12,7 @@ if ARGV.length != 2 exit 1 end myJID = JID::new(ARGV[0]) -myPassword = ARGV[1] +myPassword = ARGV[1] cl = Client::new(myJID) cl.connect cl.auth(myPassword) data/doc/xmpp4r/examples/basic/echo_threaded.rb @@ -63,6 +63,6 @@ STDIN.each_line { |l| cl.send(m) } while not exit do - cl.process(1) + cl.process(1) end cl.close data/doc/xmpp4r/examples/basic/mass_sender.rb @@ -10,4 +10,3 @@ muc.configure( 'muc#roomconfig_roomname' => 'roomname', 'muc#roomconfig_persistentroom' => 1 ) - data/doc/xmpp4r/examples/basic/muc_owner_config.rb @@ -23,7 +23,7 @@ if name.nil? puts " Sorry, but the queried MUC component doesn't seem to support MUC or Groupchat." else puts " #{name}" - + print "Querying #{muc_jid} for its rooms..."; $stdout.flush rooms = browser.muc_rooms(muc_jid) puts " #{rooms.size} rooms found" data/doc/xmpp4r/examples/basic/mucinfo.rb @@ -80,4 +80,3 @@ m.join(ARGV[2]) Thread.stop cl.close - data/doc/xmpp4r/examples/basic/mucsimplebot.rb @@ -61,13 +61,13 @@ roster.add_update_callback { |olditem,item| puts("Subscribing to #{item.jid}") item.subscribe end - + # Print the item - if olditem.nil? - # We didn't knew before: + if olditem.nil? + # We didn't knew before: puts("#{item.iname} (#{item.jid}, #{item.subscription}) #{item.groups.join(', ')}") - else - # Showing whats different: + else + # Showing whats different: puts("#{olditem.iname} (#{olditem.jid}, #{olditem.subscription}) #{olditem.groups.join(', ')} -> #{item.iname} (#{item.jid}, #{item.subscription}) #{item.groups.join(', ')}") end @@ -115,7 +115,7 @@ roster.add_presence_callback { |item,oldpres,pres| # ...so create it: oldpres = Jabber::Presence.new end - + # Print name and jid: name = "#{pres.from}" if item.iname @@ -169,4 +169,3 @@ cl.send(Jabber::Presence.new.set_show(:dnd).set_status('Watching my roster chang Thread.stop cl.close - data/doc/xmpp4r/examples/basic/rosterwatch.rb @@ -35,7 +35,7 @@ begin puts "Retrieving vCard information for #{cl.jid.strip}" vcard = vcard_helper.get - + # Inspect the command line for vCard fields to be changed ARGV.each { |arg| arg.scan(/^(.+?)=(.*)$/) { |field,text| @@ -65,4 +65,3 @@ rescue Exception => e end cl.close - data/doc/xmpp4r/examples/basic/send_vcard.rb @@ -27,7 +27,7 @@ cl = Jabber::Client.new(jid) cl.connect cl.auth(pw) -# Following XEP-0163 PEP we need to +# Following XEP-0163 PEP we need to # ensure we have a 'both' subscription to the Tune client roster = Jabber::Roster::Helper.new(cl) roster.add_subscription_request_callback do |item,pres| @@ -46,7 +46,7 @@ itunes=OSA.app('iTunes') loop do track = itunes.current_track - + if track puts "Now playing: #{track.name} by #{track.artist}" t.now_playing(Jabber::UserTune::Tune.new(track.artist, track.name)) data/doc/xmpp4r/examples/basic/tune_server.rb @@ -7,7 +7,7 @@ $:.unshift '../lib' require 'GD' require 'cgi' require 'digest/md5' - + require 'rexml/document' require 'xmpp4r' @@ -54,7 +54,7 @@ class BannerTable def last @lines[@lines.size - 1] end - + def add_line @lines.push(BannerLine.new) end @@ -68,10 +68,10 @@ class BannerTable end height += line.h end - + gd = GD::Image.new(width + 6, height + 6) white = gd.colorAllocate(255,255,255) - black = gd.colorAllocate(0,0,0) + black = gd.colorAllocate(0,0,0) gd.fill(0, 0, black) gd.interlace = true @@ -82,7 +82,7 @@ class BannerTable line.paint(gd, 3, y + (line.h / 2)) y += line.h end - + gd end end data/doc/xmpp4r/examples/buggy/miniedgarr_cgi.rb @@ -62,7 +62,7 @@ cl.add_presence_callback { |pres| roster_set_iq.add(Jabber::IqQueryRoster.new).add(Jabber::RosterItem.new(pres.from.strip)) cl.send(roster_set_iq) end - + presences[pres.from] = pres write_state(ARGV[2], roster, presences) } data/doc/xmpp4r/examples/buggy/miniedgarr_watch.rb @@ -101,7 +101,7 @@ module Jabber length = @length - @bytes_read # Truncate it! end end - + buf = @file.read(length) @bytes_read += buf.size if buf buf lib/xmpp4r/bytestreams/helper/filetransfer.rb @@ -151,7 +151,7 @@ module Jabber msg = Message.new msg.from = @my_jid msg.to = @peer_jid - + data = msg.add REXML::Element.new('data') data.add_namespace NS_IBB data.attributes['sid'] = @session_id @@ -169,7 +169,7 @@ module Jabber match_resource.attributes['condition'] = 'match-resource' match_resource.attributes['value'] = 'exact' match_resource.attributes['action'] = 'error' - + @stream.send(msg) @seq_send += 1 lib/xmpp4r/bytestreams/helper/ibb/base.rb @@ -31,4 +31,3 @@ module Jabber end end end - lib/xmpp4r/bytestreams/helper/ibb/initiator.rb @@ -45,4 +45,3 @@ module Jabber end end end - lib/xmpp4r/bytestreams/helper/ibb/target.rb @@ -26,7 +26,7 @@ module Jabber # # default: nil, use the OS' default timeout attr_accessor :connect_timeout - + def initialize(stream, session_id, initiator_jid, target_jid) @stream = stream @session_id = session_id lib/xmpp4r/bytestreams/helper/socks5bytestreams/base.rb @@ -45,7 +45,7 @@ module Jabber rescue Exception => e error = e end - + connect_sem.run true else @@ -60,4 +60,3 @@ module Jabber end end end - lib/xmpp4r/bytestreams/helper/socks5bytestreams/target.rb @@ -168,4 +168,3 @@ module Jabber end end end - lib/xmpp4r/bytestreams/iq/bytestreams.rb @@ -30,7 +30,7 @@ module Jabber # 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, @@ -107,7 +107,7 @@ module Jabber # The Callback's reference, using for deleting purposes attr_reader :ref - # The Callback's block to execute + # The Callback's block to execute attr_reader :block ## lib/xmpp4r/callbacks.rb @@ -14,7 +14,7 @@ module Jabber # See http://www.xmpp.org/extensions/xep-0115.html#protocol. # # You should not need to construct this element directly, see - # Jabber::Caps::Helper. + # Jabber::Caps::Helper. class C < XMPPElement name_xmlns 'c', NS_CAPS force_xmlns true @@ -36,7 +36,7 @@ module Jabber end ## - # Get the value of this element's 'node' attribute, + # Get the value of this element's 'node' attribute, # a 'unique identifier for the software underlying the entity' def node attributes['node'] lib/xmpp4r/caps/c.rb @@ -80,7 +80,7 @@ module Jabber end # 7.3. For each field: - + fields.each do |field| # 7.3.1. Append the value of the "var" attribute, followed by # the '<' character. lib/xmpp4r/caps/helper/generator.rb @@ -25,7 +25,7 @@ module Jabber ## # Construct a new Caps Helper. - # + # # This will send a <presence> message containing # a <c/> (Jabber::Caps::C) stanza to your server. # client:: [Jabber::Stream] @@ -48,7 +48,7 @@ module Jabber else false end - end + end p = Jabber::Presence.new() p.add(c) @@ -70,7 +70,7 @@ module Jabber caps_reply.query = Jabber::Discovery::IqQueryDiscoInfo.new @identities.each { |i| caps_reply.query.add(i) } @features.each { |f| caps_reply.query.add(f) } - + @stream.send(caps_reply) end lib/xmpp4r/caps/helper/helper.rb @@ -67,7 +67,7 @@ module Jabber end # Fallback to normal connect method end - + super(host.nil? ? jid.domain : host, port) self end @@ -190,7 +190,7 @@ module Jabber raise "AnonymousUnsupported" end end - + ## # Reports whether or not anonymous authentication is reported # by the client. @@ -309,5 +309,5 @@ module Jabber end } end - end + end end lib/xmpp4r/client.rb @@ -1,7 +1,7 @@ require 'xmpp4r/iq' module Jabber - + module Command ## lib/xmpp4r/command/iq/command.rb @@ -36,7 +36,7 @@ module Jabber @server_port = server_port end end - + # Connect to the server # (chaining-friendly) # server:: [String] Hostname @@ -81,7 +81,7 @@ module Jabber # Send auth with given secret and wait for result # # Throws AuthenticationFailure - # secret:: [String] the shared secret + # secret:: [String] the shared secret def auth(secret) hash = Digest::SHA1::hexdigest(@streamid.to_s + secret) authenticated = false @@ -99,5 +99,5 @@ module Jabber raise AuthenticationFailure.new, "Component authentication failed" end end - end + end end lib/xmpp4r/component.rb @@ -91,9 +91,9 @@ module Jabber each_element('instructions') do |xe| fields << xe end - fields + fields end - + ## # Add Data Form instructions # i:: [String] @@ -295,4 +295,3 @@ module Jabber end end end - lib/xmpp4r/dataforms/x/data.rb @@ -21,7 +21,7 @@ module Jabber def Jabber::debug @@debug end - + # Outputs a string only if debugging mode is enabled. If the string includes # several lines, 4 spaces are added at the begginning of each line but the # first one. Time is prepended to the string. lib/xmpp4r/debuglog.rb @@ -164,4 +164,3 @@ module Jabber end end end - lib/xmpp4r/discovery/helper/responder.rb @@ -192,7 +192,7 @@ module Jabber ## # Set the feature's var - # + # # This is a namespace the identity supports. # val:: [String] def var=(val) @@ -209,4 +209,3 @@ module Jabber end end end - lib/xmpp4r/discovery/iq/discoinfo.rb @@ -145,4 +145,3 @@ module Jabber end end end - lib/xmpp4r/discovery/iq/discoitems.rb @@ -55,7 +55,7 @@ module Jabber if errortype.nil? || errorcode.nil? raise("Unknown error condition when initializing Error") end - + super() set_error(errorcondition) set_type(errortype) @@ -155,7 +155,7 @@ module Jabber self.text = s self end - + ## # Get the type of error # (meaning how to proceed) lib/xmpp4r/error.rb @@ -30,7 +30,7 @@ module Jabber def generate_id @last_id += 1 timefrac = Time.new.to_f.to_s.split(/\./, 2).last[-3..-1] - + "#{@last_id}#{timefrac}" end end lib/xmpp4r/idgenerator.rb @@ -79,7 +79,7 @@ module Jabber ## # Returns the iq's query child, or nil # result:: [IqQuery] - def query + def query first_element('query') end lib/xmpp4r/iq.rb @@ -4,7 +4,7 @@ module Jabber ## - # The JID class represents a Jabber Identifier as described by + # The JID class represents a Jabber Identifier as described by # RFC3920 section 3.1. # # Note that you can use JIDs also for Sorting, Hash keys, ... lib/xmpp4r/jid.rb @@ -104,4 +104,3 @@ module Jabber end end end - lib/xmpp4r/muc/helper/mucbrowser.rb @@ -73,7 +73,7 @@ module Jabber if active? raise "MUCClient already active" end - + @jid = (jid.kind_of?(JID) ? jid : JID.new(jid)) activate @@ -183,7 +183,7 @@ module Jabber unless active? raise "MUCClient not active" end - + new_jid = JID.new(@jid.node, @jid.domain, new_nick) # Joining @@ -400,17 +400,17 @@ module Jabber get_room_configuration submit_room_configuration(options) end - - # :nodoc: + + # :nodoc: def get_room_configuration raise 'You are not the owner' unless owner? - + iq = Iq.new(:get, jid.strip) iq.from = my_jid iq.add(IqQueryMUCOwner.new) fields = [] - + @stream.send_with_id(iq) do |answer| raise "Configuration not possible for this room" unless answer.query && answer.query.x(Dataforms::XData) @@ -420,12 +420,12 @@ module Jabber end end end - + fields end - - # :nodoc: - def submit_room_configuration(options) + + # :nodoc: + def submit_room_configuration(options) # fill out the reply form iq = Iq.new(:set, jid.strip) iq.from = my_jid @@ -439,7 +439,7 @@ module Jabber form.add(field) end query.add(form) - iq.add(query) + iq.add(query) @stream.send_with_id(iq) end lib/xmpp4r/muc/helper/mucclient.rb @@ -102,7 +102,7 @@ module Jabber @subject = msg.subject @subject_block.call(time, sender_nick, @subject) if @subject_block end - + if msg.body if sender_nick.nil? @room_message_block.call(time, msg.body) if @room_message_block lib/xmpp4r/muc/helper/simplemucclient.rb @@ -8,7 +8,7 @@ module Jabber module MUC class IqQueryMUCAdmin < IqQuery name_xmlns 'query', 'http://jabber.org/protocol/muc#admin' - + include XParent def items lib/xmpp4r/muc/iq/mucadmin.rb @@ -18,4 +18,3 @@ module Jabber end end end - lib/xmpp4r/muc/iq/mucadminitem.rb @@ -8,7 +8,7 @@ module Jabber module MUC class IqQueryMUCOwner < IqQuery name_xmlns 'query', 'http://jabber.org/protocol/muc#owner' - + include XParent end end lib/xmpp4r/muc/iq/mucowner.rb @@ -60,7 +60,7 @@ module Jabber self.nick = n self end - + def role case attributes['role'] when 'moderator' then :moderator @@ -141,4 +141,3 @@ module Jabber end end end - lib/xmpp4r/muc/item.rb @@ -34,4 +34,3 @@ module Jabber end end end - lib/xmpp4r/muc/x/mucuseritem.rb @@ -7,7 +7,7 @@ require 'xmpp4r/x' module Jabber ## - # The presence class is used to construct presence messages to + # The presence class is used to construct presence messages to # send to the Jabber service. class Presence < XMPPStanza name_xmlns 'presence', 'jabber:client' lib/xmpp4r/presence.rb @@ -82,8 +82,8 @@ module Jabber def items(jid,node) iq = Iq.new(:get,jid) iq.from = @stream.jid - discoitems = Discovery::IqQueryDiscoItems.new - discoitems.node = node + discoitems = Discovery::IqQueryDiscoItems.new + discoitems.node = node iq.add(discoitems) items = [] err = nil @@ -109,52 +109,50 @@ module Jabber # node:: [String] # return:: [Hash] with possible keys type:: [String] ,category:: [String],features:: [Array] of feature, nodeinformation:: [Jabber::XData] # check http://www.xmpp.org/extensions/xep-0060.html#entity for more infos - - + + def get_info(jid,node) iq = Iq.new(:get,jid) - iq.from = @stream.jid - discoinfo = Discovery::IqQueryDiscoInfo.new - discoinfo.node = node - iq.add(discoinfo) - info = {} - @stream.send_with_id(iq) { |answer| - if answer.type == :result - - identity = answer.query.identity - info['type'] = identity.type - info['category'] = identity.category - - info['features'] = answer.query.features - - answer.query.each_element('x') { |x| - info['nodeinformation'] = x - } - end - } - return info + iq.from = @stream.jid + discoinfo = Discovery::IqQueryDiscoInfo.new + discoinfo.node = node + iq.add(discoinfo) + info = {} + @stream.send_with_id(iq) { |answer| + if answer.type == :result + identity = answer.query.identity + info['type'] = identity.type + info['category'] = identity.category + info['features'] = answer.query.features + + answer.query.each_element('x') { |x| + info['nodeinformation'] = x + } + end + } + return info end # this is only for a xep <-> nodebrowser.rb understanding alias get_metadata get_info - + ## # get type of node # jid:: [Jabber::JID] # node:: [String] - # + # def type(jid,node) info = get_info(jid,node) - return info['type'] + return info['type'] end - + ## # get category of node # jid:: [Jabber::JID] # node:: [String] - # + # def category(jid,node) info = get_info(jid,node) - return info['category'] + return info['category'] end end #class lib/xmpp4r/pubsub/helper/nodebrowser.rb @@ -5,7 +5,7 @@ # For a documentation of the retunvalues please look into the # documentation of [Jabber::PubSub::ServiceHelper] # This class is only a wrapper around [Jabber::PubSub::ServiceHelper] -# +# require 'xmpp4r/pubsub/helper/servicehelper' @@ -20,7 +20,7 @@ module Jabber attr_reader :jiod attr_reader :my_subscriptions ## - # creates a new node + # creates a new node # new(client,service,nodename) # stream:: [Jabber::Stream] # jid:: [String] (jid of the pubsub service) @@ -28,18 +28,18 @@ module Jabber def initialize(stream,jid,nodename = nil,create_if_not_exist = true) super(stream,jid) @nodename = nodename - @jid = jid - @stream = stream - - if create_if_not_exist and not node_exist? - # if no nodename is given a instant node will created - # (if the service supports instant nodes) - @nodename = create_node - else - get_subscriptions - end - end - + @jid = jid + @stream = stream + + if create_if_not_exist and not node_exist? + # if no nodename is given a instant node will created + # (if the service supports instant nodes) + @nodename = create_node + else + get_subscriptions + end + end + ## # creates the node # create(configuration=nil) @@ -47,11 +47,11 @@ module Jabber def create_node(configuration = nil) if ! node_exist? create(@nodename,configuration) - else - false - end + else + false + end end - + ## # get the configuration of the node # get_configuration(configuration=nil) @@ -59,7 +59,7 @@ module Jabber def get_configuration(subid = nil) get_options(@nodename,subid) end - + ## # set the configuration of the node # set_configuration(configuration=nil) @@ -77,7 +77,7 @@ module Jabber end ## - # publishing content on this node + # publishing content on this node # publish_content(items) # items:: [REXML::Element] def publish_content(items) @@ -85,14 +85,14 @@ module Jabber end ## - # gets all items from the node + # gets all items from the node # get_all_items def get_all_items items(@nodename) end ## - # get a count of items + # get a count of items # get_items(count) # count:: [Fixnum] def get_items(count) @@ -125,7 +125,7 @@ module Jabber # do_subscribe def do_subscribe subscribe(@nodename) - get_subscriptions + get_subscriptions end ## @@ -135,16 +135,16 @@ module Jabber def do_unsubscribe(subid) unsubscribe(@nodename,subid) end - + ## # purge all items from this node # purge_items def purge_items purge(@nodename) end - + private - + def node_exist? nodebrowser = PubSub::NodeBrowser.new(@stream) nodebrowser.nodes(@jid).include?(@nodename) lib/xmpp4r/pubsub/helper/nodehelper.rb @@ -2,18 +2,18 @@ # License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option. # Website::http://home.gna.org/xmpp4r/ # -# It's recommented to read the XEP-0066 before you use this Helper. (Maybe its +# It's recommented to read the XEP-0066 before you use this Helper. (Maybe its # better not use the helper for now ) ;) # The whole code is buggy - you have been warned! -# -# Maybe the following structure is good +# +# Maybe the following structure is good # ( taken form the xep-0060 ) # # entity usecases # retrieve all suscriptions # retrieve all affiliations # NOTE: the disco stuff will done by the nodebrowserhelper -# subscriber usecases +# subscriber usecases # subscribe # unsubscribe # configure subscription options @@ -29,14 +29,14 @@ # purge all node items # manage subscription requests # process pending subscriptions -# manage subscriptions +# manage subscriptions # manage affiliations -# +# # collection nodes -# -# If someone want to implement something i think its better to do this in +# +# If someone want to implement something i think its better to do this in # this order because everyone who reads the xep-0060 do know where to search in the file -# +# require 'xmpp4r/pubsub/iq/pubsub' require 'xmpp4r/pubsub/stanzas/event' require 'xmpp4r/pubsub/stanzas/item' @@ -63,7 +63,7 @@ module Jabber handle_message(message) } end - + ## # get all subscriptions on a pubsub component # return:: [Hash] of [PubSub::Subscription] @@ -75,8 +75,8 @@ module Jabber if reply.pubsub.first_element('subscriptions') res = [] reply.pubsub.first_element('subscriptions').each_element('subscription') { |subscription| - res << Jabber::PubSub::Subscription.import(subscription) - } + res << Jabber::PubSub::Subscription.import(subscription) + } end true } @@ -113,26 +113,23 @@ module Jabber # return:: true def unsubscribe_from(node,subid=nil) iq = basic_pubsub_query(:set) - unsub = PubSub::Unsubscribe.new - unsub.node = node - unsub.jid = @stream.jid.strip + unsub = PubSub::Unsubscribe.new + unsub.node = node + unsub.jid = @stream.jid.strip iq.pubsub.add(unsub) ret = false - @stream.send_with_id(iq) { |reply| - + @stream.send_with_id(iq) { |reply| + unsubscribe = PubSub::Unsubscribe.import(reply.pubsub.first_element('unsubscribe')) - if unsubscribe.jid == @stream.jid.strip && unsubscribe.node == node + if unsubscribe.jid == @stream.jid.strip && unsubscribe.node == node ret = true end - true + true } # @stream.send_with_id(iq) ret end - - - - - + + ## # gets all items from a pubsub node # node:: [String] @@ -163,14 +160,14 @@ module Jabber # node:: [String] # item:: [Jabber::PubSub::Item] # return:: true - # it automaticly generates a id for the item + # it automaticly generates a id for the item def publish_item_to(node,item) iq = basic_pubsub_query(:set) - publish = iq.pubsub.add(REXML::Element.new('publish')) + publish = iq.pubsub.add(REXML::Element.new('publish')) publish.attributes['node'] = node - + if item.kind_of?(Jabber::PubSub::Item) - item.id = Jabber::IdGenerator.generate_id + item.id = Jabber::IdGenerator.generate_id publish.add(item) @stream.send_with_id(iq) { |reply| true } end @@ -185,7 +182,7 @@ module Jabber iq = basic_pubsub_query(:set) publish = iq.pubsub.add(REXML::Element.new('publish')) publish.attributes['node'] = node - + if item.kind_of?(REXML::Element) xmlitem = Jabber::PubSub::Item.new xmlitem.id = id @@ -203,10 +200,10 @@ module Jabber # return:: true def purge_items_from(node) iq = basic_pubsub_query(:set) - purge = REXML::Element.new('purge') - purge.attributes['node'] = node - iq.pubsub.add(purge) - @stream.send_with_id(iq) { |reply| true } + purge = REXML::Element.new('purge') + purge.attributes['node'] = node + iq.pubsub.add(purge) + @stream.send_with_id(iq) { |reply| true } end ## @@ -257,7 +254,7 @@ module Jabber def get_affiliations(node = nil) iq = basic_pubsub_query(:get) affiliations = iq.pubsub.add(REXML::Element.new('affiliations')) - affiliations.attributes['node'] = node + affiliations.attributes['node'] = node res = nil @stream.send_with_id(iq) { |reply| if reply.pubsub.first_element('affiliations') @@ -291,11 +288,11 @@ module Jabber @stream.send_with_id(iq) { |reply| if reply.pubsub.first_element('subscriptions') res = [] - if reply.pubsub.first_element('subscriptions').attributes['node'] == node + if reply.pubsub.first_element('subscriptions').attributes['node'] == node reply.pubsub.first_element('subscriptions').each_element('subscription') { |subscription| - res << PubSub::Subscription.import(subscription) - } - end + res << PubSub::Subscription.import(subscription) + } + end end true } @@ -309,7 +306,7 @@ module Jabber def get_subscribers_from(node) res = [] get_subscriptions_from(node).each { |sub| - + res << sub.jid } res @@ -331,9 +328,9 @@ module Jabber ret = nil @stream.send_with_id(iq) { |reply| reply.pubsub.options.first_element('x') { |xdata| - + ret = xdata if xdata.kind_of?(Jabber::XData) - + } true } @@ -345,7 +342,7 @@ module Jabber # node:: [String] # options:: [Jabber::XData] # subid:: [String] or nil - # return:: true + # return:: true def set_options_for(node,options,subid=nil) iq = basic_pubsub_query(:set) opt = REXML::Element.new('options') @@ -356,7 +353,7 @@ module Jabber iq.pubsub.options.add(options) @stream.send_with_id(iq) { |reply| true } end - + ## # String representation @@ -380,13 +377,13 @@ module Jabber # type:: [Symbol] def basic_pubsub_query(type,ownerusecase = false) iq = Jabber::Iq::new(type,@pubsubjid) - if ownerusecase - iq.add(IqPubSubOwner.new) - else + if ownerusecase + iq.add(IqPubSubOwner.new) + else iq.add(IqPubSub.new) - end + end iq.from = @stream.jid.strip - iq + iq end ## lib/xmpp4r/pubsub/helper/servicehelper.rb @@ -14,6 +14,6 @@ module Jabber class IqPubSubOwner < XMPPElement name_xmlns 'pubsub', NS_PUBSUB + '#owner' force_xmlns true - end + end end end lib/xmpp4r/pubsub/iq/pubsub.rb @@ -13,7 +13,7 @@ module Jabber class Event < XMPPElement name_xmlns 'event', NS_PUBSUB + '#event' force_xmlns true - + ## # return payload def payload @@ -26,23 +26,23 @@ module Jabber def payload=(pl) add_element = pl end - + ## # return the payload type def event_type? # each child of event - # this should interate only one time + # this should interate only one time each_element('./event/*') { |plelement| - case plelement.name - when 'collection' then return :collection - when 'configuration' then return :configuration - when 'delete' then return :delete - when 'items' then return :items - when 'purge' then return :purge - when 'subscription' then return :subscription - else return nil - end - } + case plelement.name + when 'collection' then return :collection + when 'configuration' then return :configuration + when 'delete' then return :delete + when 'items' then return :items + when 'purge' then return :purge + when 'subscription' then return :subscription + else return nil + end + } end end end lib/xmpp4r/pubsub/stanzas/event.rb @@ -11,7 +11,7 @@ module Jabber # a collection of Items class Items < XMPPElement name_xmlns 'items', NS_PUBSUB - + def node attributes['node'] end lib/xmpp4r/pubsub/stanzas/items.rb @@ -9,11 +9,11 @@ module Jabber ## # Publish - # + # # A <publish> XMPP element, see example 1 in # http://www.xmpp.org/extensions/xep-0060.html#intro-howitworks class Publish < XMPPElement - name_xmlns 'publish', NS_PUBSUB + name_xmlns 'publish', NS_PUBSUB ## # return the node for this publication def node lib/xmpp4r/pubsub/stanzas/publish.rb @@ -13,9 +13,9 @@ module Jabber def initialize(myjid=nil,mynode=nil,mysubid=nil,mysubscription=nil) super() jid = myjid - node = mynode - subid = mysubid - state = mysubscription + node = mynode + subid = mysubid + state = mysubscription end def jid (a = attribute('jid')).nil? ? a : JID::new(a.value) @@ -23,22 +23,22 @@ module Jabber def jid=(myjid) add_attribute('jid', myjid ? myjid.to_s : nil) end - + def node attributes['node'] end def node=(mynode) attributes['node'] = mynode end - + def subid attributes['subid'] end def subid=(mysubid) attributes['subid'] = mysubid end - - def state + + def state # each child of event # this should interate only one time case attributes['subscription'] lib/xmpp4r/pubsub/stanzas/subscription.rb @@ -13,30 +13,30 @@ module Jabber def initialize(myjid=nil,mynode=nil) super() jid = myjid - node = mynode + node = mynode end - + ## # shows the jid # return:: [String] def jid (a = attribute('jid')).nil? ? a : JID::new(a.value) end - + ## # sets the jid # =:: [Jabber::JID] or [String] def jid=(myjid) add_attribute('jid', myjid ? myjid.to_s : nil) end - + ## # shows the node # return:: [String] def node attributes['node'] end - + ## # sets the node # =:: [String] lib/xmpp4r/pubsub/stanzas/unsubscribe.rb @@ -143,4 +143,3 @@ end # Restore the old $VERBOSE setting $VERBOSE = oldverbose - lib/xmpp4r/rexmladdons.rb @@ -5,4 +5,3 @@ require 'xmpp4r/roster/iq/roster.rb' require 'xmpp4r/roster/helper/roster.rb' require 'xmpp4r/roster/x/roster.rb' - lib/xmpp4r/roster.rb @@ -182,7 +182,7 @@ module Jabber @roster_wait.run @query_cbs.process(iq) end - + ## # Handle received <tt><presence/></tt> stanzas, # used internally @@ -257,7 +257,7 @@ module Jabber ## # Returns the list of RosterItems which, stripped, are equal to the - # one you are looking for. + # one you are looking for. def find(jid) jid = JID.new(jid) unless jid.kind_of? JID @@ -388,7 +388,7 @@ module Jabber request.query.add(self) @stream.send(request) end - + ## # Remove item # @@ -416,7 +416,7 @@ module Jabber }.size > 0 } end - + ## # Iterate through all received <tt><presence/></tt> stanzas def each_presence(&block) @@ -425,7 +425,7 @@ module Jabber yield(pres) } end - + ## # Get specific presence # jid:: [JID] Full JID @@ -517,4 +517,3 @@ module Jabber end #Class Roster end #Module Roster end #Module Jabber - lib/xmpp4r/roster/helper/roster.rb @@ -20,7 +20,7 @@ module Jabber # This <query/> contains multiple <item/> children. See RosterItem. class IqQueryRoster < IqQuery name_xmlns 'query', 'jabber:iq:roster' - + ## # Iterate through all items # &block:: Yield for every [RosterItem] @@ -30,7 +30,7 @@ module Jabber yield(item) if item.kind_of?(RosterItem) } end - + ## # Get roster item by JID # jid:: [JID] or [Nil] @@ -41,7 +41,7 @@ module Jabber } nil end - + ## # Get all items # result:: [Array] of [RosterItem] @@ -52,7 +52,7 @@ module Jabber } a end - + ## # Update roster by <iq/> stanza # (to be fed by an iq_callback) @@ -62,10 +62,10 @@ module Jabber if filter && (((iq.type != :set) && (iq.type != :result)) || (iq.queryns != 'jabber:iq:roster')) return end - + import(iq.query) end - + ## # Output for "p" # @@ -76,7 +76,7 @@ module Jabber jids.join(', ') end end - + ## # Class containing the <item/> elements of the roster # @@ -99,7 +99,7 @@ module Jabber self.subscription = subscription self.ask = ask end - + ## # Get name of roster item # @@ -108,14 +108,14 @@ module Jabber def iname attributes['name'] end - + ## # Set name of roster item # val:: [String] Name for this item def iname=(val) attributes['name'] = val end - + ## # Get JID of roster item # Resource of the JID will _not_ be stripped @@ -123,14 +123,14 @@ module Jabber def jid (a = attributes['jid']) ? JID::new(a) : nil end - + ## # Set JID of roster item # val:: [JID] or nil def jid=(val) attributes['jid'] = val.nil? ? nil : val.to_s end - + ## # Get subscription type of roster item # result:: [Symbol] or [Nil] The following values are valid according to RFC3921: @@ -149,7 +149,7 @@ module Jabber else nil end end - + ## # Set subscription type of roster item # val:: [Symbol] or [Nil] See subscription for possible Symbols @@ -163,7 +163,7 @@ module Jabber else attributes['subscription'] = nil end end - + ## # Get if asking for subscription # result:: [Symbol] nil or :subscribe @@ -173,7 +173,7 @@ module Jabber else nil end end - + ## # Set if asking for subscription # val:: [Symbol] nil or :subscribe @@ -183,7 +183,7 @@ module Jabber else attributes['ask'] = nil end end - + ## # Get groups the item belongs to # result:: [Array] of [String] The groups @@ -194,7 +194,7 @@ module Jabber } result.uniq end - + ## # Set groups the item belongs to, # deletes old groups first. @@ -204,7 +204,7 @@ module Jabber def groups=(ary) # Delete old group elements delete_elements('group') - + # Add new group elements ary.uniq.each { |group| add_element('group').text = group lib/xmpp4r/roster/iq/roster.rb @@ -23,7 +23,7 @@ module Jabber class RosterX < XRoster name_xmlns 'x', 'http://jabber.org/protocol/rosterx' end - + ## # Class containing an <item/> element # @@ -46,7 +46,7 @@ module Jabber self.jid = jid self.iname = iname end - + ## # Get name of roster item # @@ -55,14 +55,14 @@ module Jabber def iname attributes['name'] end - + ## # Set name of roster item # val:: [String] Name for this item def iname=(val) attributes['name'] = val end - + ## # Get JID of roster item # Resource of the JID will _not_ be stripped @@ -70,14 +70,14 @@ module Jabber def jid JID::new(attributes['jid']) end - + ## # Set JID of roster item # val:: [JID] or nil def jid=(val) attributes['jid'] = val.nil? ? nil : val.to_s end - + ## # Get action for this roster item # * :add @@ -91,7 +91,7 @@ module Jabber else :add end end - + ## # Set action for this roster item # (see action) @@ -113,7 +113,7 @@ module Jabber } result end - + ## # Set groups the item belongs to, # deletes old groups first. @@ -123,7 +123,7 @@ module Jabber def groups=(ary) # Delete old group elements delete_elements('group') - + # Add new group elements ary.uniq.each { |group| add_element('group').text = group lib/xmpp4r/roster/x/roster.rb @@ -32,9 +32,9 @@ module Jabber @parser = nil @create = XMLRPC::Create.new end - + ## - # automaticly trys to find a method + # automatically trys to find a method # thanx to eric cestari :) def method_missing(methodname, *args) send("call", methodname,*args) @@ -99,12 +99,12 @@ module Jabber def gen_multicall(methods=[]) ok, params = call2("system.multicall", - methods.collect { |m| - { - 'methodName' => m[0], - 'params' => m[1..-1] - } - } + methods.collect { |m| + { + 'methodName' => m[0], + 'params' => m[1..-1] + } + } ) if ok @@ -124,4 +124,3 @@ module Jabber end end # Helpers end # Jabber - lib/xmpp4r/rpc/helper/client.rb @@ -72,4 +72,3 @@ module Jabber end # RPCServer end # Helpers end # Jabber - lib/xmpp4r/rpc/helper/server.rb @@ -21,4 +21,3 @@ module Jabber end end end - lib/xmpp4r/rpc/iq/rpc.rb @@ -65,13 +65,13 @@ module Jabber end true } - + raise error if error end end - + ## - # SASL Anonymous authentication helper + # SASL Anonymous authentication helper class Anonymous < Base ## # Authenticate by sending nothing with the ANONYMOUS token @@ -84,7 +84,7 @@ module Jabber end true } - + raise error if error end end @@ -196,7 +196,7 @@ module Jabber end true } - + return if success_already raise error if error @@ -209,7 +209,7 @@ module Jabber end true } - + raise error if error end @@ -221,7 +221,7 @@ module Jabber ## # Function from RFC2831 def hh(s); Digest::MD5.hexdigest(s); end - + ## # Calculate the value for the response field def response_value(username, realm, digest_uri, passwd, nonce, cnonce, qop) lib/xmpp4r/sasl.rb @@ -109,7 +109,7 @@ module Jabber end ## - # Mounts a block to handle exceptions if they occur during the + # Mounts a block to handle exceptions if they occur during the # poll send. This will likely be the first indication that # the socket dropped in a Jabber Session. # @@ -174,7 +174,7 @@ module Jabber end ## - # Processes a received REXML::Element and executes + # Processes a received REXML::Element and executes # registered thread blocks and filters against it. # # element:: [REXML::Element] The received element @@ -201,7 +201,7 @@ module Jabber unless element.attributes['version'] # isn't XMPP compliant, so Jabber::debuglog("FEATURES: server not XMPP compliant, will not wait for features") - @features_sem.run # don't wait for <stream:features/> + @features_sem.run # don't wait for <stream:features/> end when 'features' stanza = element @@ -406,9 +406,9 @@ module Jabber ## # Adds a callback block to process received XML messages - # + # # priority:: [Integer] The callback's priority, the higher, the sooner - # ref:: [String] The callback's reference + # ref:: [String] The callback's reference # &block:: [Block] The optional block def add_xml_callback(priority = 0, ref = nil, &block) @xmlcbs.add(priority, ref, block) @@ -424,9 +424,9 @@ module Jabber ## # Adds a callback block to process received Messages - # + # # priority:: [Integer] The callback's priority, the higher, the sooner - # ref:: [String] The callback's reference + # ref:: [String] The callback's reference # &block:: [Block] The optional block def add_message_callback(priority = 0, ref = nil, &block) @messagecbs.add(priority, ref, block) @@ -442,9 +442,9 @@ module Jabber ## # Adds a callback block to process received Stanzas - # + # # priority:: [Integer] The callback's priority, the higher, the sooner - # ref:: [String] The callback's reference + # ref:: [String] The callback's reference # &block:: [Block] The optional block def add_stanza_callback(priority = 0, ref = nil, &block) @stanzacbs.add(priority, ref, block) @@ -457,12 +457,12 @@ module Jabber def delete_stanza_callback(ref) @stanzacbs.delete(ref) end - + ## - # Adds a callback block to process received Presences - # + # Adds a callback block to process received Presences + # # priority:: [Integer] The callback's priority, the higher, the sooner - # ref:: [String] The callback's reference + # ref:: [String] The callback's reference # &block:: [Block] The optional block def add_presence_callback(priority = 0, ref = nil, &block) @presencecbs.add(priority, ref, block) @@ -475,12 +475,12 @@ module Jabber def delete_presence_callback(ref) @presencecbs.delete(ref) end - + ## # Adds a callback block to process received Iqs - # + # # priority:: [Integer] The callback's priority, the higher, the sooner - # ref:: [String] The callback's reference + # ref:: [String] The callback's reference # &block:: [Block] The optional block def add_iq_callback(priority = 0, ref = nil, &block) @iqcbs.add(priority, ref, block) lib/xmpp4r/stream.rb @@ -36,7 +36,7 @@ module Jabber def parse @started = false begin - parser = REXML::Parsers::SAX2Parser.new @stream + parser = REXML::Parsers::SAX2Parser.new @stream parser.listen( :start_element ) do |uri, localname, qname, attributes| e = REXML::Element::new(qname) lib/xmpp4r/streamparser.rb @@ -11,7 +11,7 @@ module Jabber ## # A Helper for XEP-0118 User Tune # - # Use this helper to send user tunes, or receive them from a + # Use this helper to send user tunes, or receive them from a # specified jid. Described at http://www.xmpp.org/extensions/xep-0118.html # # For example: @@ -31,7 +31,7 @@ module Jabber def now_playing(track) item = Jabber::PubSub::Item.new() item.add(track) - + publish_item_to(NS_USERTUNE, item) end lib/xmpp4r/tune/helper/helper.rb @@ -8,7 +8,7 @@ require 'rexml/element' module Jabber module UserTune NS_USERTUNE = 'http://jabber.org/protocol/tune' - + ## # The <tune> XMPP element, as defined in XEP-0118 User Tune # @@ -29,9 +29,9 @@ module Jabber # # Supply no arguments to make an # empty element to indicate that tune playing has stopped. - # - # artist:: [String] the artist or performer of the song or piece - # title:: [String] the title of the song or piece + # + # artist:: [String] the artist or performer of the song or piece + # title:: [String] the title of the song or piece # length:: [Fixnum] the duration of the song or piece in seconds # track:: [String] a unique identifier for the tune; e.g., the track number within a collection or the specific URI for the object (e.g., a stream or audio file) # source:: [String] the collection (e.g., album) or other source (e.g., a band website that hosts streams or audio files) @@ -39,9 +39,9 @@ module Jabber # rating:: [Numeric] a number indicating how much you like this song - will be clamped into an integer 0 <= x <= 10 def initialize(artist = nil, title = nil, length = nil, track = nil, source = nil, uri = nil, rating = nil) super() - + add_element(REXML::Element.new('artist')).text = artist if artist - + add_element(REXML::Element.new('title')).text = title if title add_element(REXML::Element.new('length')).text = length.to_s if length @@ -72,9 +72,9 @@ module Jabber def artist first_element('artist').text if first_element('artist') end - + ## - # Get the title of this tune. + # Get the title of this tune. def title first_element('title').text if first_element('title') end @@ -102,7 +102,7 @@ module Jabber def uri first_element('uri').text if first_element('uri') end - + ## # Get the rating for this track def rating lib/xmpp4r/tune/tune.rb @@ -4,4 +4,3 @@ require 'xmpp4r/vcard/helper/vcard.rb' require 'xmpp4r/vcard/iq/vcard.rb' - lib/xmpp4r/vcard.rb @@ -83,4 +83,3 @@ module Jabber end end end - lib/xmpp4r/vcard/helper/vcard.rb @@ -103,4 +103,3 @@ module Jabber end end end - lib/xmpp4r/version/iq/version.rb @@ -25,7 +25,7 @@ module Jabber if wanted_xmlns.kind_of? Class and wanted_xmlns.ancestors.include? XMPPElement wanted_xmlns = wanted_xmlns.new.namespace end - + each_element('x') { |x| if wanted_xmlns.nil? or wanted_xmlns == x.namespace return x lib/xmpp4r/x.rb @@ -660,7 +660,7 @@ module FileOperations def ruby(*args) command config('rubyprog'), *args end - + def make(task = nil) command(*[config('makeprog'), task].compact) end @@ -723,7 +723,7 @@ module HookScriptAPI def srcdirectory?(path) File.dir?(srcfile(path)) end - + def srcfile?(path) File.file?(srcfile(path)) end @@ -827,7 +827,7 @@ class ToplevelInstaller __send__ "exec_#{task}" end end - + def run_metaconfigs @config.load_script "#{@ardir}/metaconfig" end @@ -1405,7 +1405,7 @@ class Installer end # picked up many entries from cvs-1.11.1/src/ignore.c - JUNK_FILES = %w( + JUNK_FILES = %w( core RCSLOG tags TAGS .make.state .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb *~ *.old *.bak *.BAK *.orig *.rej _$* *$ setup.rb @@ -69,7 +69,7 @@ class IBBTest < Test::Unit::TestCase assert_equal(buffer, received) end - + def test_ibb_pingpong ignored_stanzas = 0 wait = Semaphore.new test/bytestreams/tc_ibb.rb @@ -30,7 +30,7 @@ class SOCKS5BytestreamsTest < Test::Unit::TestCase buf1 = create_buffer(8192) buf2 = create_buffer(8192) - Thread.new do + Thread.new do target1.accept target1.write(buf1) target1.flush @@ -99,5 +99,5 @@ class SOCKS5BytestreamsTest < Test::Unit::TestCase initiator.close end - + end test/bytestreams/tc_socks5bytestreams.rb @@ -22,7 +22,7 @@ class Caps::HelperTest < Test::Unit::TestCase assert_kind_of(Jabber::Presence, presence) c = presence.first_element('c') assert_kind_of(Jabber::Caps::C, c) - + # see http://www.xmpp.org/extensions/xep-0115.html#ver assert_equal('SrFo9ar2CCk2EnOH4q4QANeuxLQ=', c.ver) @@ -30,14 +30,14 @@ class Caps::HelperTest < Test::Unit::TestCase assert_equal('sha-1', c.hash) assert_equal("http://home.gna.org/xmpp4r/##{Jabber::XMPP4R_VERSION}", c.node) - + send(iq_discovering_capabilities) } # Construct Caps::Helper which will send a <presence> # stanza (with embedded <c/> advert) to the 'server' h = Caps::Helper.new(@client, identities, features) - + # The 'server' will receive the <presence> stanza and # yield it to the 'state' block above, where an <iq> query # will be sent back to the 'client,' to discover its capabilities. @@ -47,7 +47,7 @@ class Caps::HelperTest < Test::Unit::TestCase # The Caps::Helper will process the <iq> query from the 'server' # and reply with an <iq> result providing the details of its # identities and features. - + state { |iq| assert_kind_of(Jabber::Iq, iq) assert_equal(:result, iq.type) @@ -72,10 +72,10 @@ class Caps::HelperTest < Test::Unit::TestCase def test_custom_node client_id='http://new-big-computer.local/client#321' - + state { |presence| c = presence.first_element('c') - assert_kind_of(Jabber::Caps::C, c) + assert_kind_of(Jabber::Caps::C, c) assert_equal(client_id, c.node) assert_equal('SrFo9ar2CCk2EnOH4q4QANeuxLQ=', c.ver) } test/caps/tc_helper.rb @@ -55,7 +55,7 @@ module Jabber clientsock = TCPSocket.new('localhost', @@SOCKET_PORT) clientsock.sync = true @client = Stream.new(true) -#=begin +#=begin class << @client def jid begin @@ -69,7 +69,7 @@ module Jabber #=end @client.start(clientsock) @client.send(stream) { |reply| true } - + @state = 0 @states = [] @state_wait = Semaphore.new @@ -85,10 +85,10 @@ module Jabber @state_wait2.wait @state_wait.run end - + false } - + serverwait.wait end test/lib/clienttester.rb @@ -26,7 +26,7 @@ class MUCClientTest < Test::Unit::TestCase assert_kind_of(Presence, pres) assert_equal(JID.new('hag66@shakespeare.lit/pda'), pres.from) assert_equal(JID.new('darkcave@macbeth.shakespeare.lit/thirdwitch'), pres.to) - send("<presence from='darkcave@macbeth.shakespeare.lit' to='hag66@shakespeare.lit/pda' type='error'>" + + send("<presence from='darkcave@macbeth.shakespeare.lit' to='hag66@shakespeare.lit/pda' type='error'>" + "<error code='400' type='modify'>" + "<jid-malformed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" + "</error></presence>") @@ -195,7 +195,7 @@ class MUCClientTest < Test::Unit::TestCase def test_locked_room state { |pres| - send("<presence from='darkcave@macbeth.shakespeare.lit' to='hag66@shakespeare.lit/pda' type='error'>" + + send("<presence from='darkcave@macbeth.shakespeare.lit' to='hag66@shakespeare.lit/pda' type='error'>" + "<error code='404' type='cancel'><item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error>" + "</presence>") } @@ -365,7 +365,7 @@ class MUCClientTest < Test::Unit::TestCase messages_client += 1 message_lock.run } - + m = MUC::MUCClient.new(@client) m.my_jid = 'hag66@shakespeare.lit/pda' messages_muc = 0 @@ -425,7 +425,7 @@ class MUCClientTest < Test::Unit::TestCase @client.add_presence_callback { |pres| presences_client += 1 presence_lock.run - } + } m = MUC::MUCClient.new(@client) m.my_jid = 'hag66@shakespeare.lit/pda' presences_join = 0 @@ -522,7 +522,7 @@ class MUCClientTest < Test::Unit::TestCase assert_equal(JID.new('darkcave@macbeth.shakespeare.lit/firstwitch'), stanza.to) assert_equal('Third message', stanza.body) } - + m = MUC::MUCClient.new(@client) m.my_jid = 'hag66@shakespeare.lit/pda' @@ -610,9 +610,9 @@ class MUCClientTest < Test::Unit::TestCase assert_equal(jid, iq.from) assert_equal(room.strip, iq.to) assert_equal(:get, iq.type) - + assert_kind_of(Jabber::MUC::IqQueryMUCOwner, iq.first_element('query')) - + send(muc_config_form.sub("id='config1'","id='#{iq.id}'")) } @@ -620,16 +620,16 @@ class MUCClientTest < Test::Unit::TestCase assert_kind_of(Jabber::Iq, room_config) assert_equal(room.strip, room_config.to) assert_equal(:set, room_config.type) - + assert_kind_of(Jabber::MUC::IqQueryMUCOwner, room_config.first_element('query')) - + form = room_config.first_element('query/x') assert_kind_of(Dataforms::XData, form) assert_equal(:submit, form.type) assert_equal(1, form.elements.size) assert_equal('muc#roomconfig_roomname', form.first_element('field').var) assert_equal(['Dunsinane'], form.first_element('field').values) - + send(muc_config_acknowledgement.sub("id='config1'","id='#{room_config.id}'")) } @@ -639,10 +639,10 @@ class MUCClientTest < Test::Unit::TestCase wait_state assert_equal(true, m.owner?) - assert_equal(%w{muc#roomconfig_roomname muc#roomconfig_roomdesc - muc#roomconfig_enablelogging muc#roomconfig_changesubject muc#roomconfig_allowinvites + assert_equal(%w{muc#roomconfig_roomname muc#roomconfig_roomdesc + muc#roomconfig_enablelogging muc#roomconfig_changesubject muc#roomconfig_allowinvites muc#roomconfig_maxusers muc#roomconfig_presencebroadcast muc#roomconfig_getmemberlist - muc#roomconfig_publicroom muc#roomconfig_persistentroom muc#roomconfig_moderatedroom + muc#roomconfig_publicroom muc#roomconfig_persistentroom muc#roomconfig_moderatedroom muc#roomconfig_membersonly muc#roomconfig_passwordprotectedroom muc#roomconfig_roomsecret muc#roomconfig_whois muc#roomconfig_roomadmins muc#roomconfig_roomowners}, m.get_room_configuration) wait_state @@ -815,7 +815,7 @@ class MUCClientTest < Test::Unit::TestCase </query> </iq>" end - + def muc_config_acknowledgement "<iq from='darkcave@macbeth.shakespeare.lit' id='config1' @@ -827,4 +827,4 @@ class MUCClientTest < Test::Unit::TestCase </query> </iq>" end -end \ No newline at end of file +end test/muc/tc_muc_mucclient.rb @@ -35,7 +35,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase <pubsub xmlns='http://jabber.org/protocol/pubsub'> <subscription node='#{iq.pubsub.children.first.attributes['node']}' jid='#{iq.from}' subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3' - subscription='subscribed'/> + subscription='subscribed'/> </pubsub> </iq>") } @@ -63,15 +63,15 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase assert_equal('princely_musings',iq.pubsub.children.first.attributes['node']) assert_equal(@client.jid.strip.to_s,iq.pubsub.children.first.attributes['jid']) send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'> - <pubsub xmlns='http://jabber.org/protocol/pubsub'> - <subscription node='#{iq.pubsub.children.first.attributes['node']}' jid='#{iq.from}' - subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3' - subscription='unconfigured'/> - <subscribe-options> - <required/> - </subscribe-options> - </pubsub> - </iq>") + <pubsub xmlns='http://jabber.org/protocol/pubsub'> + <subscription node='#{iq.pubsub.children.first.attributes['node']}' jid='#{iq.from}' + subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3' + subscription='unconfigured'/> + <subscribe-options> + <required/> + </subscribe-options> + </pubsub> + </iq>") } subscription = h.subscribe_to('princely_musings') assert_kind_of(Jabber::PubSub::Subscription,subscription) @@ -81,7 +81,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase assert_equal(:unconfigured,subscription.subscription) wait_state end -=end +=end def test_subscribe_approval_required h = PubSub::ServiceHelper.new(@client,'pubsub.example.org') @@ -96,12 +96,11 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase assert_equal('princely_musings',iq.pubsub.children.first.attributes['node']) assert_equal(@client.jid.strip.to_s,iq.pubsub.children.first.attributes['jid']) send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'> - <pubsub xmlns='http://jabber.org/protocol/pubsub'> - <subscription node='#{iq.pubsub.children.first.attributes['node']}' jid='#{iq.from}' - subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3' - subscription='pending'/> - - </pubsub> + <pubsub xmlns='http://jabber.org/protocol/pubsub'> + <subscription node='#{iq.pubsub.children.first.attributes['node']}' jid='#{iq.from}' + subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3' + subscription='pending'/> + </pubsub> </iq>") } subscription = h.subscribe_to('princely_musings') @@ -114,7 +113,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase wait_state end - + ## # unsubscribe_from def test_unsubscribe @@ -189,7 +188,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase f = Jabber::Dataforms::XDataField.new('pubsub#access_model') f.values = 'open' form.add f - + assert_nothing_raised { h.create_node('mynode', form) } wait_state end @@ -229,7 +228,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase h.publish_item_to('mynode', item1) wait_state end - + def test_publish_pubsub_item_with_id item1 = Jabber::PubSub::Item.new item1.text = 'foobar' @@ -338,7 +337,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase assert_equal(:owner, a['node6']) wait_state end - + ## # get_subscriptions_from def test_subscriptions @@ -374,7 +373,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase wait_state end - + def test_subscribers h = PubSub::ServiceHelper.new(@client,'pubsub.example.org') @@ -384,15 +383,15 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase assert_equal(1, iq.pubsub.children.size) assert_equal('subscriptions', iq.pubsub.children.first.name) send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'> - <pubsub xmlns='http://jabber.org/protocol/pubsub'> - <subscriptions node='princely_musings'> - <subscription jid='peter@denmark.lit' subscription='subscribed'/> - <subscription jid='frank@denmark.lit' subscription='subscribed'/> - <subscription jid='albrecht@denmark.lit' subscription='unconfigured'/> - <subscription jid='hugo@denmark.lit' subscription='pending'/> - </subscriptions> - </pubsub> - </iq>") + <pubsub xmlns='http://jabber.org/protocol/pubsub'> + <subscriptions node='princely_musings'> + <subscription jid='peter@denmark.lit' subscription='subscribed'/> + <subscription jid='frank@denmark.lit' subscription='subscribed'/> + <subscription jid='albrecht@denmark.lit' subscription='unconfigured'/> + <subscription jid='hugo@denmark.lit' subscription='pending'/> + </subscriptions> + </pubsub> + </iq>") } s = h.get_subscribers_from('princely_musings') @@ -403,7 +402,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase assert_kind_of(Jabber::JID,s[3]) wait_state end - + ## # get_all_subscriptions def test_get_all_subscriptions @@ -416,14 +415,14 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase assert_equal('subscriptions', iq.pubsub.children.first.name) send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'> <pubsub xmlns='http://jabber.org/protocol/pubsub'> - <subscriptions> - <subscription node='node1' jid='francisco@denmark.lit' subscription='subscribed'/> - <subscription node='node2' jid='francisco@denmark.lit' subscription='subscribed'/> - <subscription node='node5' jid='francisco@denmark.lit' subscription='unconfigured'/> - <subscription node='node6' jid='francisco@denmark.lit' subscription='pending'/> - </subscriptions> - </pubsub> - </iq>") + <subscriptions> + <subscription node='node1' jid='francisco@denmark.lit' subscription='subscribed'/> + <subscription node='node2' jid='francisco@denmark.lit' subscription='subscribed'/> + <subscription node='node5' jid='francisco@denmark.lit' subscription='unconfigured'/> + <subscription node='node6' jid='francisco@denmark.lit' subscription='pending'/> + </subscriptions> + </pubsub> + </iq>") } s = h.get_subscriptions_from_all_nodes @@ -442,7 +441,7 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase wait_state end - + def test_get_all_subscriptions_with_no_subscriptions h = PubSub::ServiceHelper.new(@client,'pubsub.example.org') @@ -468,5 +467,5 @@ class PubSub::ServiceHelperTest < Test::Unit::TestCase h = PubSub::ServiceHelper.new(@client,'pubsub.example.org') assert_equal('pubsub.example.org',h.to_s) end - + end test/pubsub/tc_helper.rb @@ -512,4 +512,3 @@ class Roster::HelperTest < Test::Unit::TestCase assert_nil(update_args[1]) end end - test/roster/tc_helper.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) test/roster/tc_xroster.rb @@ -93,4 +93,3 @@ class RPC::HelperTest < Test::Unit::TestCase assert(correct) end end - test/rpc/tc_helper.rb @@ -80,7 +80,7 @@ class JIDTest < Test::Unit::TestCase 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 +90,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,7 +134,7 @@ 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) test/tc_class_names.rb @@ -119,7 +119,7 @@ class StreamTest < Test::Unit::TestCase called_outer += 1 assert_kind_of(Iq, reply) assert_equal(:result, reply.type) - + if reply.id == '1' @stream.send(Iq.new(:set)) do |reply2| called_inner += 1 test/tc_stream.rb @@ -33,7 +33,7 @@ class StreamComponentTest < Test::Unit::TestCase end end @server.start(serversock) - + serverwait.run end @@ -63,7 +63,7 @@ class StreamComponentTest < Test::Unit::TestCase assert_kind_of(Iq, iq) stanzas += 1 iq_lock.run - } + } @stream.add_presence_callback { |pres| assert_kind_of(Presence, pres) stanzas += 1 test/tc_streamComponent.rb @@ -20,7 +20,7 @@ class ConnectionErrorTest < Test::Unit::TestCase @server = servlisten.accept servlisten.close @server.sync = true - + serverwait.run end @@ -62,7 +62,7 @@ class ConnectionErrorTest < Test::Unit::TestCase error = false @stream.start(@conn) @stream.on_exception do |e, o, w| - if w == :disconnected + if w == :disconnected assert_equal(nil, e) assert_equal(Jabber::Stream, o.class) else test/tc_streamError.rb @@ -33,7 +33,7 @@ class StreamSendTest < Test::Unit::TestCase @stream.send(s) @stream.send("\n") #needed for easy test writing end - + ## # Tries to send a basic message def test_sendbasic test/tc_streamSend.rb @@ -73,7 +73,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) test/tc_xmppstanza.rb @@ -28,7 +28,7 @@ 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| test/ts_xmpp4r.rb @@ -72,13 +72,13 @@ class UserTune::HelperTest < Test::Unit::TestCase # 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 test/tune/tc_helper_recv.rb @@ -31,10 +31,10 @@ class UserTune::HelperTest < Test::Unit::TestCase 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? @@ -53,10 +53,10 @@ class UserTune::HelperTest < Test::Unit::TestCase 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 test/tune/tc_helper_send.rb @@ -31,7 +31,7 @@ class Jabber::UserTune::TuneTest < Test::Unit::TestCase 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? @@ -48,7 +48,7 @@ class Jabber::UserTune::TuneTest < Test::Unit::TestCase 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 test/tune/tc_tune.rb @@ -46,4 +46,3 @@ class Vcard::HelperTest < Test::Unit::TestCase assert_equal('====', res['PHOTO/BINVAL']) end end - test/vcard/tc_helper.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']) test/vcard/tc_iqvcard.rb a58bc51ac6c601bc1b85f998de0bfe6eec627d3a Glenn Rempe glenn@rempe.us http://github.com/ln/xmpp4r/commit/133ecea485da3efbf4ab59665d481697a44f836a 133ecea485da3efbf4ab59665d481697a44f836a 2008-06-05T15:12:00-07:00 2008-06-04T19:29:38-07:00 Whitespace cleanup. Strip trailing whitespace and convert leading tabs to spaces. A little housecleaning for xmpp4r's new home on GitHub. Signed-off-by: Glenn Rempe <glenn@rempe.us> bda9ddb6ab547676bee0c0280672be47fc8cec55 Glenn Rempe glenn@rempe.us