nanoc 3.7.4 → 3.7.5

data/test/extra/test_piper.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::PiperTest < Nanoc::TestCase
-
   def test_basic
     stdout = StringIO.new
     stderr = StringIO.new
@@ -11,7 +10,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     File.open('foo.txt', 'w') { |io| io.write('hi') }
     File.open('bar.txt', 'w') { |io| io.write('ho') }
 
-    piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+    piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     piper.run(cmd, nil)
 
     assert_match(/foo\.txt/, stdout.string)
@@ -26,7 +25,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     input = 'Hello World!'
     cmd = %w( cat )
 
-    piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+    piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     piper.run(cmd, input)
 
     assert_equal(input, stdout.string)
@@ -39,10 +38,9 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
 
     cmd = %w( cat kafhawilgoiwaejagoualjdsfilofiewaguihaifeowuiga )
 
-    piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+    piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     assert_raises(Nanoc::Extra::Piper::Error) do
       piper.run(cmd, nil)
     end
   end
-
 end

data/test/extra/test_vcs.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::VCSTest < Nanoc::TestCase
-
   def test_named
     assert_nil(Nanoc::Extra::VCS.named(:lkasjdlkfjlkasdfkj))
 
@@ -16,5 +15,4 @@ class Nanoc::Extra::VCSTest < Nanoc::TestCase
     assert_raises(NotImplementedError) { vcs.remove('x')    }
     assert_raises(NotImplementedError) { vcs.move('x', 'y') }
   end
-
 end

data/test/extra/validators/test_links.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Validators::LinksTest < Nanoc::TestCase
-
 end

data/test/extra/validators/test_w3c.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Validators::W3CTest < Nanoc::TestCase
-
   def test_simple
     if_have 'w3c_validators' do
-      with_site do |site|
+      with_site do |_site|
         # Create some sample files
         %w(foo bar baz).each do |filename|
           %w(xxx yyy).each do |extension|
@@ -23,7 +22,7 @@ class Nanoc::Extra::Validators::W3CTest < Nanoc::TestCase
 
   def test_with_unknown_types
     if_have 'w3c_validators' do
-      with_site do |site|
+      with_site do |_site|
         # Create validator
         w3c = Nanoc::Extra::Validators::W3C.new('.', [:foo])
 
@@ -35,5 +34,4 @@ class Nanoc::Extra::Validators::W3CTest < Nanoc::TestCase
       end
     end
   end
-
 end

data/test/filters/test_asciidoc.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
-
   def test_filter
     skip_unless_have_command 'asciidoc'
 
@@ -12,5 +11,4 @@ class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
     result = filter.setup_and_run('== Blah blah')
     assert_match %r{<h2 id="_blah_blah">Blah blah</h2>}, result
   end
-
 end

data/test/filters/test_bluecloth.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::BlueClothTest < Nanoc::TestCase
-
   def test_filter
     if_have 'bluecloth' do
       # Create filter
@@ -12,5 +11,4 @@ class Nanoc::Filters::BlueClothTest < Nanoc::TestCase
       assert_match %r{<blockquote>\s*<p>Quote</p>\s*</blockquote>}, result
     end
   end
-
 end

data/test/filters/test_coderay.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::CodeRayTest < Nanoc::TestCase
-
   def test_filter_without_language
     if_have 'coderay' do
       # Get filter
@@ -22,7 +21,7 @@ class Nanoc::Filters::CodeRayTest < Nanoc::TestCase
 
       # Run filter
       code = "def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end"
-      result = filter.setup_and_run(code, :language => 'ruby')
+      result = filter.setup_and_run(code, language: 'ruby')
       assert_match %r{^<span class="keyword">def</span> <span class="function">some_function</span>}, result
     end
   end
@@ -34,9 +33,8 @@ class Nanoc::Filters::CodeRayTest < Nanoc::TestCase
 
       # Run filter
       code = "def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end"
-      result = filter.setup_and_run(code, :language => 'skldfhjsdhfjszfnocmluhfixfmersumulh')
+      result = filter.setup_and_run(code, language: 'skldfhjsdhfjszfnocmluhfixfmersumulh')
       assert_equal code, result
     end
   end
-
 end

data/test/filters/test_coffeescript.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
-
   def test_filter
     if_have 'coffee-script' do
       # Create filter
@@ -12,5 +11,4 @@ class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
       assert_equal('(function() { alert(42); }).call(this); ', result.gsub(/\s+/, ' '))
     end
   end
-
 end

data/test/filters/test_colorize_syntax.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
-
   CODERAY_PRE  = '<div class="CodeRay"><div class="code">'
   CODERAY_POST = '</div></div>'
 
@@ -30,7 +29,7 @@ class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
       expected_output = input # because we are using a dummy
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :default_colorizer => :dummy)
+      actual_output = filter.setup_and_run(input, default_colorizer: :dummy)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -41,7 +40,7 @@ class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
       input.freeze
 
       filter = ::Nanoc::Filters::ColorizeSyntax.new
-      filter.setup_and_run(input, :default_colorizer => :dummy)
+      filter.setup_and_run(input, default_colorizer: :dummy)
     end
   end
 
@@ -65,7 +64,7 @@ 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>}
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :default_colorizer => :dummy, :is_fullpage => true)
+      actual_output = filter.setup_and_run(input, default_colorizer: :dummy, is_fullpage: true)
       assert_match expected_output_regex, actual_output
     end
   end
@@ -147,7 +146,7 @@ EOS
       expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment</span></code></pre>'
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :colorizers => { :ruby => :pygmentize })
+      actual_output = filter.setup_and_run(input, colorizers: { ruby: :pygmentize })
       assert_equal(expected_output, actual_output)
     end
   end
@@ -163,7 +162,7 @@ EOS
       expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment…</span></code></pre>'
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :colorizers => { :ruby => :pygmentsrb })
+      actual_output = filter.setup_and_run(input, colorizers: { ruby: :pygmentsrb })
       assert_equal(expected_output, actual_output)
     end
   end
@@ -176,13 +175,13 @@ EOS
       filter = ::Nanoc::Filters::ColorizeSyntax.new
 
       # Get input and expected output
-      input = %Q(<pre title="moo"><code class="language-ruby">
+      input = %(<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
-      actual_output = filter.setup_and_run(input, :default_colorizer => :simon_highlight)
+      actual_output = filter.setup_and_run(input, default_colorizer: :simon_highlight)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -194,7 +193,7 @@ EOS
 
       # Run filter
       assert_raises RuntimeError do
-        filter.setup_and_run('<p>whatever</p>', :syntax => :kasflwafhaweoineurl)
+        filter.setup_and_run('<p>whatever</p>', syntax: :kasflwafhaweoineurl)
       end
     end
   end
@@ -209,7 +208,7 @@ EOS
       expected_output = '<p>foo<br/>bar</p>'
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :syntax => :xml)
+      actual_output = filter.setup_and_run(input, syntax: :xml)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -224,7 +223,7 @@ EOS
       expected_output = '<p>foo<br />bar</p>'
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :syntax => :xhtml)
+      actual_output = filter.setup_and_run(input, syntax: :xhtml)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -241,7 +240,7 @@ EOS
       expected_output = '<pre><code class="language-ruby"><span class="nb">puts</span> <span class="s2">"foo"</span></code></pre>'
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :default_colorizer => :pygmentize)
+      actual_output = filter.setup_and_run(input, default_colorizer: :pygmentize)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -264,7 +263,7 @@ EOS
             input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
             filter.setup_and_run(
               input,
-              :colorizers => { :ruby => colorizer })
+              colorizers: { ruby: colorizer })
             flunk 'expected colorizer to raise if no executable is available'
           rescue
           end
@@ -342,7 +341,7 @@ EOS
       expected_output = '<code class="language-ruby"># comment</code>'
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :outside_pre => false)
+      actual_output = filter.setup_and_run(input, outside_pre: false)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -357,7 +356,7 @@ EOS
       expected_output = '<code class="language-ruby"><span class="comment"># comment</span></code>'
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :outside_pre => true)
+      actual_output = filter.setup_and_run(input, outside_pre: true)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -414,7 +413,7 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :default_colorizer => :rouge)
+      actual_output = filter.setup_and_run(input, default_colorizer: :rouge)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -441,9 +440,8 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.setup_and_run(input, :default_colorizer => :rouge, :rouge => { :css_class => 'my-class' })
+      actual_output = filter.setup_and_run(input, default_colorizer: :rouge, rouge: { css_class: 'my-class' })
       assert_equal(expected_output, actual_output)
     end
   end
-
 end

data/test/filters/test_erb.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 
 class Nanoc::Filters::ERBTest < Nanoc::TestCase
-
   def test_filter_with_instance_variable
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ :location => 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
 
     # Run filter
     result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
@@ -13,7 +12,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
   def test_filter_with_instance_method
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ :location => 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
 
     # Run filter
     result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
@@ -29,9 +28,9 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
     # Create filter
     filter = ::Nanoc::Filters::ERB.new({
-      :item     => item,
-      :item_rep => item_rep,
-      :location => 'a cheap motel'
+      item: item,
+      item_rep: item_rep,
+      location: 'a cheap motel'
     })
 
     # Run filter
@@ -48,7 +47,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
   def test_filter_with_yield
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ :content => 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new({ content: 'a cheap motel' })
 
     # Run filter
     result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
@@ -57,7 +56,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
   def test_filter_with_yield_without_content
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ :location => 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
 
     # Run filter
     assert_raises LocalJumpError do
@@ -75,18 +74,18 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
     File.open('moo', 'w') { |io| io.write('one miiillion dollars') }
 
     # Without
-    res = filter.setup_and_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.setup_and_run('<%= File.read("moo") %>', :safe_level => 3)
+      res = filter.setup_and_run('<%= File.read("moo") %>', safe_level: 3)
     end
   end
 
   def test_trim_mode
     # Set up
-    filter = ::Nanoc::Filters::ERB.new({ :location => 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
     $trim_mode_works = false
 
     # Without
@@ -94,14 +93,13 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
     refute $trim_mode_works
 
     # With
-    filter.setup_and_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.setup_and_run('<%= @local %>', :locals => { :local => 123 })
+    result = filter.setup_and_run('<%= @local %>', locals: { local: 123 })
     assert_equal '123', result
   end
-
 end

data/test/filters/test_erubis.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::Filters::ErubisTest < Nanoc::TestCase
-
   def test_filter_with_instance_variable
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ :location => 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new({ location: 'a cheap motel' })
 
       # Run filter
       result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
@@ -16,7 +15,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_instance_method
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ :location => 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new({ location: 'a cheap motel' })
 
       # Run filter
       result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
@@ -45,7 +44,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_yield
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ :content => 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new({ content: 'a cheap motel' })
 
       # Run filter
       result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
@@ -56,7 +55,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_yield_without_content
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ :location => 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new({ location: 'a cheap motel' })
 
       # Run filter
       assert_raises LocalJumpError do
@@ -72,5 +71,4 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
       assert_equal 'stuffstuff', result
     end
   end
-
 end

data/test/filters/test_haml.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::Filters::HamlTest < Nanoc::TestCase
-
   def test_filter
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ :question => 'Is this the Payne residence?' })
+      filter = ::Nanoc::Filters::Haml.new({ question: 'Is this the Payne residence?' })
 
       # Run filter (no assigns)
       result = filter.setup_and_run('%html')
@@ -24,14 +23,14 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_with_params
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ :foo => 'bar' })
+      filter = ::Nanoc::Filters::Haml.new({ foo: 'bar' })
 
       # Check with HTML5
-      result = filter.setup_and_run('%img', :format => :html5)
+      result = filter.setup_and_run('%img', format: :html5)
       assert_match(/<img>/, result)
 
       # Check with XHTML
-      result = filter.setup_and_run('%img', :format => :xhtml)
+      result = filter.setup_and_run('%img', format: :xhtml)
       assert_match(/<img\s*\/>/, result)
     end
   end
@@ -39,7 +38,7 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_error
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ :foo => 'bar' })
+      filter = ::Nanoc::Filters::Haml.new({ foo: 'bar' })
 
       # Run filter
       raised = false
@@ -57,7 +56,7 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_with_yield
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ :content => 'Is this the Payne residence?' })
+      filter = ::Nanoc::Filters::Haml.new({ content: 'Is this the Payne residence?' })
 
       # Run filter
       result = filter.setup_and_run('%p= yield')
@@ -68,7 +67,7 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_with_yield_without_content
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ :location => 'Is this the Payne residence?' })
+      filter = ::Nanoc::Filters::Haml.new({ location: 'Is this the Payne residence?' })
 
       # Run filter
       assert_raises LocalJumpError do
@@ -90,5 +89,4 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
       assert_match(/Max Payne&#x000A;Mona Sax/, result)
     end
   end
-
 end