Changeset 155

Timestamp:

08/31/2007 17:30:41 (15 months ago)

Author:

why

Message:

* lib/hpricot/traverse.rb: Element.make, for building fragments using the same options used to parse the doc. (thanks go to Rick Wargo for talking about this openly.)
* lib/hpricot/: switched almost every use of Hpricot.make with ele.make.

Location:

trunk

Files:

• lib/hpricot/elements.rb (modified) (5 diffs)
• lib/hpricot/parse.rb (modified) (1 diff)
• lib/hpricot/tag.rb (modified) (2 diffs)
• lib/hpricot/traverse.rb (modified) (4 diffs)
• test/test_alter.rb (modified) (1 diff)

trunk/lib/hpricot/elements.rb

@@ -131 +131 @@
     # Pass in an HTML +str+, which is turned into Hpricot elements.
     def append(str = nil, &blk)
-      each { |x| x.html(x.children + Hpricot.make(str, &blk)) }
+      each { |x| x.html(x.children + x.make(str, &blk)) }
     end
 
@@ -137 +137 @@
     # Pass in an HTML +str+, which is turned into Hpricot elements.
     def prepend(str = nil, &blk)
-      each { |x| x.html(Hpricot.make(str, &blk) + x.children) }
+      each { |x| x.html(x.make(str, &blk) + x.children) }
     end
  
@@ -143 +143 @@
     # Pass in an HTML +str+, which is turned into Hpricot elements.
     def before(str = nil, &blk)
-      each { |x| x.parent.insert_before Hpricot.make(str, &blk), x }
+      each { |x| x.parent.insert_before x.make(str, &blk), x }
     end
 
@@ -149 +149 @@
     # Pass in an HTML +str+, which is turned into Hpricot elements.
     def after(str = nil, &blk)
-      each { |x| x.parent.insert_after Hpricot.make(str, &blk), x }
+      each { |x| x.parent.insert_after x.make(str, &blk), x }
     end
 
@@ -162 +162 @@
     def wrap(str = nil, &blk)
       each do |x|
-        wrap = Hpricot.make(str, &blk)
+        wrap = x.make(str, &blk)
         nest = wrap.detect { |w| w.respond_to? :children }
         unless nest

trunk/lib/hpricot/parse.rb

@@ -13 +13 @@
   # represented by Hpricot::Doc.
   def Hpricot.parse(input = nil, opts = {}, &blk)
-    Doc.new(make(input, opts, &blk))
+    Doc.new(make(input, opts, &blk), opts)
   end
 
   # Hpricot::XML parses <i>input</i>, disregarding all the HTML rules
   # and returning a document tree.
-  def Hpricot.XML(input, opts = {})
-    Doc.new(make(input, opts.merge(:xml => true)))
+  def Hpricot.XML(input = nil, opts = {}, &blk)
+    opts.merge! :xml => true
+    Doc.new(make(input, opts, &blk), opts)
   end
 

trunk/lib/hpricot/tag.rb

@@ -4 +4 @@
   class Doc
     attr_accessor :children
-    def initialize(children = [])
+    def initialize(children = [], options = {})
       @children = children ? children.each { |c| c.parent = self }  : []
+      @options = options
     end
     def output(out, opts = {})
@@ -12 +13 @@
       end
       out
+    end
+    def make(input = nil, &blk)
+      Hpricot.make(input, @options, &blk)
     end
     def altered!; end

trunk/lib/hpricot/traverse.rb

@@ -21 +21 @@
     def bogusetag?() BogusETag::Trav === self end
 
+    # Parses an HTML string, making an HTML fragment based on
+    # the options used to create the container document.
+    def make(input = nil, &blk)
+      if parent and parent.respond_to? :make
+        parent.make(input, &blk)
+      else
+        Hpricot.make(input, &blk)
+      end
+    end
+
     # Builds an HTML string from this node and its contents.
     # If you need to write to a stream, try calling <tt>output(io)</tt>
@@ -110 +120 @@
     # Adds elements immediately after this element, contained in the +html+ string.
     def after(html = nil, &blk)
-      parent.insert_after(Hpricot.make(html, &blk), self)
+      parent.insert_after(make(html, &blk), self)
     end
 
     # Adds elements immediately before this element, contained in the +html+ string.
     def before(html = nil, &blk)
-      parent.insert_before(Hpricot.make(html, &blk), self)
+      parent.insert_before(make(html, &blk), self)
     end
 
@@ -123 +133 @@
     def swap(html = nil, &blk)
       parent.altered!
-      parent.replace_child(self, Hpricot.make(html, &blk))
+      parent.replace_child(self, make(html, &blk))
     end
 
@@ -159 +169 @@
           self.children = inner
         else
-          self.children = Hpricot.make(inner, &blk)
+          self.children = make(inner, &blk)
         end
         reparent self.children

trunk/test/test_alter.rb

@@ -59 +59 @@
   end
 
+  def test_xml_casing
+    doc = Hpricot.XML("<root><wildCat>text</wildCat></root>")
+    (doc/:root/:wildCat).after("<beanPole>gravity</beanPole>")
+    assert_equal doc.to_s, "<root><wildCat>text</wildCat><beanPole>gravity</beanPole></root>"
+
+    frag = Hpricot.XML do
+      b { i "A bit of HTML" }
+    end
+    (frag/:b).after("<beanPole>gravity</beanPole>")
+    assert_equal frag.to_s, "<b><i>A bit of HTML</i></b><beanPole>gravity</beanPole>"
+  end
+
   def assert_changed original, selector, set, &block
     assert set.all?(&block)