hpricot 0.8.1 → 0.8.2

data/ext/hpricot_scan/hpricot_scan.rl

@@ -132,6 +132,8 @@ static VALUE reProcInsParse;
   }
 
   action save_attr {
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 

data/lib/hpricot/tag.rb

@@ -38,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
@@ -54,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"
@@ -102,10 +124,7 @@ module Hpricot
   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
 

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'test/unit'
@@ -35,14 +36,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 +79,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>")

data/test/test_preserved.rb

@@ -5,6 +5,15 @@ require 'test/unit'
 require 'hpricot'
 require 'load_files'
 
+unless "".respond_to?(:lines)
+  require 'enumerator'
+  class String
+    def lines
+      Enumerable::Enumerator.new(self, :each_line)
+    end
+  end
+end
+
 class TestPreserved < Test::Unit::TestCase
   def assert_roundtrip str
     doc = Hpricot(str)
@@ -53,6 +62,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: hpricot
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - why the lucky stiff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-03 00:00:00 -07:00
+date: 2009-11-05 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -18,8 +18,8 @@ email: why@ruby-lang.org
 executables: []
 
 extensions: 
-- ext/hpricot_scan/extconf.rb
 - ext/fast_xs/extconf.rb
+- ext/hpricot_scan/extconf.rb
 extra_rdoc_files: 
 - README
 - CHANGELOG
@@ -29,54 +29,55 @@ files:
 - COPYING
 - README
 - Rakefile
-- test/test_paths.rb
-- test/test_preserved.rb
-- test/test_parser.rb
-- test/files
+- test/files/basic.xhtml
+- test/files/boingboing.html
 - test/files/cy0.html
+- test/files/immob.html
 - test/files/pace_application.html
-- test/files/basic.xhtml
+- test/files/tenderlove.html
+- test/files/uswebgen.html
 - test/files/utf8.html
-- test/files/boingboing.html
 - test/files/week9.html
-- test/files/tenderlove.html
-- test/files/immob.html
 - test/files/why.xml
-- test/files/uswebgen.html
 - test/load_files.rb
 - test/nokogiri-bench.rb
+- test/test_alter.rb
 - test/test_builder.rb
+- test/test_parser.rb
+- test/test_paths.rb
+- test/test_preserved.rb
 - test/test_xml.rb
-- test/test_alter.rb
-- lib/hpricot
-- lib/hpricot/tags.rb
+- lib/hpricot/blankslate.rb
 - lib/hpricot/builder.rb
-- lib/hpricot/traverse.rb
 - lib/hpricot/elements.rb
-- lib/hpricot/modules.rb
+- lib/hpricot/htmlinfo.rb
 - lib/hpricot/inspect.rb
+- lib/hpricot/modules.rb
+- lib/hpricot/parse.rb
 - lib/hpricot/tag.rb
-- lib/hpricot/blankslate.rb
+- lib/hpricot/tags.rb
+- lib/hpricot/traverse.rb
 - lib/hpricot/xchar.rb
-- lib/hpricot/htmlinfo.rb
-- lib/hpricot/parse.rb
 - lib/hpricot.rb
 - extras/mingw-rbconfig.rb
 - ext/hpricot_scan/hpricot_scan.h
-- ext/hpricot_scan/HpricotScanService.java
 - ext/fast_xs/FastXsService.java
-- ext/hpricot_scan/hpricot_scan.c
-- ext/hpricot_scan/hpricot_css.c
+- ext/hpricot_scan/HpricotCss.java
+- ext/hpricot_scan/HpricotScanService.java
 - ext/fast_xs/fast_xs.c
-- ext/hpricot_scan/test.rb
-- ext/hpricot_scan/extconf.rb
+- ext/hpricot_scan/hpricot_css.c
+- ext/hpricot_scan/hpricot_scan.c
 - ext/fast_xs/extconf.rb
-- ext/hpricot_scan/hpricot_scan.rl
-- ext/hpricot_scan/hpricot_scan.java.rl
-- ext/hpricot_scan/hpricot_css.rl
+- ext/hpricot_scan/extconf.rb
 - ext/hpricot_scan/hpricot_common.rl
+- ext/hpricot_scan/hpricot_css.java.rl
+- ext/hpricot_scan/hpricot_css.rl
+- ext/hpricot_scan/hpricot_scan.java.rl
+- ext/hpricot_scan/hpricot_scan.rl
 has_rdoc: true
 homepage: http://code.whytheluckystiff.net/hpricot/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --quiet
@@ -102,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobix
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: a swift, liberal HTML parser with a fantastic library
 test_files: []
 

data/ext/hpricot_scan/test.rb

@@ -1,4 +0,0 @@
-require './hpricot_scan.so'
-
-doc = "<doc><person><test>YESSS</test></person><train>SET</train></doc>"
-p Hpricot.scan(doc)