loofah 1.0.0 → 1.1.0

data/test/integration/test_xml.rb

@@ -1,10 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require "helper"
 
-class TestXml < Test::Unit::TestCase
+class IntegrationTestXml < Loofah::TestCase
   context "integration test" do
     context "xml document" do
       context "custom scrubber" do
-        should "act as expected" do
+        it "act as expected" do
           xml = Loofah.xml_document <<-EOXML
             <root>
               <employee deceased='true'>Abraham Lincoln</employee>
@@ -30,7 +30,7 @@ class TestXml < Test::Unit::TestCase
 
     context "xml fragment" do
       context "custom scrubber" do
-        should "act as expected" do
+        it "act as expected" do
           xml = Loofah.xml_fragment <<-EOXML
             <employee deceased='true'>Abraham Lincoln</employee>
             <employee deceased='false'>Abe Vigoda</employee>

data/test/unit/test_api.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require "helper"
 
-class TestApi < Test::Unit::TestCase
+class UnitTestApi < Loofah::TestCase
 
   HTML          = "<div>a</div>\n<div>b</div>"
   XML_FRAGMENT  = "<div>a</div>\n<div>b</div>"
@@ -99,12 +99,12 @@ class TestApi < Test::Unit::TestCase
     node_set.scrub!(:strip)
   end
 
-  should "HTML::DocumentFragment exposes serialize_root" do
+  it "HTML::DocumentFragment exposes serialize_root" do
     doc = Loofah.fragment(HTML)
     assert_equal HTML, doc.serialize_root.to_html
   end
 
-  should "HTML::Document exposes serialize_root" do
+  it "HTML::Document exposes serialize_root" do
     doc = Loofah.document(HTML)
     assert_equal HTML, doc.serialize_root.children.to_html
   end

data/test/unit/test_encoding.rb

@@ -0,0 +1,20 @@
+# :coding: utf-8
+require "helper"
+
+class UnitTestEncoding < Loofah::TestCase
+  def setup
+    @utf8_string = "日本語"
+  end
+
+  if String.new.respond_to?(:encoding)
+    def test_html_fragment_string_sets_encoding
+      escaped = Loofah.scrub_fragment(@utf8_string, :escape).to_s
+      assert_equal @utf8_string.encoding, escaped.encoding
+    end
+
+    def test_xml_fragment_string_sets_encoding
+      escaped = Loofah.scrub_xml_fragment(@utf8_string, :escape).to_s
+      assert_equal @utf8_string.encoding, escaped.encoding
+    end
+  end
+end

data/test/unit/test_helpers.rb

@@ -1,25 +1,25 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require "helper"
 
-class TestHelpers < Test::Unit::TestCase
+class UnitTestHelpers < Loofah::TestCase
 
   HTML_STRING = "<div>omgwtfbbq</div>"
 
   context "#strip_tags" do
-    should "invoke Loofah.fragment.text" do
-      mock_doc = mock
-      Loofah.expects(:fragment).with(HTML_STRING).returns(mock_doc)
-      mock_doc.expects(:text)
+    it "invoke Loofah.fragment.text" do
+      mock_doc = Object.new
+      mock(Loofah).fragment(HTML_STRING) { mock_doc }
+      mock(mock_doc).text
 
       Loofah::Helpers.strip_tags HTML_STRING
     end
   end
 
   context "#sanitize" do
-    should "invoke Loofah.scrub_fragment(:strip).to_s" do
-      mock_doc = mock
-      Loofah.expects(:fragment).with(HTML_STRING).returns(mock_doc)
-      mock_doc.expects(:scrub!).with(:strip).returns(mock_doc)
-      mock_doc.expects(:to_s)
+    it "invoke Loofah.scrub_fragment(:strip).to_s" do
+      mock_doc = Object.new
+      mock(Loofah).fragment(HTML_STRING) { mock_doc }
+      mock(mock_doc).scrub!(:strip) { mock_doc }
+      mock(mock_doc).to_s
 
       Loofah::Helpers.sanitize HTML_STRING
     end

data/test/unit/test_scrubber.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require "helper"
 
-class TestScrubber < Test::Unit::TestCase
+class UnitTestScrubber < Loofah::TestCase
 
   FRAGMENT = "<span>hello</span><span>goodbye</span>"
   FRAGMENT_NODE_COUNT         = 4 # span, text, span, text
@@ -10,119 +10,119 @@ class TestScrubber < Test::Unit::TestCase
   DOCUMENT_NODE_STOP_TOP_DOWN = 1 # html
 
   context "receiving a block" do
-    setup do
+    before do
       @count = 0
     end
 
     context "returning CONTINUE" do
-      setup do
+      before do
         @scrubber = Loofah::Scrubber.new do |node|
           @count += 1
           Loofah::Scrubber::CONTINUE
         end
       end
 
-      should "operate properly on a fragment" do
+      it "operate properly on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_COUNT, @count
       end
 
-      should "operate properly on a document" do
+      it "operate properly on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_COUNT, @count
       end
     end
 
     context "returning STOP" do
-      setup do
+      before do
         @scrubber = Loofah::Scrubber.new do |node|
           @count += 1
           Loofah::Scrubber::STOP
         end
       end
 
-      should "operate as top-down on a fragment" do
+      it "operate as top-down on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_STOP_TOP_DOWN, @count
       end
 
-      should "operate as top-down on a document" do
+      it "operate as top-down on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_STOP_TOP_DOWN, @count
       end
     end
 
     context "returning neither CONTINUE nor STOP" do
-      setup do
+      before do
         @scrubber = Loofah::Scrubber.new do |node|
           @count += 1
         end
       end
 
-      should "act as if CONTINUE was returned" do
+      it "act as if CONTINUE was returned" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_COUNT, @count
       end
     end
 
     context "not specifying direction" do
-      setup do
+      before do
         @scrubber = Loofah::Scrubber.new() do |node|
           @count += 1
           Loofah::Scrubber::STOP
         end
       end
 
-      should "operate as top-down on a fragment" do
+      it "operate as top-down on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_STOP_TOP_DOWN, @count
       end
 
-      should "operate as top-down on a document" do
+      it "operate as top-down on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_STOP_TOP_DOWN, @count
       end
     end
 
     context "specifying top-down direction" do
-      setup do
+      before do
         @scrubber = Loofah::Scrubber.new(:direction => :top_down) do |node|
           @count += 1
           Loofah::Scrubber::STOP
         end
       end
 
-      should "operate as top-down on a fragment" do
+      it "operate as top-down on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_STOP_TOP_DOWN, @count
       end
 
-      should "operate as top-down on a document" do
+      it "operate as top-down on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_STOP_TOP_DOWN, @count
       end
     end
 
     context "specifying bottom-up direction" do
-      setup do
+      before do
         @scrubber = Loofah::Scrubber.new(:direction => :bottom_up) do |node|
           @count += 1
         end
       end
 
-      should "operate as bottom-up on a fragment" do
+      it "operate as bottom-up on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_COUNT, @count
       end
 
-      should "operate as bottom-up on a document" do
+      it "operate as bottom-up on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_COUNT, @count
       end
     end
 
     context "invalid direction" do
-      should "raise an exception" do
+      it "raise an exception" do
         assert_raises(ArgumentError) {
           Loofah::Scrubber.new(:direction => :quux) { }
         }
@@ -130,13 +130,13 @@ class TestScrubber < Test::Unit::TestCase
     end
 
     context "given a block taking zero arguments" do
-      setup do
+      before do
         @scrubber = Loofah::Scrubber.new do
           @count += 1
         end
       end
 
-      should "work anyway, shrug" do
+      it "work anyway, shrug" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_COUNT, @count
       end
@@ -144,7 +144,7 @@ class TestScrubber < Test::Unit::TestCase
   end
 
   context "defining a new Scrubber class" do
-    setup do
+    before do
       @klass = Class.new(Loofah::Scrubber) do
         attr_accessor :count
 
@@ -161,51 +161,51 @@ class TestScrubber < Test::Unit::TestCase
     end
 
     context "when not specifying direction" do
-      setup do
+      before do
         @scrubber = @klass.new
         assert_nil @scrubber.direction
       end
 
-      should "operate as top-down on a fragment" do
+      it "operate as top-down on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_STOP_TOP_DOWN, @scrubber.count
       end
 
-      should "operate as top-down on a document" do
+      it "operate as top-down on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_STOP_TOP_DOWN, @scrubber.count
       end
     end
 
     context "when direction is specified as top_down" do
-      setup do
+      before do
         @scrubber = @klass.new(:top_down)
         assert_equal :top_down, @scrubber.direction
       end
 
-      should "operate as top-down on a fragment" do
+      it "operate as top-down on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_STOP_TOP_DOWN, @scrubber.count
       end
 
-      should "operate as top-down on a document" do
+      it "operate as top-down on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_STOP_TOP_DOWN, @scrubber.count
       end
     end
 
     context "when direction is specified as bottom_up" do
-      setup do
+      before do
         @scrubber = @klass.new(:bottom_up)
         assert_equal :bottom_up, @scrubber.direction
       end
 
-      should "operate as bottom-up on a fragment" do
+      it "operate as bottom-up on a fragment" do
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
         assert_equal FRAGMENT_NODE_COUNT, @scrubber.count
       end
 
-      should "operate as bottom-up on a document" do
+      it "operate as bottom-up on a document" do
         Loofah.scrub_document(DOCUMENT, @scrubber)
         assert_equal DOCUMENT_NODE_COUNT, @scrubber.count
       end
@@ -213,14 +213,14 @@ class TestScrubber < Test::Unit::TestCase
   end
 
   context "creating a new Scrubber class with no scrub method" do
-    setup do
+    before do
       @klass = Class.new(Loofah::Scrubber) do
         def initialize ; end
       end
       @scrubber = @klass.new
     end
 
-    should "raise an exception" do
+    it "raise an exception" do
       assert_raises(Loofah::ScrubberNotFound) {
         Loofah.scrub_fragment(FRAGMENT, @scrubber)
       }

data/test/unit/test_scrubbers.rb

@@ -1,10 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require "helper"
 
-class TestScrubbers < Test::Unit::TestCase
+class UnitTestScrubbers < Loofah::TestCase
   [ Loofah::HTML::Document, Loofah::HTML::DocumentFragment ].each do |klass|
     context klass do
       context "bad scrub method" do
-        should "raise a ScrubberNotFound exception" do
+        it "raise a ScrubberNotFound exception" do
           doc = klass.parse "<p>foo</p>"
           assert_raises(Loofah::ScrubberNotFound) { doc.scrub! :frippery }
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loofah
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mike Dalessio
@@ -16,102 +16,155 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2011-08-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 15
         segments: 
         - 1
-        - 3
-        - 3
-        version: 1.3.3
-  type: :runtime
+        - 4
+        - 4
+        version: 1.4.4
+  name: nokogiri
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
   prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 27
         segments: 
-        - 2
         - 0
-        - 4
-        version: 2.0.4
-  type: :development
+        - 8
+        version: "0.8"
+  name: rake
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
-        - 0
-        - 9
-        version: "0.9"
-  type: :development
+        - 2
+        - 2
+        version: "2.2"
+  name: minitest
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
-        - 2
-        - 10
-        version: "2.10"
-  type: :development
+        - 1
+        - 0
+        version: "1.0"
+  name: rr
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 0
-        - 8
-        version: "0.8"
-  type: :development
+        version: "0"
+  name: json
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 3
         segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  type: :development
+        - 0
+        version: "0"
+  name: hoe-gemspec
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: hoe-debugging
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: hoe-bundler
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: hoe-git
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 10
+        version: "2.10"
+  name: hoe
+  version_requirements: *id010
 description: |-
   Loofah is a general library for manipulating and transforming HTML/XML
   documents and fragments. It's built on top of Nokogiri and libxml2, so
@@ -161,6 +214,7 @@ files:
 - lib/loofah/scrubbers.rb
 - lib/loofah/xml/document.rb
 - lib/loofah/xml/document_fragment.rb
+- test/assets/testdata_sanitizer_tests1.dat
 - test/helper.rb
 - test/html5/test_sanitizer.rb
 - test/integration/test_ad_hoc.rb
@@ -169,9 +223,11 @@ files:
 - test/integration/test_scrubbers.rb
 - test/integration/test_xml.rb
 - test/unit/test_api.rb
+- test/unit/test_encoding.rb
 - test/unit/test_helpers.rb
 - test/unit/test_scrubber.rb
 - test/unit/test_scrubbers.rb
+- .gemtest
 has_rdoc: true
 homepage: http://github.com/flavorjones/loofah
 licenses: []
@@ -203,18 +259,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: loofah
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Loofah is a general library for manipulating and transforming HTML/XML documents and fragments
 test_files: 
-- test/integration/test_html.rb
-- test/integration/test_ad_hoc.rb
-- test/integration/test_helpers.rb
-- test/integration/test_scrubbers.rb
-- test/integration/test_xml.rb
-- test/html5/test_sanitizer.rb
 - test/unit/test_scrubber.rb
 - test/unit/test_helpers.rb
-- test/unit/test_scrubbers.rb
 - test/unit/test_api.rb
+- test/unit/test_scrubbers.rb
+- test/unit/test_encoding.rb
+- test/html5/test_sanitizer.rb
+- test/integration/test_helpers.rb
+- test/integration/test_scrubbers.rb
+- test/integration/test_ad_hoc.rb
+- test/integration/test_xml.rb
+- test/integration/test_html.rb