Changeset 125

Timestamp:

03/28/2007 22:15:06 (20 months ago)

Author:

why

Message:

• lib/hpricot: more work on the markaby-like stuff, entities, simplifying css proxy.
  

Location:

trunk

Files:

• lib/hpricot/builder.rb (modified) (4 diffs)
• lib/hpricot/tag.rb (modified) (1 diff)
• lib/hpricot/xchar.rb (added)
• test/test_builder.rb (added)

trunk/lib/hpricot/builder.rb

@@ -1 +1 @@
 require 'hpricot/tags'
+require 'hpricot/xchar'
 require 'hpricot/blankslate'
 
@@ -25 +26 @@
     def self.set(option, value)
       @@default[option] = value
+    end
+
+    # Write a +string+ to the HTML stream, making sure to escape it.
+    def text!(string)
+      @children << Text.new(Hpricot.xs(string))
     end
 
@@ -67 +73 @@
       childs = []
       attrs = args.grep(Hash)
-      childs.concat((args - attrs).map { |x| Text.new(x) })
+      childs.concat((args - attrs).map { |x| Text.new(Hpricot.xs(x)) })
       attrs = attrs.inject({}) { |hsh, hsh2| hsh.merge(hsh2) }
 
@@ -171 +177 @@
       end
       
-      args.push(@attrs)
-      
-      if block
+      if block or args.any?
+        args.push(@attrs)
         @builder.tag! @sym, *args, &block
-      else
-        @builder.tag! @sym, *args
       end
       

trunk/lib/hpricot/tag.rb

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