jabber4r-revive 0.9.0 → 0.10.0

data/lib/jabber4r/protocol/xml_element.rb

@@ -1,144 +1,144 @@
-# coding: utf-8
-
-# License: see LICENSE
-# Jabber4R - Jabber Instant Messaging Library for Ruby
-# Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
-
-module Jabber::Protocol
-  ##
-  # Utility class to create valid XML strings
-  #
-  class XMLElement
-
-    # The parent XMLElement
-    attr_accessor :parent
-
-    ##
-    # Construct an XMLElement for the supplied tag and attributes
-    #
-    # tag:: [String] XML tag
-    # attributes:: [Hash = {}] The attribute hash[attribute]=value
-    def initialize(tag, attributes={})
-      @tag = tag
-      @elements = []
-      @attributes = attributes
-      @data = ""
-    end
-
-    ##
-    # Adds an attribute to this element
-    #
-    # attrib:: [String] The attribute name
-    # value:: [String] The attribute value
-    # return:: [Jabber::Protocol::XMLElement] self for chaining
-    #
-    def add_attribute(attrib, value)
-      @attributes[attrib]=value
-      self
-    end
-
-    ##
-    # Adds data to this element
-    #
-    # data:: [String] The data to add
-    # return:: [Jabber::Protocol::XMLElement] self for chaining
-    #
-    def add_data(data)
-      @data += data.to_s
-      self
-    end
-
-    ##
-    # Sets the namespace for this tag
-    #
-    # ns:: [String] The namespace
-    # return:: [Jabber::Protocol::XMLElement] self for chaining
-    #
-    def set_namespace(ns)
-      @tag+=":#{ns}"
-      self
-    end
-
-    ##
-    # Adds cdata to this element
-    #
-    # cdata:: [String] The cdata to add
-    # return:: [Jabber::Protocol::XMLElement] self for chaining
-    #
-    def add_cdata(cdata)
-      @data += "<![CDATA[#{cdata.to_s}]]>"
-      self
-    end
-
-    ##
-    # Returns the parent element
-    #
-    # return:: [Jabber::Protocol::XMLElement] The parent XMLElement
-    #
-    def to_parent
-      @parent
-    end
-
-    ##
-    # Adds a child to this element of the supplied tag
-    #
-    # tag:: [String] The element tag
-    # attributes:: [Hash = {}] The attributes hash[attribute]=value
-    # return:: [Jabber::Protocol::XMLElement] newly created child element
-    #
-    def add_child(tag, attributes={})
-      child = XMLElement.new(tag, attributes)
-      child.parent = self
-      @elements << child
-      return child
-    end
-
-    ##
-    # Adds arbitrary XML data to this object
-    #
-    # xml:: [String] the xml to add
-    #
-    def add_xml(xml)
-      @xml = xml
-    end
-
-    ##
-    # Recursively builds the XML string by traversing this element's
-    # children.
-    #
-    # format:: [Boolean] True to pretty-print (format) the output string
-    # indent:: [Integer = 0] The indent level (recursively more)
-    #
-    def to_xml(format, indent=0)
-      result = ""
-      result += " "*indent if format
-      result += "<#{@tag}"
-      @attributes.each {|attrib, value| result += (' '+attrib.to_s+'="'+value.to_s+'"') }
-      if @data=="" and @elements.size==0
-        result +="/>"
-        result +="\n" if format
-        return result
-      end
-      result += ">"
-      result += "\n" if format and @data==""
-      result += @data if @data!=""
-      @elements.each {|element| result+=element.to_xml(format, indent+4)}
-      result += @xml if not @xml.nil?
-      result += " "*indent if format and @data==""
-      result+="</#{@tag}>"
-      result+="\n" if format
-      return result
-    end
-
-    ##
-    # Climbs to the top of this elements parent tree and then returns
-    # the to_xml XML string.
-    #
-    # return:: [String] The XML string of this element (from the topmost parent).
-    #
-    def to_s
-      return @parent.to_s if @parent
-      return to_xml(true)
-    end
-  end
+# coding: utf-8
+
+# License: see LICENSE
+# Jabber4R - Jabber Instant Messaging Library for Ruby
+# Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
+
+module Jabber::Protocol
+  ##
+  # Utility class to create valid XML strings
+  #
+  class XMLElement
+
+    # The parent XMLElement
+    attr_accessor :parent
+
+    ##
+    # Construct an XMLElement for the supplied tag and attributes
+    #
+    # tag:: [String] XML tag
+    # attributes:: [Hash = {}] The attribute hash[attribute]=value
+    def initialize(tag, attributes={})
+      @tag = tag
+      @elements = []
+      @attributes = attributes
+      @data = ""
+    end
+
+    ##
+    # Adds an attribute to this element
+    #
+    # attrib:: [String] The attribute name
+    # value:: [String] The attribute value
+    # return:: [Jabber::Protocol::XMLElement] self for chaining
+    #
+    def add_attribute(attrib, value)
+      @attributes[attrib]=value
+      self
+    end
+
+    ##
+    # Adds data to this element
+    #
+    # data:: [String] The data to add
+    # return:: [Jabber::Protocol::XMLElement] self for chaining
+    #
+    def add_data(data)
+      @data += data.to_s
+      self
+    end
+
+    ##
+    # Sets the namespace for this tag
+    #
+    # ns:: [String] The namespace
+    # return:: [Jabber::Protocol::XMLElement] self for chaining
+    #
+    def set_namespace(ns)
+      @tag+=":#{ns}"
+      self
+    end
+
+    ##
+    # Adds cdata to this element
+    #
+    # cdata:: [String] The cdata to add
+    # return:: [Jabber::Protocol::XMLElement] self for chaining
+    #
+    def add_cdata(cdata)
+      @data += "<![CDATA[#{cdata.to_s}]]>"
+      self
+    end
+
+    ##
+    # Returns the parent element
+    #
+    # return:: [Jabber::Protocol::XMLElement] The parent XMLElement
+    #
+    def to_parent
+      @parent
+    end
+
+    ##
+    # Adds a child to this element of the supplied tag
+    #
+    # tag:: [String] The element tag
+    # attributes:: [Hash = {}] The attributes hash[attribute]=value
+    # return:: [Jabber::Protocol::XMLElement] newly created child element
+    #
+    def add_child(tag, attributes={})
+      child = XMLElement.new(tag, attributes)
+      child.parent = self
+      @elements << child
+      return child
+    end
+
+    ##
+    # Adds arbitrary XML data to this object
+    #
+    # xml:: [String] the xml to add
+    #
+    def add_xml(xml)
+      @xml = xml
+    end
+
+    ##
+    # Recursively builds the XML string by traversing this element's
+    # children.
+    #
+    # format:: [Boolean] True to pretty-print (format) the output string
+    # indent:: [Integer = 0] The indent level (recursively more)
+    #
+    def to_xml(format, indent=0)
+      result = ""
+      result += " "*indent if format
+      result += "<#{@tag}"
+      @attributes.each {|attrib, value| result += (' '+attrib.to_s+'="'+value.to_s+'"') }
+      if @data=="" and @elements.size==0
+        result +="/>"
+        result +="\n" if format
+        return result
+      end
+      result += ">"
+      result += "\n" if format and @data==""
+      result += @data if @data!=""
+      @elements.each {|element| result+=element.to_xml(format, indent+4)}
+      result += @xml if not @xml.nil?
+      result += " "*indent if format and @data==""
+      result+="</#{@tag}>"
+      result+="\n" if format
+      return result
+    end
+
+    ##
+    # Climbs to the top of this elements parent tree and then returns
+    # the to_xml XML string.
+    #
+    # return:: [String] The XML string of this element (from the topmost parent).
+    #
+    def to_s
+      return @parent.to_s if @parent
+      return to_xml(true)
+    end
+  end
 end

data/lib/jabber4r/rexml_1.8_patch.rb

@@ -1,16 +1,16 @@
-if RUBY_VERSION=="1.8.0"
-  module REXML
-    module Parsers
-      class BaseParser
-        # Returns true if there are more events.  Synonymous with !empty?
-        def has_next?
-          return true if @closed # THIS WAS ADDED TO FIX PROBLEM
-          @source.read if @source.buffer.size==0 and !@source.empty?
-          (!@source.empty? and @source.buffer.strip.size>0) or @stack.size>0 or @closed
-        end
-      end
-    end
-  end
-else
-  puts "WARNING: rexml_1.8_patch is needed on Ruby 1.8.0 and not by Ruby #{RUBY_VERSION}"
+if RUBY_VERSION=="1.8.0"
+  module REXML
+    module Parsers
+      class BaseParser
+        # Returns true if there are more events.  Synonymous with !empty?
+        def has_next?
+          return true if @closed # THIS WAS ADDED TO FIX PROBLEM
+          @source.read if @source.buffer.size==0 and !@source.empty?
+          (!@source.empty? and @source.buffer.strip.size>0) or @stack.size>0 or @closed
+        end
+      end
+    end
+  end
+else
+  puts "WARNING: rexml_1.8_patch is needed on Ruby 1.8.0 and not by Ruby #{RUBY_VERSION}"
 end

data/lib/jabber4r/roster.rb

@@ -1,7 +1,7 @@
 # License: see LICENSE.txt
 #  Jabber4R - Jabber Instant Messaging Library for Ruby
 #  Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
-# 
+#
 
 
 module Jabber
@@ -9,17 +9,17 @@ module Jabber
   ##
   # The Roster class encapsulates the runtime roster of the session instance.
   # The Roster contains all subscriptions in a Jabber::Roster::RosterItem hash.
-  # 
+  #
   class Roster
     ITEM_ADDED=1
     ITEM_DELETED=2
     RESOURCE_ADDED=4
     RESOURCE_UPDATED=8
     RESOURCE_DELETED=16
-    
+
     # The Jabber::Session instance
     attr_reader :session
-    
+
     ##
     # Creates a Roster for the session
     #
@@ -30,7 +30,7 @@ module Jabber
       @map = {}
       @listeners = {}
     end
-    
+
     ##
     # The RosterItem class embodies another Jabber user's status (from
     # the local user's perspective).  RosterItems contain 
@@ -40,19 +40,19 @@ module Jabber
     class RosterItem
       # The Jabber::Roster instance
       attr_reader :roster
-      
+
       # The Jabber ID (Jabber::JID)
       attr_accessor :jid
-      
+
       # The subscription type
       attr_accessor :subscription
-      
+
       # The (nick)name of this account
       attr_accessor :name
-      
+
       # The group name for this account
       attr_accessor :group
-      
+
       ##
       # Constructs a RosterItem
       #
@@ -69,22 +69,22 @@ module Jabber
         @resources = {}
         @roster = roster
       end
-      
+
       ##
       # The Resource class embodies a Resource endpoint in Jabber.
       # The resource endpoint it what maintains a status (not an account).
       #
       class Resource
-      
+
         # The name of the resource
         attr_reader :name
-        
+
         # How the resource should be shown
         attr_reader :show
-        
+
         # The status message of the resource
         attr_reader :status
-        
+
         ##
         # Constructs a new Resource instance
         #
@@ -99,7 +99,7 @@ module Jabber
           @show = show
           @status = status
         end
-        
+
         ##
         # Updates the state of a resource and notifies listeners.
         #
@@ -111,7 +111,7 @@ module Jabber
           @status = status
           @item.roster.notify_listeners(RESOURCE_UPDATED, self)
         end
-        
+
         ##
         # Dumps the Resource as a string
         #
@@ -121,7 +121,7 @@ module Jabber
           "RESOURCE:#{@name} SHOW:#{@show} STATUS:#{@status}"
         end
       end
-      
+
       ##
       # Retrieves the VCard for this (RosterItem) account.  This method
       # blocks until the the vcard is returned.
@@ -143,7 +143,7 @@ module Jabber
         Thread.stop
         return result
       end
-      
+
       ##
       # Adds a new resource to the Roster item and notifies listeners
       #
@@ -158,7 +158,7 @@ module Jabber
         @roster.notify_listeners(RESOURCE_ADDED, resource)
         resource
       end
-      
+
       ##
       # Deletes a resource from this roster item and notifies listeners
       #
@@ -170,7 +170,7 @@ module Jabber
         @roster.notify_listeners(RESOURCE_DELETED, resource) if resource
         resource
       end
-      
+
       ##
       # Retrieves a resource object
       #
@@ -180,7 +180,7 @@ module Jabber
       def [](resourceName)
         return @resources[resourceName]
       end
-      
+
       ##
       # Iterates over the list of available resources
       #
@@ -189,7 +189,7 @@ module Jabber
       def each_resource
         @resources.each_value {|resource| yield resource}
       end
-      
+
       ##
       # Dumps the roster item
       #
@@ -198,7 +198,7 @@ module Jabber
         "ITEM:#{@jid.to_s} SUBSCRIPTION:#{@subscription} NAME:#{@name} GROUP:#{@group}"
       end
     end
-    
+
     ##
     # Adds a listener to the roster to process roster changes
     #
@@ -210,7 +210,7 @@ module Jabber
       @listeners[id]=block if block
       return id
     end
-    
+
     ##
     # Deletes a listener for processing roster messages
     #
@@ -219,7 +219,7 @@ module Jabber
     def delete_listener(id)
       @listeners.delete(id)
     end
-    
+
     ##
     # Adds a subscription to be tracked in the Roster
     #
@@ -230,10 +230,10 @@ module Jabber
     #
     def add(jid, subscription, name, group=nil)
       if jid.kind_of? String
-        jid = JID.new(jid) 
+        jid = JID.new(jid)
         jid.strip!
       elsif jid.kind_of? JID
-        jid = JID.new(jid.node+"@"+jid.host)
+        jid = JID.new(jid.node+"@"+jid.domain)
       else
         return
       end
@@ -245,7 +245,7 @@ module Jabber
         puts ex.backtrace.join("\n")
       end
     end
-    
+
     ##
     # Returns a Jabber::Roster::RosterItem based on the JID
     #
@@ -254,16 +254,16 @@ module Jabber
     #
     def [](jid)
       if jid.kind_of? String
-        jid = JID.new(jid) 
+        jid = JID.new(jid)
         jid.strip!
       elsif jid.kind_of? JID
-        jid = JID.new(jid.node+"@"+jid.host)
+        jid = JID.new(jid.node+"@"+jid.domain)
       else
         return
       end
       return @map[jid.to_s]
     end
-    
+
     ##
     # Deletes a roster item based on the supplied Jabber ID
     #
@@ -274,7 +274,7 @@ module Jabber
         jid = JID.new(jid) 
         jid.strip!
       elsif jid.kind_of? JID
-        jid = JID.new(jid.node+"@"+jid.host)
+        jid = JID.new(jid.node+"@"+jid.domain)
       else
         return
       end
@@ -282,7 +282,7 @@ module Jabber
       notify_listeners(ITEM_DELETED, item) if item
       item
     end
-    
+
     ##
     # Iterates over each RosterItem
     #
@@ -291,7 +291,7 @@ module Jabber
     def each_item
       @map.each_value {|item| yield item}
     end
-    
+
     ##
     # Dumps the Roster state as a string
     #
@@ -308,15 +308,15 @@ module Jabber
 
     ##
     # Notifies listeners of a roster change event
-    # 
+    #
     # event:: [Integer] The roster event
     # object:: [RosterItem] The modified item
     #
     def notify_listeners(event, object)
       @listeners.each_value {|listener| listener.call(event, object)}
     end
-    
+
   end
-  
+
 end