Changeset 130

Timestamp:

04/03/2007 23:48:46 (20 months ago)

Author:

why

Message:

• lib/hpricot/parse.rb: XML tags and attribs are no longer downcased.
  
• lib/hpricot/elements.rb: expression "//text" matches tag named "text" rather than text nodes. use "//text()" for text nodes.
  

Location:

trunk

Files:

• lib/hpricot/elements.rb (modified) (1 diff)
• lib/hpricot/inspect.rb (modified) (1 diff)
• lib/hpricot/parse.rb (modified) (4 diffs)
• lib/hpricot/tag.rb (modified) (1 diff)
• test/test_xml.rb (modified) (1 diff)

trunk/lib/hpricot/elements.rb

@@ -223 +223 @@
                 nodes, = Elements.filter(nodes, m[2], false)
             else
-                meth = "filter[#{m[0]}#{m[1]}]"
-                if Traverse.method_defined? meth
+                meth = "filter[#{m[0]}#{m[1]}]" unless m[0].empty?
+                if meth and Traverse.method_defined? meth
                     args = m[2..-1]
                 else

trunk/lib/hpricot/inspect.rb

@@ -61 +61 @@
         q.text @name
 
-        if @attributes
-          @attributes.each {|n, t|
+        if @raw_attributes
+          @raw_attributes.each {|n, t|
             q.breakable
-            q.text "#{n}=\"#{t}\""
+            q.text "#{n}=\"#{Hpricot.uxs(t)}\""
           }
         end

trunk/lib/hpricot/parse.rb

@@ -29 +29 @@
       raise ArgumentError, "An Hpricot document must be built from an input source (a String) or a block."
     end
+
+    trans = opts[:xml] ? :to_s : :downcase
 
     fragment =
@@ -49 +51 @@
       Hpricot.scan(input) do |token|
         if stack.last[5] == :CDATA and ![:procins, :comment, :cdata].include?(token[0]) and
-            !(token[0] == :etag and token[1].downcase == stack.last[0])
+            !(token[0] == :etag and token[1].send(trans) == stack.last[0])
           token[0] = :text
           token[1] = token[3] if token[3]
@@ -60 +62 @@
           end
 
-          stagname = token[0] = token[1].downcase
+          stagname = token[0] = token[1].send(trans)
           if ElementContent[stagname] == :EMPTY and !opts[:xml]
             token[0] = :emptytag
@@ -105 +107 @@
               end
             end
+            unless opts[:xml]
+              case token[2] when Hash
+                token[2] = token[2].inject({}) { |hsh,(k,v)| hsh[k.downcase] = v; hsh }
+              end
+            end
             stack << [stagname, token, [], excluded_tags, included_tags, uncontainable_tags]
           end
         when :etag
-          etagname = token[0] = token[1].downcase
+          etagname = token[0] = token[1].send(trans)
           if opts[:xhtml_strict] and not ElementContent.has_key? etagname
             etagname = token[0] = "div"

trunk/lib/hpricot/tag.rb

@@ -93 +93 @@
   class STag < BaseEle
     def initialize(name, attributes=nil)
-      @name = name.to_s.downcase
-      @raw_attributes = {}
-      if attributes
-        @raw_attributes = attributes.inject({}) { |hsh,(k,v)| hsh[k.to_s.downcase] = v; hsh }
-      end
+      @name = name.to_s
+      @raw_attributes = attributes || {}
     end
     alterable :name, :raw_attributes

trunk/test/test_xml.rb

@@ -14 +14 @@
   end
 
-  def test_tag_case
+  # make sure XML doesn't get downcased
+  def test_casing
     doc = Hpricot::XML(TestFiles::WHY)
-    # Hpricot currently downcase-s everything, so this test would fail:
+    assert_equal "hourly", (doc.at "sy:updatePeriod").inner_html
+    assert_equal 1, (doc/"guid[@isPermaLink]").length
+  end
 
-    # assert_equal "hourly", (doc.at "sy:updatePeriod").inner_html
+  # be sure tags named "text" are ok
+  def test_text_tags
+    doc = Hpricot::XML("<feed><title>City Poisoned</title><text>Rita Lee has poisoned Brazil.</text></feed>")
+    assert_equal "City Poisoned", (doc/"title").text
   end
 end