nanoc 3.7.3 → 3.7.4

data/test/extra/test_filesystem_tools.rb

@@ -3,7 +3,7 @@
 class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
   def setup
     super
-    skip_unless_have_symlink
+    skip_unless_symlinks_supported
   end
 
   def test_all_files_in_follows_symlinks_to_dirs
@@ -60,7 +60,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
 
     File.symlink('../bar', 'foo/barlink')
 
-    expected_files = [ 'foo/barlink/y.md', 'foo/x.md' ]
+    expected_files = ['foo/barlink/y.md', 'foo/x.md']
     actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('foo').sort
     assert_equal expected_files, actual_files
   end
@@ -73,7 +73,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     File.symlink('../bar', 'dir/bar-link')
 
     # Check
-    expected_files = [ 'dir/bar-link', 'dir/foo' ]
+    expected_files = ['dir/bar-link', 'dir/foo']
     actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('dir').sort
     assert_equal expected_files, actual_files
   end

data/test/extra/test_link_collector.rb

@@ -5,16 +5,23 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
   def test_all
     # Create dummy data
     File.open('file-a.html', 'w') do |io|
-      io << %[<a href="http://example.com/">A 1</a>\n]
-      io << %[<a href="https://example.com/">A 2</a>\n]
-      io << %[<a href="stuff/"A 3></a>\n]
-      io << %[<a name="href-less-anchor">A 4</a>]
-      io << %[<a href="https://example.com/with-fragment#moo">A 5</a>\n]
+      io << %(<a href="http://example.com/">A 1</a>
+)
+      io << %(<a href="https://example.com/">A 2</a>
+)
+      io << %(<a href="stuff/"A 3></a>
+)
+      io << %(<a name="href-less-anchor">A 4</a>)
+      io << %(<a href="https://example.com/with-fragment#moo">A 5</a>
+)
     end
     File.open('file-b.html', 'w') do |io|
-      io << %[<a href="mailto:bob@example.com">B 1</a>\n]
-      io << %[<a href="../stuff">B 2</a>\n]
-      io << %[<a href="/stuff">B 3</a>\n]
+      io << %(<a href="mailto:bob@example.com">B 1</a>
+)
+      io << %(<a href="../stuff">B 2</a>
+)
+      io << %(<a href="/stuff">B 3</a>
+)
     end
 
     # Create validator
@@ -37,14 +44,20 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
   def test_external
     # Create dummy data
     File.open('file-a.html', 'w') do |io|
-      io << %[<a href="http://example.com/">A 1</a>\n]
-      io << %[<a href="https://example.com/">A 2</a>\n]
-      io << %[<a href="stuff/"A 3></a>\n]
+      io << %(<a href="http://example.com/">A 1</a>
+)
+      io << %(<a href="https://example.com/">A 2</a>
+)
+      io << %(<a href="stuff/"A 3></a>
+)
     end
     File.open('file-b.html', 'w') do |io|
-      io << %[<a href="mailto:bob@example.com">B 1</a>\n]
-      io << %[<a href="../stuff">B 2</a>\n]
-      io << %[<a href="/stuff">B 3</a>\n]
+      io << %(<a href="mailto:bob@example.com">B 1</a>
+)
+      io << %(<a href="../stuff">B 2</a>
+)
+      io << %(<a href="/stuff">B 3</a>
+)
     end
 
     # Create validator
@@ -64,14 +77,20 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
   def test_internal
     # Create dummy data
     File.open('file-a.html', 'w') do |io|
-      io << %[<a href="http://example.com/">A 1</a>\n]
-      io << %[<a href="https://example.com/">A 2</a>\n]
-      io << %[<a href="stuff/"A 3></a>\n]
+      io << %(<a href="http://example.com/">A 1</a>
+)
+      io << %(<a href="https://example.com/">A 2</a>
+)
+      io << %(<a href="stuff/"A 3></a>
+)
     end
     File.open('file-b.html', 'w') do |io|
-      io << %[<a href="mailto:bob@example.com">B 1</a>\n]
-      io << %[<a href="../stuff">B 2</a>\n]
-      io << %[<a href="/stuff">B 3</a>\n]
+      io << %(<a href="mailto:bob@example.com">B 1</a>
+)
+      io << %(<a href="../stuff">B 2</a>
+)
+      io << %(<a href="/stuff">B 3</a>
+)
     end
 
     # Create validator

data/test/extra/validators/test_w3c.rb

@@ -6,14 +6,14 @@ class Nanoc::Extra::Validators::W3CTest < Nanoc::TestCase
     if_have 'w3c_validators' do
       with_site do |site|
         # Create some sample files
-        %w{ foo bar baz }.each do |filename|
-          %w{ xxx yyy }.each do |extension|
-            File.open("output/#{filename}.#{extension}", 'w') { |io| io.write("hello") }
+        %w(foo bar baz).each do |filename|
+          %w(xxx yyy).each do |extension|
+            File.open("output/#{filename}.#{extension}", 'w') { |io| io.write('hello') }
           end
         end
 
         # Create validator
-        w3c = Nanoc::Extra::Validators::W3C.new('.', [ :html ])
+        w3c = Nanoc::Extra::Validators::W3C.new('.', [:html])
 
         # Run
         w3c.run
@@ -25,7 +25,7 @@ class Nanoc::Extra::Validators::W3CTest < Nanoc::TestCase
     if_have 'w3c_validators' do
       with_site do |site|
         # Create validator
-        w3c = Nanoc::Extra::Validators::W3C.new('.', [ :foo ])
+        w3c = Nanoc::Extra::Validators::W3C.new('.', [:foo])
 
         # Test
         exception = assert_raises Nanoc::Errors::GenericTrivial do

data/test/filters/test_asciidoc.rb

@@ -3,13 +3,13 @@
 class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
 
   def test_filter
-    skip_unless_have_command "asciidoc"
+    skip_unless_have_command 'asciidoc'
 
     # Create filter
     filter = ::Nanoc::Filters::AsciiDoc.new
 
     # Run filter
-    result = filter.setup_and_run("== Blah blah")
+    result = filter.setup_and_run('== Blah blah')
     assert_match %r{<h2 id="_blah_blah">Blah blah</h2>}, result
   end
 

data/test/filters/test_bluecloth.rb

@@ -8,7 +8,7 @@ class Nanoc::Filters::BlueClothTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::BlueCloth.new
 
       # Run filter
-      result = filter.setup_and_run("> Quote")
+      result = filter.setup_and_run('> Quote')
       assert_match %r{<blockquote>\s*<p>Quote</p>\s*</blockquote>}, result
     end
   end

data/test/filters/test_coffeescript.rb

@@ -9,7 +9,7 @@ class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
 
       # Run filter (no assigns)
       result = filter.setup_and_run('alert 42')
-      assert_equal("(function() { alert(42); }).call(this); ", result.gsub(/\s+/, ' '))
+      assert_equal('(function() { alert(42); }).call(this); ', result.gsub(/\s+/, ' '))
     end
   end
 

data/test/filters/test_colorize_syntax.rb

@@ -62,7 +62,7 @@ class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
   </body>
 </html>
 EOS
-      expected_output_regex = %r[^<!DOCTYPE html>\s*<html>\s*<head>\s*<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\s*<title>Foo</title>\s*</head>\s*<body>\s*<pre title="moo"><code class="language-ruby"># comment</code></pre>\s*</body>\s*</html>]
+      expected_output_regex = %r{^<!DOCTYPE html>\s*<html>\s*<head>\s*<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\s*<title>Foo</title>\s*</head>\s*<body>\s*<pre title="moo"><code class="language-ruby"># comment</code></pre>\s*</body>\s*</html>}
 
       # Run filter
       actual_output = filter.setup_and_run(input, :default_colorizer => :dummy, :is_fullpage => true)
@@ -76,7 +76,8 @@ EOS
       filter = ::Nanoc::Filters::ColorizeSyntax.new
 
       # Get input and expected output
-      input = %[<pre title="moo"><code>#!ruby\n# comment</code></pre>]
+      input = %(<pre title="moo"><code>#!ruby
+# comment</code></pre>)
       expected_output = CODERAY_PRE + '<pre title="moo"><code class="language-ruby"><span class="comment"># comment</span></code></pre>' + CODERAY_POST
 
       # Run filter
@@ -91,7 +92,9 @@ EOS
       filter = ::Nanoc::Filters::ColorizeSyntax.new
 
       # Get input and expected output
-      input = %[<pre title="moo"><code>def moo ; end\n#!ruby\n# comment</code></pre>]
+      input = %(<pre title="moo"><code>def moo ; end
+#!ruby
+# comment</code></pre>)
       expected_output = "<pre title=\"moo\"><code>def moo ; end\n#!ruby\n# comment</code></pre>"
 
       # Run filter
@@ -106,8 +109,10 @@ EOS
       filter = ::Nanoc::Filters::ColorizeSyntax.new
 
       # Get input and expected output
-      input = %[<pre title="moo"><code class="language-ruby">#!ruby\n# comment</code></pre>]
-      expected_output = CODERAY_PRE + %[<pre title="moo"><code class="language-ruby"><span class="doctype">#!ruby</span>\n<span class="comment"># comment</span></code></pre>] + CODERAY_POST
+      input = %(<pre title="moo"><code class="language-ruby">#!ruby
+# comment</code></pre>)
+      expected_output = CODERAY_PRE + %(<pre title="moo"><code class="language-ruby"><span class="doctype">#!ruby</span>
+<span class="comment"># comment</span></code></pre>) + CODERAY_POST
 
       # Run filter
       actual_output = filter.setup_and_run(input)
@@ -132,7 +137,7 @@ EOS
 
   def test_pygmentize
     if_have 'nokogiri' do
-      skip_unless_have_command "pygmentize"
+      skip_unless_have_command 'pygmentize'
 
       # Create filter
       filter = ::Nanoc::Filters::ColorizeSyntax.new
@@ -148,7 +153,7 @@ EOS
   end
 
   def test_pygmentsrb
-    skip "pygments.rb does not support Windows" if on_windows?
+    skip 'pygments.rb does not support Windows' if on_windows?
     if_have 'pygments', 'nokogiri' do
       # Create filter
       filter = ::Nanoc::Filters::ColorizeSyntax.new
@@ -165,13 +170,15 @@ EOS
 
   def test_simon_highlight
     if_have 'nokogiri' do
-      skip_unless_have_command "highlight"
+      skip_unless_have_command 'highlight'
 
       # Create filter
       filter = ::Nanoc::Filters::ColorizeSyntax.new
 
       # Get input and expected output
-      input = %Q[<pre title="moo"><code class="language-ruby">\n# comment\n</code></pre>]
+      input = %Q(<pre title="moo"><code class="language-ruby">
+# comment
+</code></pre>)
       expected_output = '<pre title="moo"><code class="language-ruby"><span class="hl slc"># comment</span></code></pre>'
 
       # Run filter
@@ -223,7 +230,7 @@ EOS
   end
 
   def test_colorize_syntax_with_default_colorizer
-    skip_unless_have_command "pygmentize"
+    skip_unless_have_command 'pygmentize'
 
     if_have 'nokogiri' do
       # Create filter
@@ -252,13 +259,13 @@ EOS
         input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
 
         # Run filter
-        [ :albino, :pygmentize, :simon_highlight ].each do |colorizer|
+        [:albino, :pygmentize, :simon_highlight].each do |colorizer|
           begin
             input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
             filter.setup_and_run(
               input,
               :colorizers => { :ruby => colorizer })
-            flunk "expected colorizer to raise if no executable is available"
+            flunk 'expected colorizer to raise if no executable is available'
           rescue
           end
         end
@@ -361,7 +368,7 @@ EOS
       filter = ::Nanoc::Filters::ColorizeSyntax.new
 
       # Simple test
-      assert_equal "  bar", filter.send(:strip, "\n  bar")
+      assert_equal '  bar', filter.send(:strip, "\n  bar")
 
       # Get input and expected output
       input = <<EOS

data/test/filters/test_erb.rb

@@ -72,7 +72,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
     # Set up
     filter = ::Nanoc::Filters::ERB.new
-    File.open('moo', 'w') { |io| io.write("one miiillion dollars") }
+    File.open('moo', 'w') { |io| io.write('one miiillion dollars') }
 
     # Without
     res = filter.setup_and_run('<%= File.read("moo") %>', :safe_level => nil)

data/test/filters/test_kramdown.rb

@@ -8,7 +8,7 @@ class Nanoc::Filters::KramdownTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Kramdown.new
 
       # Run filter
-      result = filter.setup_and_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

@@ -5,10 +5,10 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_filter
     if_have 'less' do
       # Create item
-      @item = Nanoc::Item.new("blah", { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::Item.new('blah', { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
 
       # Create filter
-      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
+      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [@item])
 
       # Run filter
       result = filter.setup_and_run('.foo { bar: 1 + 1 }')
@@ -23,10 +23,10 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
       File.open('content/foo/bar/imported_file.less', 'w') { |io| io.write('p { color: red; }') }
 
       # Create item
-      @item = Nanoc::Item.new("blah", { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::Item.new('blah', { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
 
       # Create filter
-      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
+      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [@item])
 
       # Run filter
       result = filter.setup_and_run('@import "content/foo/bar/imported_file.less";')
@@ -42,10 +42,10 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
 
       # Create item
       File.open('content/foo/bar.txt', 'w') { |io| io.write('meh') }
-      @item = Nanoc::Item.new("blah", { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::Item.new('blah', { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
 
       # Create filter
-      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
+      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [@item])
 
       # Run filter
       result = filter.setup_and_run('@import "bar/imported_file.less";')
@@ -62,7 +62,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
           io.write('@import "b.less";')
         end
         File.open('content/b.less', 'w') do |io|
-          io.write("p { color: red; }")
+          io.write('p { color: red; }')
         end
 
         # Update rules
@@ -92,7 +92,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
 
         # Update included file
         File.open('content/b.less', 'w') do |io|
-          io.write("p { color: blue; }")
+          io.write('p { color: blue; }')
         end
 
         # Recompile
@@ -111,10 +111,10 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_compression
     if_have 'less' do
       # Create item
-      @item = Nanoc::Item.new("blah", { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::Item.new('blah', { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
 
       # Create filter
-      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [ @item ])
+      filter = ::Nanoc::Filters::Less.new(:item => @item, :items => [@item])
 
       # Run filter with compress option
       result = filter.setup_and_run('.foo { bar: a; } .bar { foo: b; }', :compress => true)

data/test/filters/test_markaby.rb

@@ -5,7 +5,7 @@ class Nanoc::Filters::MarkabyTest < Nanoc::TestCase
   def test_filter
     # Don’t run this test on 1.9.x, because it breaks and it annoys me
     if RUBY_VERSION >= '1.9'
-      skip "Markaby is not compatible with 1.9.x"
+      skip 'Markaby is not compatible with 1.9.x'
       return
     end
 
@@ -15,7 +15,7 @@ class Nanoc::Filters::MarkabyTest < Nanoc::TestCase
 
       # Run filter
       result = filter.setup_and_run("html do\nend")
-      assert_equal("<html></html>", result)
+      assert_equal('<html></html>', result)
     end
   end
 

data/test/filters/test_maruku.rb

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

data/test/filters/test_pandoc.rb

@@ -4,7 +4,7 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
 
   def test_filter
     if_have 'pandoc-ruby' do
-      skip_unless_have_command "pandoc"
+      skip_unless_have_command 'pandoc'
 
       # Create filter
       filter = ::Nanoc::Filters::Pandoc.new
@@ -17,13 +17,13 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
 
   def test_params
     if_have 'pandoc-ruby' do
-      skip_unless_have_command "pandoc"
+      skip_unless_have_command 'pandoc'
 
       # Create filter
       filter = ::Nanoc::Filters::Pandoc.new
 
       # Run filter
-      opts = [ :s, {:f => :markdown, :to => :html}, 'no-wrap', :toc ]
+      opts = [:s, {:f => :markdown, :to => :html}, 'no-wrap', :toc]
       result = filter.setup_and_run("# Heading\n", *opts)
       assert_match '<div id="TOC">', result
       assert_match(%r{<h1 id=\"heading\">Heading</h1>\s*}, result)

data/test/filters/test_rainpress.rb

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