hpricot_scrub 0.3.4 → 0.3.5

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+2009-03-30 Mina Naguib <mina.hpricotscrub@naguib.ca>
+	Release 0.3.5
+	- Fixes for recent versions of hpricot:
+	- Fix fatal error scrubbing anything that has no children (such as an
+	EmptyElem)
+	- Fix fatal error removing elements with no children
+
 2008-11-02 Michael <michael@underpantsgnome.com>
 	Release 0.3.4
 	- Fix gem command test - Thanks David Masover

data/History.txt

@@ -1,3 +1,10 @@
+2009-03-30 Mina Naguib <mina.hpricotscrub@naguib.ca>
+	Release 0.3.5
+	- Fixes for recent versions of hpricot:
+	- Fix fatal error scrubbing anything that has no children (such as an
+	EmptyElem)
+	- Fix fatal error removing elements with no children
+
 2008-11-02 Michael <michael@underpantsgnome.com>
 	Release 0.3.4
 	- Fix gem command test - Thanks David Masover

data/lib/hpricot_scrub/hpricot_scrub.rb

@@ -167,7 +167,11 @@ module Hpricot
     end
 
     def strip
-      swap(inner_html)
+      if (i = inner_html) != ""
+        swap(i)
+      else
+        remove
+      end
     end
 
     #
@@ -189,7 +193,7 @@ module Hpricot
 
       config = Scrub::normalize_config(config)
 
-      children.reverse.each do |child|
+      (children || []).reverse.each do |child|
         child.scrub(config) if child.scrubbable?
       end
 

data/lib/hpricot_scrub/version.rb

@@ -2,7 +2,7 @@ module HpricotScrub #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/hpricot_scrub_test.rb

@@ -93,6 +93,11 @@ class HpricotScrubTest < Test::Unit::TestCase
      end
   end
 
+  def test_elem_emptyelem
+    h = Hpricot("<br>")
+    assert_equal "", h.scrub.to_s
+  end
+
   def test_attr_default_rule_removes
      @scrubbed_docs.each do |doc|
        assert_equal 0, doc.search("*[@mce_src]").length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hpricot_scrub
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - UnderpantsGnome
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-02 01:00:00 -05:00
+date: 2009-03-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.9.0
     version: 
 description: Scrub HTML with Hpricot
 email: michael@underpantsgnome.com
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hpricot-scrub
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Scrub HTML with Hpricot