rubysl-rexml 1.0.0 → 2.0.1

data/lib/rexml/validation/relaxng.rb

@@ -79,7 +79,7 @@ module REXML
             when "mixed"
               states << Interleave.new( self )
               states[-2] << states[-1]
-              states[-1] << TEXT 
+              states[-1] << TEXT
             when "define"
               states << [ event[2]["name"] ]
             when "ref"
@@ -102,7 +102,7 @@ module REXML
             case event[1]
             when "element", "attribute"
               states[-1] << event
-            when "zeroOrMore", "oneOrMore", "choice", "optional", 
+            when "zeroOrMore", "oneOrMore", "choice", "optional",
               "interleave", "group", "mixed"
               states.pop
             when "define"
@@ -139,7 +139,7 @@ module REXML
         @events.each {|s| s.reset if s.kind_of? State }
       end
 
-      def previous=( previous ) 
+      def previous=( previous )
         @previous << previous
       end
 
@@ -183,7 +183,7 @@ module REXML
       end
 
       def inspect
-        "< #{to_s} #{@events.collect{|e| 
+        "< #{to_s} #{@events.collect{|e|
           pre = e == @events[@current] ? '#' : ''
           pre + e.inspect unless self == e
         }.join(', ')} >"
@@ -201,15 +201,15 @@ module REXML
       protected
       def expand_ref_in( arry, ind )
         new_events = []
-        @references[ arry[ind].to_s ].each{ |evt| 
+        @references[ arry[ind].to_s ].each{ |evt|
           add_event_to_arry(new_events,evt)
         }
         arry[ind,1] = new_events
       end
 
-      def add_event_to_arry( arry, evt ) 
+      def add_event_to_arry( arry, evt )
         evt = generate_event( evt )
-        if evt.kind_of? String 
+        if evt.kind_of? String
           arry[-1].event_arg = evt if arry[-1].kind_of? Event and @value
           @value = false
         else
@@ -272,7 +272,7 @@ module REXML
       end
 
       def matches?(event)
-        @events[@current].matches?(event) || 
+        @events[@current].matches?(event) ||
         (@current == 0 and @previous[-1].matches?(event))
       end
 
@@ -319,7 +319,7 @@ module REXML
       end
 
       def reset
-        super 
+        super
         @ord = 0
       end
 
@@ -345,7 +345,7 @@ module REXML
       end
 
       def matches?( event )
-        @events[@current].matches?(event) || 
+        @events[@current].matches?(event) ||
         (@current == 0 and @ord > 0 and @previous[-1].matches?(event))
       end
 
@@ -412,7 +412,7 @@ module REXML
         #puts "IN CHOICE EXPECTED"
         #puts "EVENTS = #{@events.inspect}"
         return [@events[@current]] if @events.size > 0
-        return @choices.collect do |x| 
+        return @choices.collect do |x|
           if x[0].kind_of? State
             x[0].expected
           else
@@ -426,17 +426,17 @@ module REXML
       end
 
       protected
-      def add_event_to_arry( arry, evt ) 
+      def add_event_to_arry( arry, evt )
         if evt.kind_of? State or evt.class == Ref
           arry << [evt]
-        elsif evt[0] == :text 
+        elsif evt[0] == :text
          if arry[-1] and
-            arry[-1][-1].kind_of?( Event ) and 
+            arry[-1][-1].kind_of?( Event ) and
             arry[-1][-1].event_type == :text and @value
 
             arry[-1][-1].event_arg = evt[1]
             @value = false
-          end
+         end
         else
           arry << [] if evt[0] == :start_element
           arry[-1] << generate_event( evt )
@@ -478,7 +478,7 @@ module REXML
           @choices[idx] = old
           @choice += 1
         end
-        
+
        #puts "In next with #{event.inspect}."
        #puts "events is #{@events.inspect}"
         @events = [] unless @events
@@ -490,7 +490,7 @@ module REXML
         next_current(event) unless @events[@current]
         return nil unless @events[@current]
 
-        expand_ref_in( @events, @current ) if @events[@current].class == Ref 
+        expand_ref_in( @events, @current ) if @events[@current].class == Ref
        #puts "In next with #{event.inspect}."
        #puts "Next (#@current) is #{@events[@current]}"
         if ( @events[@current].kind_of? State )
@@ -530,7 +530,7 @@ module REXML
         #puts "IN CHOICE EXPECTED"
         #puts "EVENTS = #{@events.inspect}"
         return [@events[@current]] if @events[@current]
-        return @choices[@choice..-1].collect do |x| 
+        return @choices[@choice..-1].collect do |x|
           if x[0].kind_of? State
             x[0].expected
           else

data/lib/rexml/validation/validation.rb

@@ -14,7 +14,7 @@ module REXML
       def dump
         puts @root.inspect
       end
-      def validate( event ) 
+      def validate( event )
         #puts "Current: #@current"
         #puts "Event: #{event.inspect}"
         @attr_stack = [] unless defined? @attr_stack
@@ -33,12 +33,12 @@ module REXML
             sattr = [:start_attribute, nil]
             eattr = [:end_attribute]
             text = [:text, nil]
-            k,v = event[2].find { |k,v| 
-              sattr[1] = k
+            k, = event[2].find { |key,value|
+              sattr[1] = key
               #puts "Looking for #{sattr.inspect}"
               m = @current.next( sattr )
               #puts "Got #{m.inspect}"
-              if m 
+              if m
                 # If the state has text children...
                 #puts "Looking for #{eattr.inspect}"
                 #puts "Expect #{m.expected}"
@@ -47,7 +47,7 @@ module REXML
                   @current = m
                 else
                   #puts "Didn't get end"
-                  text[1] = v
+                  text[1] = value
                   #puts "Looking for #{text.inspect}"
                   m = m.next( text )
                   #puts "Got #{m.inspect}"

data/lib/rexml/xmldecl.rb

@@ -2,40 +2,40 @@ require 'rexml/encoding'
 require 'rexml/source'
 
 module REXML
-	# NEEDS DOCUMENTATION
-	class XMLDecl < Child
-		include Encoding
+  # NEEDS DOCUMENTATION
+  class XMLDecl < Child
+    include Encoding
 
-		DEFAULT_VERSION = "1.0";
-		DEFAULT_ENCODING = "UTF-8";
-		DEFAULT_STANDALONE = "no";
-		START = '<\?xml';
-		STOP = '\?>';
+    DEFAULT_VERSION = "1.0";
+    DEFAULT_ENCODING = "UTF-8";
+    DEFAULT_STANDALONE = "no";
+    START = '<\?xml';
+    STOP = '\?>';
 
-		attr_accessor :version, :standalone
+    attr_accessor :version, :standalone
     attr_reader :writeencoding, :writethis
 
-		def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
+    def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
       @writethis = true
       @writeencoding = !encoding.nil?
-			if version.kind_of? XMLDecl
-				super()
-				@version = version.version
-				self.encoding = version.encoding
+      if version.kind_of? XMLDecl
+        super()
+        @version = version.version
+        self.encoding = version.encoding
         @writeencoding = version.writeencoding
-				@standalone = version.standalone
-			else
-				super()
-				@version = version
-				self.encoding = encoding
-				@standalone = standalone
-			end
-			@version = DEFAULT_VERSION if @version.nil?
-		end
-
-		def clone
-			XMLDecl.new(self)
-		end
+        @standalone = version.standalone
+      else
+        super()
+        @version = version
+        self.encoding = encoding
+        @standalone = standalone
+      end
+      @version = DEFAULT_VERSION if @version.nil?
+    end
+
+    def clone
+      XMLDecl.new(self)
+    end
 
     # indent::
     #   Ignored.  There must be no whitespace before an XML declaration
@@ -43,35 +43,31 @@ module REXML
     #   Ignored
     # ie_hack::
     #   Ignored
-		def write(writer, indent=-1, transitive=false, ie_hack=false)
+    def write(writer, indent=-1, transitive=false, ie_hack=false)
       return nil unless @writethis or writer.kind_of? Output
-			writer << START.sub(/\\/u, '')
-      if writer.kind_of? Output
-        writer << " #{content writer.encoding}"
-      else
-        writer << " #{content encoding}"
-      end
-			writer << STOP.sub(/\\/u, '')
-		end
-
-		def ==( other )
-		  other.kind_of?(XMLDecl) and
-		  other.version == @version and
-		  other.encoding == self.encoding and
-		  other.standalone == @standalone
-		end
-
-		def xmldecl version, encoding, standalone
-			@version = version
-			self.encoding = encoding
-			@standalone = standalone
-		end
-
-		def node_type
-			:xmldecl
-		end
-
-		alias :stand_alone? :standalone
+      writer << START.sub(/\\/u, '')
+      writer << " #{content encoding}"
+      writer << STOP.sub(/\\/u, '')
+    end
+
+    def ==( other )
+      other.kind_of?(XMLDecl) and
+      other.version == @version and
+      other.encoding == self.encoding and
+      other.standalone == @standalone
+    end
+
+    def xmldecl version, encoding, standalone
+      @version = version
+      self.encoding = encoding
+      @standalone = standalone
+    end
+
+    def node_type
+      :xmldecl
+    end
+
+    alias :stand_alone? :standalone
     alias :old_enc= :encoding=
 
     def encoding=( enc )
@@ -108,12 +104,12 @@ module REXML
       START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
     end
 
-		private
-		def content(enc)
-			rv = "version='#@version'"
-			rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
-			rv << " standalone='#@standalone'" if @standalone
-			rv
-		end
-	end
+    private
+    def content(enc)
+      rv = "version='#@version'"
+      rv << " encoding='#{enc}'" if @writeencoding || enc !~ /\Autf-8\z/i
+      rv << " standalone='#@standalone'" if @standalone
+      rv
+    end
+  end
 end

data/lib/rexml/xmltokens.rb

@@ -1,18 +1,18 @@
 module REXML
-	# Defines a number of tokens used for parsing XML.  Not for general
-	# consumption.
-	module XMLTokens
-		NCNAME_STR= '[\w:][\-\w\d.]*'
-		NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
+  # Defines a number of tokens used for parsing XML.  Not for general
+  # consumption.
+  module XMLTokens
+    NCNAME_STR= '[\w:][\-\w.]*'
+    NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
 
-		NAMECHAR = '[\-\w\d\.:]'
-		NAME = "([\\w:]#{NAMECHAR}*)"
-		NMTOKEN = "(?:#{NAMECHAR})+"
-		NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
-		REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
+    NAMECHAR = '[\-\w\.:]'
+    NAME = "([\\w:]#{NAMECHAR}*)"
+    NMTOKEN = "(?:#{NAMECHAR})+"
+    NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
+    REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
 
-		#REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
-		#ENTITYREF = "&#{NAME};"
-		#CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
-	end
+    #REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
+    #ENTITYREF = "&#{NAME};"
+    #CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
+  end
 end

data/lib/rexml/xpath.rb

@@ -2,65 +2,79 @@ require 'rexml/functions'
 require 'rexml/xpath_parser'
 
 module REXML
-	# Wrapper class.  Use this class to access the XPath functions.
-	class XPath
-		include Functions
-		EMPTY_HASH = {}
+  # Wrapper class.  Use this class to access the XPath functions.
+  class XPath
+    include Functions
+    # A base Hash object, supposing to be used when initializing a
+    # default empty namespaces set, but is currently unused.
+    # TODO: either set the namespaces=EMPTY_HASH, or deprecate this.
+    EMPTY_HASH = {}
 
-		# Finds and returns the first node that matches the supplied xpath.
-		# element::
-		# 	The context element
-		# path::
-		# 	The xpath to search for.  If not supplied or nil, returns the first
-		# 	node matching '*'.
-		# namespaces::
-		# 	If supplied, a Hash which defines a namespace mapping.
-		#
-		#  XPath.first( node )
-		#  XPath.first( doc, "//b"} )
-		#  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
+    # Finds and returns the first node that matches the supplied xpath.
+    # element::
+    #   The context element
+    # path::
+    #   The xpath to search for.  If not supplied or nil, returns the first
+    #   node matching '*'.
+    # namespaces::
+    #   If supplied, a Hash which defines a namespace mapping.
+    # variables::
+    #   If supplied, a Hash which maps $variables in the query
+    #   to values. This can be used to avoid XPath injection attacks
+    #   or to automatically handle escaping string values.
+    #
+    #  XPath.first( node )
+    #  XPath.first( doc, "//b"} )
+    #  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
+    #  XPath.first( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"})
     def XPath::first element, path=nil, namespaces=nil, variables={}
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path, element).flatten[0]
-		end
+      parser = XPathParser.new
+      parser.namespaces = namespaces
+      parser.variables = variables
+      path = "*" unless path
+      element = [element] unless element.kind_of? Array
+      parser.parse(path, element).flatten[0]
+    end
 
-		# Iterates over nodes that match the given path, calling the supplied
-		# block with the match.
-		# element::
-		#   The context element
-		# path::
-		#   The xpath to search for.  If not supplied or nil, defaults to '*'
-		# namespaces::
-		# 	If supplied, a Hash which defines a namespace mapping
-		#
-		#  XPath.each( node ) { |el| ... }
-		#  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
-		#  XPath.each( node, 'ancestor::x' ) { |el| ... }
-		def XPath::each element, path=nil, namespaces=nil, variables={}, &block
+    # Iterates over nodes that match the given path, calling the supplied
+    # block with the match.
+    # element::
+    #   The context element
+    # path::
+    #   The xpath to search for.  If not supplied or nil, defaults to '*'
+    # namespaces::
+    #   If supplied, a Hash which defines a namespace mapping
+    # variables::
+    #   If supplied, a Hash which maps $variables in the query
+    #   to values. This can be used to avoid XPath injection attacks
+    #   or to automatically handle escaping string values.
+    #
+    #  XPath.each( node ) { |el| ... }
+    #  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
+    #  XPath.each( node, 'ancestor::x' ) { |el| ... }
+    #  XPath.each( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) \
+    #    {|el| ... }
+    def XPath::each element, path=nil, namespaces=nil, variables={}, &block
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path, element).each( &block )
-		end
+      parser = XPathParser.new
+      parser.namespaces = namespaces
+      parser.variables = variables
+      path = "*" unless path
+      element = [element] unless element.kind_of? Array
+      parser.parse(path, element).each( &block )
+    end
 
-		# Returns an array of nodes matching a given XPath.  
-		def XPath::match element, path=nil, namespaces=nil, variables={}
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path,element)
-		end
-	end
+    # Returns an array of nodes matching a given XPath.
+    def XPath::match element, path=nil, namespaces=nil, variables={}
+      parser = XPathParser.new
+      parser.namespaces = namespaces
+      parser.variables = variables
+      path = "*" unless path
+      element = [element] unless element.kind_of? Array
+      parser.parse(path,element)
+    end
+  end
 end