Changeset 139

Timestamp:

04/17/2007 17:34:54 (20 months ago)

Author:

why

Message:

• lib/hpricot/xchar.rb: in case of unknown characters.
  
• lib/hpricot/builder.rb: subtle bug, was causing some Hackety Hack elements to be un-designable.
  
• lib/hpricot/tag.rb: inner_text returns unescaped text.
  

Location:

trunk/lib/hpricot

Files:

• builder.rb (modified) (1 diff)
• tag.rb (modified) (1 diff)
• xchar.rb (modified) (1 diff)

trunk/lib/hpricot/builder.rb

@@ -191 +191 @@
       if block or args.any?
         args.push(@attrs)
-        @builder.tag! @sym, *args, &block
+        return @builder.tag! @sym, *args, &block
       end
       

trunk/lib/hpricot/tag.rb

@@ -138 +138 @@
     alterable :content
     def pathname; "text()" end
-    alias_method :inner_text, :content
     def to_s
       Hpricot.uxs(@content)
     end
+    alias_method :inner_text, :to_s
     alias_method :to_plain_text, :to_s
     def output(out, opts = {})

trunk/lib/hpricot/xchar.rb

@@ -87 +87 @@
     # XML unescape
     def uxs(str)
-      str.gsub(/\&\w+;/) { |x| XChar::PREDEFINED_U[x].chr }.
+      str.gsub(/\&\w+;/) { |x| (XChar::PREDEFINED_U[x] || ??).chr }.
           gsub(/\&\#(\d+);/) { [$1.to_i].pack("U*") }
     end