Changeset 16

Timestamp:

07/07/2006 15:09:28 (2 years ago)

Author:

why

Message:

• lib/hpricot/elements.rb: from JQuery: remove, empty, append, prepend, before, after, wrap, set, html(...), to_html, to_s.
  
• lib/hpricot/traverse.rb: to_html, replace_child, insert_before, insert_after, innerHTML=.
  
• lib/hpricot/parse.rb: Hpricot.make returns nodes without document, Hpricot(...) is an alias for parse.
  
• lib/hpricot/tag.rb: open up all properties to setters, let people do as they may.
  
• test/test_parser.rb: simple textnode parse, use to_html for the full html.
  
• ext/hpricot_scan/hpricot_scan.rl: return the final text node, if it has content.
  

Location:

trunk

Files:

• ext/hpricot_scan/hpricot_scan.rl (modified) (1 diff)
• lib/hpricot/elements.rb (modified) (3 diffs)
• lib/hpricot/parse.rb (modified) (3 diffs)
• lib/hpricot/tag.rb (modified) (2 diffs)
• lib/hpricot/traverse.rb (modified) (3 diffs)
• test/test_parser.rb (modified) (2 diffs)

trunk/ext/hpricot_scan/hpricot_scan.rl

@@ -233 +233 @@
       if ( mark_tag != NULL && text == 1 )
       {
-        CAT(tag, p);
+        if (done)
+        {
+          if (mark_tag < p-1)
+          {
+            CAT(tag, p-1);
+            ELE(text);
+          }
+        }
+        else
+        {
+          CAT(tag, p);
+        }
       }
       mark_tag = buf;

trunk/lib/hpricot/elements.rb

@@ -6 +6 @@
     alias_method :/, :search
 
-    def html
-      map { |x| x.innerHTML }.join
-    end
+    def to_html
+      map { |x| x.output("") }.join
+    end
+    alias_method :to_s, :to_html
+
+    def html(str = nil)
+      if str
+        self.html = str
+      else
+        map { |x| x.innerHTML }.join
+      end
+    end
+    alias_method :text, :html
 
     def html=(str)
@@ -17 +27 @@
         nodes, = Elements.filter(self, expr)
         nodes
+    end
+
+    def remove
+      each { |x| x.parent.children.delete(x) }
+    end
+
+    def empty
+      each { |x| x.innerHTML = nil }
+    end
+
+    def append(str)
+      each { |x| x.innerHTML += str }
+    end
+
+    def prepend(str)
+      each { |x| x.innerHTML = str + x.innerHTML }
+    end
+
+    def before(str)
+      each { |x| x.parent.insert_before Hpricot.make(str), x }
+    end
+
+    def after(str)
+      each { |x| x.parent.insert_after Hpricot.make(str), x }
+    end
+
+    def wrap(str)
+      each do |x|
+        wrap = Hpricot.make(str)
+        nest = wrap.detect { |w| w.respond_to? :children }
+        unless nest
+          raise Exception, "No wrapping element found."
+        end
+        x.parent.replace_child(x, wrap)
+        nest = nest.children.first until nest.empty?
+        nest.children << x
+      end
     end
 
@@ -28 +75 @@
     end
 
-    def set(k, v)
+    def set(k, v = nil)
+      case k
+      when Hash
+        each do |node|
+          k.each { |a,b| node.set_attribute(a, b) }
+        end
+      else
         each do |node|
           node.set_attribute(k, v)
         end
+      end
     end
 

trunk/lib/hpricot/parse.rb

@@ -1 +1 @@
 require 'hpricot/htmlinfo'
+
+def Hpricot(input)
+  Hpricot.parse(input)
+end
 
 module Hpricot
@@ -5 +9 @@
   # represented by Hpricot::Doc.
   def Hpricot.parse(input)
-    parse_as(input)
+    Doc.new(make(input))
   end
 
   # :stopdoc:
 
-  def Hpricot.parse_as(input)
+  def Hpricot.make(input)
     stack = [[nil, nil, []]]
     Hpricot.scan(input) do |token|
@@ -53 +57 @@
     structure_list = stack[0][2]
     # structure_list = fix_structure_list(stack[0][2])
-    nodes = structure_list.map {|s| build_node(s) }
-    Doc.new(nodes)
+    structure_list.map {|s| build_node(s) }
   end
 

trunk/lib/hpricot/tag.rb

@@ -29 +29 @@
     end
     def empty?; @children.empty? end
-    [:name, :attributes, :parent, :parent=].each do |m|
-      define_method(m) { |*a| @stag.send(m, *a) }
+    [:name, :attributes, :parent].each do |m|
+      [m, "#{m}="].each { |m2| define_method(m2) { |*a| @stag.send(m2, *a) } }
     end
     def output(out)
@@ -49 +49 @@
       @attributes = attributes
     end
-    attr_reader :name, :attributes
+    attr_accessor :name, :attributes
     def attributes_as_html
       if @attributes

trunk/lib/hpricot/traverse.rb

@@ -13 +13 @@
     def bogusetag?() BogusETag::Trav === self end
 
+    def to_html
+      output("")
+    end
+    alias_method :to_s, :to_html
+
     def get_subnode(*indexes)
       n = self
@@ -26 +31 @@
       children.grep(Container::Trav)
     end
+    def replace_child(old, new)
+      children[children.index(old), 1] = [*new]
+    end
+    def insert_before(nodes, ele)
+      case nodes
+      when Array
+        nodes.each { |n| insert_before(n, ele) }
+      else
+        children[children.index(ele) || 0, 0] = nodes
+      end
+    end
+    def insert_after(nodes, ele)
+      case nodes
+      when Array
+        nodes.each { |n| insert_after(n, ele) }
+      else
+        idx = children.index(ele)
+        children[idx ? idx + 1 : children.length, 0] = nodes
+      end
+    end
     def innerHTML
-      output("")
+      children.map { |x| x.output("") }.join
+    end
+    def innerHTML=(inner)
+      case inner
+      when String, IO
+        self.children = Hpricot.parse(inner).children
+      when Array
+        self.children = inner
+      when nil
+        self.children = []
+      end
     end
     def search(expr, &blk)
@@ -449 +484 @@
   module Elem::Trav
     def has_attribute?(name)
-      attributes && attributes.has_key?(name)
+      self.attributes && self.attributes.has_key?(name.to_s)
     end
     def get_attribute(name)
-      attributes && attributes[name]
+      self.attributes && self.attributes[name.to_s]
     end
     def set_attribute(name, val)
-      attributes ||= {}
-      attributes[name] = val
+      self.attributes ||= {}
+      self.attributes[name.to_s] = val
     end
   end

trunk/test/test_parser.rb

@@ -15 +15 @@
   #   assert_equal '', @basic.search('//p').map { |x| x.attributes }
   # end
+
+  def test_scan_text
+    assert_equal 'FOO', Hpricot.make("FOO").first.content
+  end
 
   def test_get_element_by_id
@@ -92 +96 @@
     assert_equal 2, @boingboing.search('//table/tr:last').length
     assert_equal "<p>The third paragraph</p>",
-        @basic.search('p:eq(2)').html
+        @basic.search('p:eq(2)').to_html
     assert_equal '<p class="last final"><b>THE FINAL PARAGRAPH</b></p>',
-        @basic.search('p:last').html
+        @basic.search('p:last').to_html
     assert_equal 'last final', @basic.search('//p:last-of-type').first.get_attribute('class').to_s
   end