nanoc 3.5.0 → 3.6.0

data/test/filters/test_erb.rb

@@ -9,7 +9,7 @@ class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
     filter = ::Nanoc::Filters::ERB.new({ :location => 'a cheap motel' })
 
     # Run filter
-    result = filter.run('<%= "I was hiding in #{@location}." %>')
+    result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
     assert_equal('I was hiding in a cheap motel.', result)
   end
 
@@ -18,7 +18,7 @@ class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
     filter = ::Nanoc::Filters::ERB.new({ :location => 'a cheap motel' })
 
     # Run filter
-    result = filter.run('<%= "I was hiding in #{location}." %>')
+    result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
     assert_equal('I was hiding in a cheap motel.', result)
   end
 
@@ -39,7 +39,7 @@ class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
     # Run filter
     raised = false
     begin
-      filter.run('<%= this isn\'t really ruby so it\'ll break, muahaha %>')
+      filter.setup_and_run('<%= this isn\'t really ruby so it\'ll break, muahaha %>')
     rescue SyntaxError => e
       e.message =~ /(.+?):\d+: /
       assert_match 'item /foo/bar/baz/ (rep quux)', $1
@@ -53,7 +53,7 @@ class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
     filter = ::Nanoc::Filters::ERB.new({ :content => 'a cheap motel' })
 
     # Run filter
-    result = filter.run('<%= "I was hiding in #{yield}." %>')
+    result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
     assert_equal('I was hiding in a cheap motel.', result)
   end
 
@@ -63,7 +63,7 @@ class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
 
     # Run filter
     assert_raises LocalJumpError do
-      filter.run('<%= "I was hiding in #{yield}." %>')
+      filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
     end
   end
 
@@ -73,12 +73,12 @@ class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
     File.open('moo', 'w') { |io| io.write("one miiillion dollars") }
 
     # Without
-    res = filter.run('<%= File.read("moo") %>', :safe_level => nil)
+    res = filter.setup_and_run('<%= File.read("moo") %>', :safe_level => nil)
     assert_equal 'one miiillion dollars', res
 
     # With
     assert_raises(SecurityError) do
-      res = filter.run('<%= File.read("moo") %>', :safe_level => 4)
+      res = filter.setup_and_run('<%= File.read("moo") %>', :safe_level => 4)
     end
   end
 
@@ -88,17 +88,17 @@ class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
     $trim_mode_works = false
 
     # Without
-    filter.run('% $trim_mode_works = true')
+    filter.setup_and_run('% $trim_mode_works = true')
     refute $trim_mode_works
 
     # With
-    filter.run('% $trim_mode_works = true', :trim_mode => '%')
+    filter.setup_and_run('% $trim_mode_works = true', :trim_mode => '%')
     assert $trim_mode_works
   end
 
   def test_locals
     filter = ::Nanoc::Filters::ERB.new
-    result = filter.run('<%= @local %>', :locals => { :local => 123 })
+    result = filter.setup_and_run('<%= @local %>', :locals => { :local => 123 })
     assert_equal '123', result
   end
 

data/test/filters/test_erubis.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::ErubisTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Erubis.new({ :location => 'a cheap motel' })
 
       # Run filter
-      result = filter.run('<%= "I was hiding in #{@location}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -21,7 +21,7 @@ class Nanoc::Filters::ErubisTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Erubis.new({ :location => 'a cheap motel' })
 
       # Run filter
-      result = filter.run('<%= "I was hiding in #{location}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -34,7 +34,7 @@ class Nanoc::Filters::ErubisTest < MiniTest::Unit::TestCase
       # Run filter
       raised = false
       begin
-        filter.run('<%= this isn\'t really ruby so it\'ll break, muahaha %>')
+        filter.setup_and_run('<%= this isn\'t really ruby so it\'ll break, muahaha %>')
       rescue SyntaxError => e
         e.message =~ /(.+?):\d+: /
         assert_match '?', $1
@@ -50,7 +50,7 @@ class Nanoc::Filters::ErubisTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Erubis.new({ :content => 'a cheap motel' })
 
       # Run filter
-      result = filter.run('<%= "I was hiding in #{yield}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -62,7 +62,7 @@ class Nanoc::Filters::ErubisTest < MiniTest::Unit::TestCase
 
       # Run filter
       assert_raises LocalJumpError do
-        filter.run('<%= "I was hiding in #{yield}." %>')
+        filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
       end
     end
   end
@@ -70,7 +70,7 @@ class Nanoc::Filters::ErubisTest < MiniTest::Unit::TestCase
   def test_filter_with_erbout
     if_have 'erubis' do
       filter = ::Nanoc::Filters::Erubis.new
-      result = filter.run('stuff<% _erbout << _erbout %>')
+      result = filter.setup_and_run('stuff<% _erbout << _erbout %>')
       assert_equal 'stuffstuff', result
     end
   end

data/test/filters/test_haml.rb

@@ -10,15 +10,15 @@ class Nanoc::Filters::HamlTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Haml.new({ :question => 'Is this the Payne residence?' })
 
       # Run filter (no assigns)
-      result = filter.run('%html')
+      result = filter.setup_and_run('%html')
       assert_match(/<html>.*<\/html>/, result)
 
       # Run filter (assigns without @)
-      result = filter.run('%p= question')
+      result = filter.setup_and_run('%p= question')
       assert_equal("<p>Is this the Payne residence?</p>\n", result)
 
       # Run filter (assigns with @)
-      result = filter.run('%p= @question')
+      result = filter.setup_and_run('%p= @question')
       assert_equal("<p>Is this the Payne residence?</p>\n", result)
     end
   end
@@ -29,11 +29,11 @@ class Nanoc::Filters::HamlTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Haml.new({ :foo => 'bar' })
 
       # Check with HTML5
-      result = filter.run('%img', :format => :html5)
+      result = filter.setup_and_run('%img', :format => :html5)
       assert_match(/<img>/, result)
 
       # Check with XHTML
-      result = filter.run('%img', :format => :xhtml)
+      result = filter.setup_and_run('%img', :format => :xhtml)
       assert_match(/<img\s*\/>/, result)
     end
   end
@@ -46,8 +46,8 @@ class Nanoc::Filters::HamlTest < MiniTest::Unit::TestCase
       # Run filter
       raised = false
       begin
-        filter.run('%p= this isn\'t really ruby so it\'ll break, muahaha')
-      rescue SyntaxError => e
+        filter.setup_and_run('%p= this isn\'t really ruby so it\'ll break, muahaha')
+      rescue SyntaxError, Haml::SyntaxError => e
         e.message =~ /(.+?):\d+: /
         assert_match '?', $1
         raised = true
@@ -62,7 +62,7 @@ class Nanoc::Filters::HamlTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Haml.new({ :content => 'Is this the Payne residence?' })
 
       # Run filter
-      result = filter.run('%p= yield')
+      result = filter.setup_and_run('%p= yield')
       assert_equal("<p>Is this the Payne residence?</p>\n", result)
     end
   end
@@ -74,7 +74,7 @@ class Nanoc::Filters::HamlTest < MiniTest::Unit::TestCase
 
       # Run filter
       assert_raises LocalJumpError do
-        filter.run('%p= yield')
+        filter.setup_and_run('%p= yield')
       end
     end
   end
@@ -88,7 +88,7 @@ class Nanoc::Filters::HamlTest < MiniTest::Unit::TestCase
 
       # Run filter
       filter = ::Nanoc::Filters::Haml.new
-      result = filter.run("%body\n  ~ File.read('stuff')")
+      result = filter.setup_and_run("%body\n  ~ File.read('stuff')")
       assert_match(/Max Payne&#x000A;Mona Sax/, result)
     end
   end

data/test/filters/test_handlebars.rb

@@ -27,11 +27,11 @@ class Nanoc::Filters::HandlebarsTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Handlebars.new(assigns)
 
       # Run filter
-      result = filter.run('{{protagonist}} says: {{yield}}.')
+      result = filter.setup_and_run('{{protagonist}} says: {{yield}}.')
       assert_equal('Max Payne says: No Payne No Gayne.', result)
-      result = filter.run('We can’t stop {{item.location}}! This is the {{layout.name}} layout!')
+      result = filter.setup_and_run('We can’t stop {{item.location}}! This is the {{layout.name}} layout!')
       assert_equal('We can’t stop here! This is the Max Payne layout!', result)
-      result = filter.run('It’s raining {{config.animals}} here!')
+      result = filter.setup_and_run('It’s raining {{config.animals}} here!')
       assert_equal('It’s raining cats and dogs here!', result)
     end
   end

data/test/filters/test_kramdown.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::KramdownTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Kramdown.new
 
       # Run filter
-      result = filter.run("This is _so_ **cool**!")
+      result = filter.setup_and_run("This is _so_ **cool**!")
       assert_equal("<p>This is <em>so</em> <strong>cool</strong>!</p>\n", result)
     end
   end

data/test/filters/test_less.rb

@@ -13,7 +13,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
 
       # Run filter
-      result = filter.run('.foo { bar: 1 + 1 }')
+      result = filter.setup_and_run('.foo { bar: 1 + 1 }')
       assert_match(/\.foo\s*\{\s*bar:\s*2;?\s*\}/, result)
     end
   end
@@ -31,7 +31,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
 
       # Run filter
-      result = filter.run('@import "content/foo/bar/imported_file.less";')
+      result = filter.setup_and_run('@import "content/foo/bar/imported_file.less";')
       assert_match(/p\s*\{\s*color:\s*red;?\s*\}/, result)
     end
   end
@@ -50,7 +50,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
 
       # Run filter
-      result = filter.run('@import "bar/imported_file.less";')
+      result = filter.setup_and_run('@import "bar/imported_file.less";')
       assert_match(/p\s*\{\s*color:\s*red;?\s*\}/, result)
     end
   end
@@ -119,7 +119,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
 
       # Run filter with compress option
-      result = filter.run('.foo { bar: a; } .bar { foo: b; }', :compress => true)
+      result = filter.setup_and_run('.foo { bar: a; } .bar { foo: b; }', :compress => true)
       assert_match(/^\.foo{bar:a;}\n\.bar{foo:b;}/, result)
     end
   end

data/test/filters/test_markaby.rb

@@ -16,7 +16,7 @@ class Nanoc::Filters::MarkabyTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Markaby.new
 
       # Run filter
-      result = filter.run("html do\nend")
+      result = filter.setup_and_run("html do\nend")
       assert_equal("<html></html>", result)
     end
   end

data/test/filters/test_maruku.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::MarukuTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Maruku.new
 
       # Run filter
-      result = filter.run("This is _so_ *cool*!")
+      result = filter.setup_and_run("This is _so_ *cool*!")
       assert_equal("<p>This is <em>so</em> <em>cool</em>!</p>", result)
     end
   end

data/test/filters/test_mustache.rb

@@ -17,7 +17,7 @@ class Nanoc::Filters::MustacheTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Mustache.new({ :item => item })
 
       # Run filter
-      result = filter.run('The protagonist of {{title}} is {{protagonist}}.')
+      result = filter.setup_and_run('The protagonist of {{title}} is {{protagonist}}.')
       assert_equal('The protagonist of Max Payne is Max Payne.', result)
     end
   end
@@ -36,7 +36,7 @@ class Nanoc::Filters::MustacheTest < MiniTest::Unit::TestCase
         { :content => 'No Payne No Gayne', :item => item })
 
       # Run filter
-      result = filter.run('Max says: {{yield}}.')
+      result = filter.setup_and_run('Max says: {{yield}}.')
       assert_equal('Max says: No Payne No Gayne.', result)
     end
   end

data/test/filters/test_pandoc.rb

@@ -14,7 +14,7 @@ class Nanoc::Filters::PandocTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Pandoc.new
 
       # Run filter
-      result = filter.run("# Heading\n")
+      result = filter.setup_and_run("# Heading\n")
       assert_equal("<h1 id=\"heading\">Heading</h1>", result)
     end
   end

data/test/filters/test_rainpress.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::RainpressTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Rainpress.new
 
       # Run filter
-      result = filter.run("body { color: black; }")
+      result = filter.setup_and_run("body { color: black; }")
       assert_equal("body{color:#000}", result)
     end
   end
@@ -21,7 +21,7 @@ class Nanoc::Filters::RainpressTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Rainpress.new
 
       # Run filter
-      result = filter.run("body { color: #aabbcc; }", :colors => false)
+      result = filter.setup_and_run("body { color: #aabbcc; }", :colors => false)
       assert_equal("body{color:#aabbcc}", result)
     end
   end

data/test/filters/test_rdiscount.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::RDiscountTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::RDiscount.new
 
       # Run filter
-      result = filter.run("> Quote")
+      result = filter.setup_and_run("> Quote")
       assert_match(/<blockquote>\s*<p>Quote<\/p>\s*<\/blockquote>/, result)
     end
   end
@@ -23,7 +23,7 @@ class Nanoc::Filters::RDiscountTest < MiniTest::Unit::TestCase
       # Run filter
       input           = "The quotation 'marks' sure make this look sarcastic!"
       output_expected = /The quotation &lsquo;marks&rsquo; sure make this look sarcastic!/
-      output_actual   = filter.run(input, :extensions => [ :smart ])
+      output_actual   = filter.setup_and_run(input, :extensions => [ :smart ])
       assert_match(output_expected, output_actual)
     end
   end

data/test/filters/test_rdoc.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::RDocTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::RDoc.new
 
       # Run filter
-      result = filter.run("= Foo")
+      result = filter.setup_and_run("= Foo")
       assert_match(%r{<h1( id="label-Foo")?>Foo</h1>\Z}, result)
     end
   end

data/test/filters/test_redcarpet.rb

@@ -16,7 +16,7 @@ class Nanoc::Filters::RedcarpetTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::Redcarpet.new
 
       # Run filter
-      result = filter.run("> Quote")
+      result = filter.setup_and_run("> Quote")
       assert_match(/<blockquote>\s*<p>Quote<\/p>\s*<\/blockquote>/, result)
     end
   end
@@ -30,11 +30,11 @@ class Nanoc::Filters::RedcarpetTest < MiniTest::Unit::TestCase
       if ::Redcarpet::VERSION > '2'
         input           = "this is ~~good~~ bad"
         output_expected = /this is <del>good<\/del> bad/
-        output_actual   = filter.run(input, :options => { :strikethrough => true })
+        output_actual   = filter.setup_and_run(input, :options => { :strikethrough => true })
       else
         input           = "The quotation 'marks' sure make this look sarcastic!"
         output_expected = /The quotation &lsquo;marks&rsquo; sure make this look sarcastic!/
-        output_actual   = filter.run(input, :options => [ :smart ])
+        output_actual   = filter.setup_and_run(input, :options => [ :smart ])
       end
       assert_match(output_expected, output_actual)
     end
@@ -48,7 +48,7 @@ class Nanoc::Filters::RedcarpetTest < MiniTest::Unit::TestCase
       # Run filter
       input           = "![Alt](/path/to/img 'Title')"
       output_expected = %r{<img src="/path/to/img" alt="Alt" title="Title">}
-      output_actual   = filter.run(input)
+      output_actual   = filter.setup_and_run(input)
       assert_match(output_expected, output_actual)
     end
   end
@@ -62,12 +62,27 @@ class Nanoc::Filters::RedcarpetTest < MiniTest::Unit::TestCase
       input           = "![Alt](/path/to/img 'Title')"
       output_expected = %r{<img src="/path/to/img" alt="Alt" title="Title"/>}
       if ::Redcarpet::VERSION > '2'
-        output_actual   = filter.run(input, :renderer_options => { :xhtml => true })
+        output_actual   = filter.setup_and_run(input, :renderer_options => { :xhtml => true })
       else
-        output_actual   = filter.run(input, :options => [ :xhtml ])
+        output_actual   = filter.setup_and_run(input, :options => [ :xhtml ])
       end
       assert_match(output_expected, output_actual)
     end
   end
 
+  def test_html_toc
+    if_have 'redcarpet' do
+      unless ::Redcarpet::VERSION > '2'
+        skip "Requires Redcarpet >= 2"
+      end
+
+      # Create filter
+      filter = ::Nanoc::Filters::Redcarpet.new
+
+      # Run filter
+      input = "# Heading 1\n## Heading 2\n"
+      filter.run(input, :renderer => Redcarpet::Render::HTML_TOC)
+    end
+  end
+
 end

data/test/filters/test_redcloth.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::RedClothTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::RedCloth.new
 
       # Run filter
-      result = filter.run("h1. Foo")
+      result = filter.setup_and_run("h1. Foo")
       assert_equal("<h1>Foo</h1>", result)
     end
   end
@@ -21,11 +21,11 @@ class Nanoc::Filters::RedClothTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::RedCloth.new
 
       # Run filter without options
-      result = filter.run("I am a member of SPECTRE.")
+      result = filter.setup_and_run("I am a member of SPECTRE.")
       assert_equal("<p>I am a member of <span class=\"caps\">SPECTRE</span>.</p>", result)
 
       # Run filter with options
-      result = filter.run("I am a member of SPECTRE.", :no_span_caps => true)
+      result = filter.setup_and_run("I am a member of SPECTRE.", :no_span_caps => true)
       assert_equal("<p>I am a member of SPECTRE.</p>", result)
     end
   end

data/test/filters/test_relativize_paths.rb

@@ -25,7 +25,7 @@ class Nanoc::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
     expected_content = %[<a href="../..">foo</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -49,7 +49,7 @@ class Nanoc::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
     expected_content = %[<a href="../..">foo</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -73,7 +73,7 @@ class Nanoc::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
     expected_content = %[<a href="../..">foo</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -108,7 +108,7 @@ EOS
     expected_match_1 = %r{^<!DOCTYPE html>\s*<html>\s*<head>(.|\s)*<title>Hello</title>\s*</head>\s*<body>\s*<a href="../..">foo</a>\s*</body>\s*</html>\s*$}
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_match(expected_match_0, actual_content)
     assert_match(expected_match_1, actual_content)
   end
@@ -133,7 +133,7 @@ EOS
     expected_content = %[<a href="../..">foo</a> <a href="../../../bar">bar</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -157,7 +157,7 @@ EOS
     expected_content = %[<a href="../../../"><img src="../../../bar.png"></a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -181,7 +181,7 @@ EOS
     expected_content = %[stuff href="/foo" more stuff]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -205,7 +205,7 @@ EOS
     expected_content = %[<a href="../../">foo</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -229,7 +229,7 @@ EOS
     expected_content = %[<a href="//example.com/">example.com</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -253,7 +253,7 @@ EOS
     expected_content = %[<a href="#max-payne">Max Payne</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -277,7 +277,7 @@ EOS
     expected_content = %[<a href="http://example.com/">Example</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -301,7 +301,7 @@ EOS
     expected_content = %[<a href="example">Example</a>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -326,7 +326,7 @@ EOS
     expected_content = %[<object data="../../example"><param name="movie" content="../../example"></object>]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :html)
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
     assert_equal(expected_content, actual_content)
   end
 
@@ -337,7 +337,7 @@ EOS
 
     # Test
     assert_raises(RuntimeError) do
-      filter.run("moo")
+      filter.setup_and_run("moo")
     end
   end
 
@@ -361,7 +361,7 @@ EOS
     expected_content = %[background: url("../background.png");]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :css)
+    actual_content = filter.setup_and_run(raw_content, :type => :css)
     assert_equal(expected_content, actual_content)
   end
 
@@ -385,7 +385,7 @@ EOS
     expected_content = %[background: url('../background.png');]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :css)
+    actual_content = filter.setup_and_run(raw_content, :type => :css)
     assert_equal(expected_content, actual_content)
   end
 
@@ -409,7 +409,7 @@ EOS
     expected_content = %[background: url(../background.png);]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :css)
+    actual_content = filter.setup_and_run(raw_content, :type => :css)
     assert_equal(expected_content, actual_content)
   end
 
@@ -433,7 +433,7 @@ EOS
     expected_content = %[background: url(../a.png) url(../b.png);]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :css)
+    actual_content = filter.setup_and_run(raw_content, :type => :css)
     assert_equal(expected_content, actual_content)
   end
 
@@ -460,7 +460,7 @@ EOS
     expected_content = %[background: url(../../);]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :css)
+    actual_content = filter.setup_and_run(raw_content, :type => :css)
     assert_equal(expected_content, actual_content)
   end
 
@@ -484,7 +484,7 @@ EOS
     expected_content = %[background: url(//example.com);]
 
     # Test
-    actual_content = filter.run(raw_content, :type => :css)
+    actual_content = filter.setup_and_run(raw_content, :type => :css)
     assert_equal(expected_content, actual_content)
   end
 
@@ -520,7 +520,7 @@ XML
 XML
 
       # Test
-      actual_content = filter.run(raw_content, :type => :xml, :select => ['*/@boo'])
+      actual_content = filter.setup_and_run(raw_content, :type => :xml, :select => ['*/@boo'])
       assert_equal(expected_content, actual_content)
     end
   end
@@ -555,7 +555,7 @@ XML
 XML
 
       # Test
-      actual_content = filter.run(raw_content, :type => :xml, :select => ['far/@href'])
+      actual_content = filter.setup_and_run(raw_content, :type => :xml, :select => ['far/@href'])
       assert_equal(expected_content, actual_content)
     end
   end
@@ -590,7 +590,7 @@ XML
 XML
 
       # Test
-      actual_content = filter.run(raw_content, {
+      actual_content = filter.setup_and_run(raw_content, {
         :type => :xml, 
         :namespaces => {:ex => 'http://example.org'}, 
         :select => ['ex:a/@href']
@@ -643,7 +643,7 @@ XML
 </html>}
 
       # Test
-      actual_content = filter.run(raw_content, :type => :xhtml)
+      actual_content = filter.setup_and_run(raw_content, :type => :xhtml)
       assert_match expected_match, actual_content
     end
   end
@@ -680,7 +680,7 @@ XML
 XML
 
       # Test
-      actual_content = filter.run(raw_content.freeze, :type => :xhtml)
+      actual_content = filter.setup_and_run(raw_content.freeze, :type => :xhtml)
       assert_equal(expected_content, actual_content)
     end
   end
@@ -717,7 +717,7 @@ XML
 ]
 
       # Test
-      actual_content = filter.run(raw_content.freeze, :type => :xhtml)
+      actual_content = filter.setup_and_run(raw_content.freeze, :type => :xhtml)
       assert_equal(expected_content, actual_content)
     end
   end
@@ -752,7 +752,7 @@ XML
 <![endif]-->]
 
       # Test
-      actual_content = filter.run(raw_content.freeze, :type => :html)
+      actual_content = filter.setup_and_run(raw_content.freeze, :type => :html)
       assert_equal(expected_content, actual_content)
     end
   end