hpricot 0.7 → 0.8

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
@@ -77,13 +78,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,7 +99,7 @@ module Hpricot
     end
   end
 
-  class ETag
+  class BogusETag
     def initialize name; self.name = name end
     def output(out, opts = {})
       out <<
@@ -111,7 +109,7 @@ module Hpricot
     end
   end
 
-  class BogusETag
+  class ETag < BogusETag
     def output(out, opts = {}); out << if_output(opts) { '' }; end
   end
 
@@ -136,6 +134,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
@@ -174,6 +174,7 @@ module Hpricot
 
   class ProcIns
     def pathname; "procins()" end
+    def raw_string; output("") end
     def output(out, opts = {})
       out << 
         if_output(opts) do
@@ -186,6 +187,7 @@ module Hpricot
 
   class Comment
     def pathname; "comment()" end
+    def raw_string; "<!--#{content}-->" end
     def output(out, opts = {})
       out <<
         if_output(opts) do

data/test/test_parser.rb

@@ -406,4 +406,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hpricot
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: "0.8"
 platform: ruby
 authors: 
 - why the lucky stiff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-17 00:00:00 -07:00
+date: 2009-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: []