Short summary:

  This is a version bump to REXML 3.1.4.  It includes numerous bug fixes and is
  a pretty big patch, but is nonetheless a minor revision bump, since the API
  hasn't changed.

  For more information, see:

    http:/www.germane-software.com/projects/rexml/milestone/3.1.4

  For all tickets, see:

    http://www.germane-software.com/projects/rexml/ticket/#

  Where '#' is replaced with the ticket number.

Changelog:

* Fixed the documentation WRT the raw mode of text nodes (ticket #4)
* Fixes roundup ticket #43: substring-after bug.
* Fixed ticket #44, Element#xpath
* Patch submitted by an anonymous doner to allow parsing of Tempfiles.  I was
  hoping that, by now, that whole Source thing would have been changed to use
  duck typing and avoid this sort of ticket... but in the meantime, the patch
  has been applied.
* Fixes ticket:30, XPath default namespace bug.  The fix was provided
  by Lucas Nussbaum.
* Aliases #size to #length, as per zdennis's request.
* Fixes typo from previous commit
* Fixes ticket #32, preceding-sibling fails attempting delete_if on nil nodeset
* Merges a user-contributed patch for ticket #40
* Adds a forgotten-to-commit unit test for ticket #32
* Changes Date, Version, and Copyright to upper case, to avoid conflicts with
  the Date class.  All of the other changes in the altered files are because
  Subversion doesn't allow block-level commits, like it should.  English cased
  Version and Copyright are aliased to the upper case versions, for partial
  backward compatability.
* Minor, yet incomplete, documentation changes.  Again, these are in this patch
  because of Subversion's glaring lack of block-level commits.
* Resolves ticket #34, SAX parser change makes it impossible to parse IO feeds.
* Moves parser.source.position() to parser.position()
* Fixes ticket:48, repeated writes munging text content
* Fixes ticket:46, adding methods for accessing notation DTD information.
* Encodes some characters and removes a brokes link in the documentation
* Deals with carriage returns after XML declarations
* Improved doctype handling
* Whitespace handling changes
* Applies a patch by David Tardon, which (incidentally) fixes ticket:50
* Closes #26, allowing anything that walks like an IO to be a source.
* Ticket #31 - One unescape too many
  This wasn't really a bug, per se... "value" always returns
  a normalized string, and "value" is the method used to get
  the text() of an element.  However, entities have no meaning
  in CDATA sections, so there's no justification for value
  to be normalizing the content of CData objects.  This behavior
  has therefore been changed.
* Ticket #45 -- Now parses notation declarations in DTDs properly.
* Resolves ticket #49, Document.parse_stream returns ArgumentError
* Adds documentation to clarify how XMLDecl works, to avoid invalid bug reports.
* Addresses ticket #10, fixing the StreamParser API for DTDs.
* Fixes ticket #42, XPath node-set function 'name' fails with relative node
  set parameter
* Good patch by Aaron to fix ticket #53: REXML ignoring unbalanced tags
  at the end of a document.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 155 insertions, 157 deletions

diff --git a/lib/rexml/parent.rb b/lib/rexml/parent.rb
index cc74a40666..a20aaaef6b 100644
--- a/lib/rexml/parent.rb
+++ b/lib/rexml/parent.rb
@@ -1,168 +1,166 @@
 require "rexml/child"
 
 module REXML
-	# A parent has children, and has methods for accessing them.  The Parent
+  # A parent has children, and has methods for accessing them.  The Parent
   # class is never encountered except as the superclass for some other
   # object.
-	class Parent < Child
-		include Enumerable
-
-		# Constructor
-		# @param parent if supplied, will be set as the parent of this object
-		def initialize parent=nil
-			super(parent)
-			@children = []
-		end
-
-		def add( object )
-			#puts "PARENT GOTS #{size} CHILDREN"
-			object.parent = self
-			@children << object
-			#puts "PARENT NOW GOTS #{size} CHILDREN"
-			object
-		end
-
-		alias :push :add
-		alias :<< :push
-
-		def unshift( object )
-			object.parent = self
-			@children.unshift object
-		end
-
-		def delete( object )
+  class Parent < Child
+    include Enumerable
+    
+    # Constructor
+    # @param parent if supplied, will be set as the parent of this object
+    def initialize parent=nil
+      super(parent)
+      @children = []
+    end
+    
+    def add( object )
+      #puts "PARENT GOTS #{size} CHILDREN"
+      object.parent = self
+      @children << object
+      #puts "PARENT NOW GOTS #{size} CHILDREN"
+      object
+    end
+    
+    alias :push :add
+    alias :<< :push
+    
+    def unshift( object )
+      object.parent = self
+      @children.unshift object
+    end
+    
+    def delete( object )
       found = false
-      @children.delete_if {|c| 
-        c.equal?(object) and found = true
-      }
-			object.parent = nil if found
-		end
-
-		def each(&block)
-			@children.each(&block)
-		end
-
-		def delete_if( &block )
-			@children.delete_if(&block)
-		end
-
-		def delete_at( index )
-			@children.delete_at index
-		end
-
-		def each_index( &block )
-			@children.each_index(&block)
-		end
-
-		# Fetches a child at a given index
-		# @param index the Integer index of the child to fetch
-		def []( index )
-			@children[index]
-		end
-
-		alias :each_child :each
-
-
-
-		# Set an index entry.  See Array.[]=
-		# @param index the index of the element to set
-		# @param opt either the object to set, or an Integer length
-		# @param child if opt is an Integer, this is the child to set
-		# @return the parent (self)
-		def []=( *args )
-			args[-1].parent = self
-			@children[*args[0..-2]] = args[-1]
-		end
-
-		# Inserts an child before another child
-		# @param child1 this is either an xpath or an Element.  If an Element,
-		# child2 will be inserted before child1 in the child list of the parent.
-		# If an xpath, child2 will be inserted before the first child to match
-		# the xpath.
-		# @param child2 the child to insert
-		# @return the parent (self)
-		def insert_before( child1, child2 )
-			if child1.kind_of? String
-				child1 = XPath.first( self, child1 )
-				child1.parent.insert_before child1, child2
-			else
-				ind = index(child1)
-				child2.parent.delete(child2) if child2.parent
-				@children[ind,0] = child2
-				child2.parent = self
-			end
-			self
-		end
-
-		# Inserts an child after another child
-		# @param child1 this is either an xpath or an Element.  If an Element,
-		# child2 will be inserted after child1 in the child list of the parent.
-		# If an xpath, child2 will be inserted after the first child to match
-		# the xpath.
-		# @param child2 the child to insert
-		# @return the parent (self)
-		def insert_after( child1, child2 )
-			if child1.kind_of? String
-				child1 = XPath.first( self, child1 )
-				child1.parent.insert_after child1, child2
-			else
-				ind = index(child1)+1
-				child2.parent.delete(child2) if child2.parent
-				@children[ind,0] = child2
-				child2.parent = self
-			end
-			self
-		end
-
-		def to_a
-			@children.dup
-		end
-
-		# Fetches the index of a given child
-		# @param child the child to get the index of
-		# @return the index of the child, or nil if the object is not a child
-		# of this parent.
-		def index( child )
-			count = -1
-			@children.find { |i| count += 1 ; i.hash == child.hash }
-			count
-		end
-
-		# @return the number of children of this parent
-		def size
-			@children.size
-		end
-
+      @children.delete_if {|c| c.equal?(object) and found = true }
+      object.parent = nil if found
+    end
+    
+    def each(&block)
+      @children.each(&block)
+    end
+    
+    def delete_if( &block )
+      @children.delete_if(&block)
+    end
+    
+    def delete_at( index )
+      @children.delete_at index
+    end
+    
+    def each_index( &block )
+      @children.each_index(&block)
+    end
+    
+    # Fetches a child at a given index
+    # @param index the Integer index of the child to fetch
+    def []( index )
+      @children[index]
+    end
+    
+    alias :each_child :each
+    
+    
+    
+    # Set an index entry.  See Array.[]=
+    # @param index the index of the element to set
+    # @param opt either the object to set, or an Integer length
+    # @param child if opt is an Integer, this is the child to set
+    # @return the parent (self)
+    def []=( *args )
+      args[-1].parent = self
+      @children[*args[0..-2]] = args[-1]
+    end
+    
+    # Inserts an child before another child
+    # @param child1 this is either an xpath or an Element.  If an Element,
+    # child2 will be inserted before child1 in the child list of the parent.
+    # If an xpath, child2 will be inserted before the first child to match
+    # the xpath.
+    # @param child2 the child to insert
+    # @return the parent (self)
+    def insert_before( child1, child2 )
+      if child1.kind_of? String
+        child1 = XPath.first( self, child1 )
+        child1.parent.insert_before child1, child2
+      else
+        ind = index(child1)
+        child2.parent.delete(child2) if child2.parent
+        @children[ind,0] = child2
+        child2.parent = self
+      end
+      self
+    end
+    
+    # Inserts an child after another child
+    # @param child1 this is either an xpath or an Element.  If an Element,
+    # child2 will be inserted after child1 in the child list of the parent.
+    # If an xpath, child2 will be inserted after the first child to match
+    # the xpath.
+    # @param child2 the child to insert
+    # @return the parent (self)
+    def insert_after( child1, child2 )
+      if child1.kind_of? String
+        child1 = XPath.first( self, child1 )
+        child1.parent.insert_after child1, child2
+      else
+        ind = index(child1)+1
+        child2.parent.delete(child2) if child2.parent
+        @children[ind,0] = child2
+        child2.parent = self
+      end
+      self
+    end
+    
+    def to_a
+      @children.dup
+    end
+    
+    # Fetches the index of a given child
+    # @param child the child to get the index of
+    # @return the index of the child, or nil if the object is not a child
+    # of this parent.
+    def index( child )
+      count = -1
+      @children.find { |i| count += 1 ; i.hash == child.hash }
+      count
+    end
+    
+    # @return the number of children of this parent
+    def size
+      @children.size
+    end
+    
     alias :length :size
-
-		# Replaces one child with another, making sure the nodelist is correct
-		# @param to_replace the child to replace (must be a Child)
-		# @param replacement the child to insert into the nodelist (must be a 
-		# Child)
-		def replace_child( to_replace, replacement )
+    
+    # Replaces one child with another, making sure the nodelist is correct
+    # @param to_replace the child to replace (must be a Child)
+    # @param replacement the child to insert into the nodelist (must be a 
+    # Child)
+    def replace_child( to_replace, replacement )
       @children.map! {|c| c.equal?( to_replace ) ? replacement : c }
       to_replace.parent = nil
       replacement.parent = self
-		end
-
-		# Deeply clones this object.  This creates a complete duplicate of this
-		# Parent, including all descendants.
-		def deep_clone
-			cl = clone()
-			each do |child|
-				if child.kind_of? Parent
-					cl << child.deep_clone
-				else
-					cl << child.clone
-				end
-			end
-			cl
-		end
-
-		alias :children :to_a
-
-		def parent?
-			true
-		end
-	end
+    end
+    
+    # Deeply clones this object.  This creates a complete duplicate of this
+    # Parent, including all descendants.
+    def deep_clone
+      cl = clone()
+      each do |child|
+        if child.kind_of? Parent
+          cl << child.deep_clone
+        else
+          cl << child.clone
+        end
+      end
+      cl
+    end
+    
+    alias :children :to_a
+    
+    def parent?
+      true
+    end
+  end
 end