adamh-hpricot 0.6.211 → 0.7.229

data/lib/hpricot/elements.rb

@@ -422,7 +422,7 @@ module Hpricot
       case arg 
       when 'even'; (parent.containers.index(self) + 1) % 2 == 0
       when 'odd';  (parent.containers.index(self) + 1) % 2 == 1
-      else         self == (parent.containers[arg.to_i + 1])
+      else         self == (parent.containers[arg.to_i - 1])
       end
     end
 

data/lib/hpricot/inspect.rb

@@ -11,7 +11,7 @@ module Hpricot
 
   class Doc
     def pretty_print(q)
-      q.object_group(self) { children.each {|elt| q.breakable; q.pp elt } }
+      q.object_group(self) { children.each {|elt| q.breakable; q.pp elt } if children }
     end
     alias inspect pretty_print_inspect
   end
@@ -47,7 +47,7 @@ module Hpricot
             children.each {|elt| q.breakable; q.pp elt }
           end
           if etag
-            q.breakable; q.pp etag
+            q.breakable; q.text etag
           end
         }
       end

data/lib/hpricot/modules.rb

@@ -8,11 +8,13 @@ module Hpricot
   # :startdoc:
 
   module Node; include Hpricot end
+    class ETag; include Node end
     module Container; include Node end
       class Doc; include Container end
       class Elem; include Container end
 
     module Leaf; include Node end
+      class CData; include Leaf end
       class Text; include Leaf end
       class XMLDecl; include Leaf end
       class DocType; include Leaf end

data/lib/hpricot/tag.rb

@@ -17,10 +17,11 @@ module Hpricot
     end
   end
 
-  class BaseEle
+  module Node
     def html_quote(str)
       "\"" + str.gsub('"', '\\"') + "\""
     end
+    def clear_raw; end
     def if_output(opts)
       if opts[:preserve] and not raw_string.nil?
         raw_string
@@ -37,15 +38,20 @@ module Hpricot
     end
   end
 
-  class Elem
-    def initialize tag, attrs = nil, children = nil, etag = nil
-      self.name, self.raw_attributes, self.children, self.etag =
-        tag, attrs, children, etag
+  class Attributes
+    attr_accessor :element
+    def initialize e
+      @element = e
     end
-    def empty?; children.nil? or children.empty? end
-    def attributes
-      if raw_attributes
-        raw_attributes.inject({}) do |hsh, (k, v)|
+    def [] k 
+      Hpricot.uxs((@element.raw_attributes || {})[k])
+    end
+    def []= k, v
+      (@element.raw_attributes ||= {})[k] = v.fast_xs
+    end
+    def to_hash
+      if @element.raw_attributes
+        @element.raw_attributes.inject({}) do |hsh, (k, v)|
           hsh[k] = Hpricot.uxs(v)
           hsh
         end
@@ -53,6 +59,23 @@ module Hpricot
         {}
       end
     end
+    def to_s
+      to_hash.to_s
+    end
+    def inspect
+      to_hash.inspect
+    end
+  end
+
+  class Elem
+    def initialize tag, attrs = nil, children = nil, etag = nil
+      self.name, self.raw_attributes, self.children, self.etag =
+        tag, attrs, children, etag
+    end
+    def empty?; children.nil? or children.empty? end
+    def attributes
+      Attributes.new self
+    end
     def to_plain_text
       if self.name == 'br'
         "\n"
@@ -77,13 +100,10 @@ module Hpricot
       if children
         children.each { |n| n.output(out, opts) }
       end
-      if etag
-        etag.output(out, opts)
-      elsif !opts[:preserve] && !empty?
-        out <<
-          if_output(opts) do
-            "</#{name}>"
-          end
+      if opts[:preserve]
+        out << etag if etag
+      elsif etag or !empty?
+        out << "</#{name}>"
       end
       out
     end
@@ -101,17 +121,14 @@ module Hpricot
     end
   end
 
-  class ETag
+  class BogusETag
     def initialize name; self.name = name end
     def output(out, opts = {})
-      out <<
-        if_output(opts) do
-          "</#{name}>"
-        end
+      out << if_output(opts) { "" }
     end
   end
 
-  class BogusETag
+  class ETag < BogusETag
     def output(out, opts = {}); out << if_output(opts) { '' }; end
   end
 
@@ -137,6 +154,8 @@ module Hpricot
     def initialize content; self.content = content end
     alias_method :to_s, :content
     alias_method :to_plain_text, :content
+    alias_method :inner_text, :content
+    def raw_string; "<![CDATA[#{content}]]>" end
     def output(out, opts = {})
       out <<
         if_output(opts) do
@@ -175,6 +194,7 @@ module Hpricot
 
   class ProcIns
     def pathname; "procins()" end
+    def raw_string; output("") end
     def output(out, opts = {})
       out << 
         if_output(opts) do
@@ -187,6 +207,7 @@ module Hpricot
 
   class Comment
     def pathname; "comment()" end
+    def raw_string; "<!--#{content}-->" end
     def output(out, opts = {})
       out <<
         if_output(opts) do

data/lib/hpricot/traverse.rb

@@ -194,6 +194,7 @@ module Hpricot
     alias_method :innerHTML=, :inner_html=
 
     def reparent(nodes)
+      return unless nodes
       altered!
       [*nodes].each { |e| e.parent = self }
     end

data/test/test_alter.rb

@@ -35,14 +35,22 @@ class TestAlter < Test::Unit::TestCase
   end
   
   def test_change_attributes
-    all_ps = (@basic/"p").attr("title", "Some Title")
+    all_ps = (@basic/"p").attr("title", "Some Title & Etc…")
     all_as = (@basic/"a").attr("href", "http://my_new_href.com")
     all_lb = (@basic/"link").attr("href") { |e| e.name }
-    assert_changed(@basic, "p", all_ps) {|p| p.attributes["title"] == "Some Title"}
+    assert_changed(@basic, "p", all_ps) {|p| p.raw_attributes["title"] == "Some Title &amp; Etc&#8230;"}
     assert_changed(@basic, "a", all_as) {|a| a.attributes["href"] == "http://my_new_href.com"}
     assert_changed(@basic, "link", all_lb) {|a| a.attributes["href"] == "link" }
   end
   
+  def test_change_attributes2
+    all_as = (@basic%"a").attributes["href"] = "http://my_new_href.com"
+    all_ps = (@basic%"p").attributes["title"] = "Some Title & Etc…"
+    assert_equal (@basic%"a").raw_attributes["href"], "http://my_new_href.com"
+    assert_equal (@basic%"p").raw_attributes["title"], "Some Title &amp; Etc&#8230;"
+    assert_equal (@basic%"p").attributes["title"], "Some Title & Etc…"
+  end
+  
   def test_remove_attr
     all_rl = (@basic/"link").remove_attr("href")
     assert_changed(@basic, "link", all_rl) { |link| link['href'].nil? }
@@ -70,6 +78,16 @@ class TestAlter < Test::Unit::TestCase
     assert_equal frag.to_s, "<b><i>A bit of HTML</i></b><beanPole>gravity</beanPole>"
   end
 
+  def test_reparent_empty_nodes
+    doc = Hpricot("<div/>")
+    doc.root.inner_html = "foo"
+    assert_equal doc.root.inner_html, "foo"
+    doc.root.inner_html = ""
+    assert_equal doc.root.inner_html, ""
+    doc.root.swap { b "test" }
+    assert_equal doc.root.inner_html, "test"
+  end
+
   def assert_changed original, selector, set, &block
     assert set.all?(&block)
     assert Hpricot(original.to_html).search(selector).all?(&block)

data/test/test_parser.rb

@@ -227,6 +227,14 @@ class TestParser < Test::Unit::TestCase
     assert_kind_of Hpricot::Elements, @boingboing.search('//div/p').search('a img')
   end
 
+  def test_attr_casing
+    doc = Hpricot("<a HREF='a'>A simple <b>test</b> string.</a>")
+    assert_equal (doc % :a)[:href], "a"
+    assert_equal (doc % :a)[:HREF], nil
+    assert_equal (doc % :a)['href'], "a"
+    assert_equal (doc % :a)['HREF'], nil
+  end
+
   def test_class_search
     # test case sent by Chih-Chao Lam
     doc = Hpricot("<div class=xyz'>abc</div>")
@@ -406,4 +414,15 @@ class TestParser < Test::Unit::TestCase
       assert_equal "\303\251", Hpricot.uxs('&eacute;')
     end
   end
+
+  def test_cdata_inner_text
+    xml = Hpricot.XML(%{
+      <peon>
+        <id>96586</id>
+        <stdout><![CDATA[This is STDOUT]]></stdout>
+        <stderr><!-- IGNORE --><![CDATA[This is]]> STDERR</stderr>
+      </peon>})
+      assert_equal "This is STDOUT", (xml/:peon/:stdout).inner_text
+      assert_equal "This is STDERR", (xml/:peon/:stderr).inner_text
+  end
 end

data/test/test_preserved.rb

@@ -53,6 +53,15 @@ class TestPreserved < Test::Unit::TestCase
     assert_roundtrip TestFiles::CY0
   end
 
+  def test_fixup_link
+    doc = %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link>ht</link></channel></rss>}
+    assert_roundtrip doc
+    assert_equal Hpricot(doc).to_s,
+      %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link />ht</channel></rss>}
+    assert_equal Hpricot.XML(doc).to_s,
+      %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link>ht</link></channel></rss>}
+  end
+
   def test_escaping_of_attrs
     # ampersands in URLs
     str = %{<a href="http://google.com/search?q=hpricot&amp;l=en">Google</a>}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adamh-hpricot
 version: !ruby/object:Gem::Version 
-  version: 0.6.211
+  version: 0.7.229
 platform: ruby
 authors: 
 - why the lucky stiff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-07 00:00:00 -08:00
+date: 2009-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: []