nanoc 3.7.3 → 3.7.4

data/test/filters/test_rdiscount.rb

@@ -8,7 +8,7 @@ class Nanoc::Filters::RDiscountTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::RDiscount.new
 
       # Run filter
-      result = filter.setup_and_run("> Quote")
+      result = filter.setup_and_run('> Quote')
       assert_match(/<blockquote>\s*<p>Quote<\/p>\s*<\/blockquote>/, result)
     end
   end
@@ -21,7 +21,7 @@ class Nanoc::Filters::RDiscountTest < Nanoc::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.setup_and_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

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

data/test/filters/test_redcarpet.rb

@@ -14,7 +14,7 @@ class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Redcarpet.new
 
       # Run filter
-      result = filter.setup_and_run("> Quote")
+      result = filter.setup_and_run('> Quote')
       assert_match(/<blockquote>\s*<p>Quote<\/p>\s*<\/blockquote>/, result)
     end
   end
@@ -26,13 +26,13 @@ class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
 
       # Run filter
       if ::Redcarpet::VERSION > '2'
-        input           = "this is ~~good~~ bad"
+        input           = 'this is ~~good~~ bad'
         output_expected = /this is <del>good<\/del> bad/
         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.setup_and_run(input, :options => [ :smart ])
+        output_actual   = filter.setup_and_run(input, :options => [:smart])
       end
       assert_match(output_expected, output_actual)
     end
@@ -62,7 +62,7 @@ class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
       if ::Redcarpet::VERSION > '2'
         output_actual   = filter.setup_and_run(input, :renderer_options => { :xhtml => true })
       else
-        output_actual   = filter.setup_and_run(input, :options => [ :xhtml ])
+        output_actual   = filter.setup_and_run(input, :options => [:xhtml])
       end
       assert_match(output_expected, output_actual)
     end
@@ -71,7 +71,7 @@ class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
   def test_html_toc
     if_have 'redcarpet' do
       unless ::Redcarpet::VERSION > '2'
-        skip "Requires Redcarpet >= 2"
+        skip 'Requires Redcarpet >= 2'
       end
 
       # Create filter

data/test/filters/test_redcloth.rb

@@ -8,8 +8,8 @@ class Nanoc::Filters::RedClothTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::RedCloth.new
 
       # Run filter
-      result = filter.setup_and_run("h1. Foo")
-      assert_equal("<h1>Foo</h1>", result)
+      result = filter.setup_and_run('h1. Foo')
+      assert_equal('<h1>Foo</h1>', result)
     end
   end
 
@@ -19,12 +19,12 @@ class Nanoc::Filters::RedClothTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::RedCloth.new
 
       # Run filter without options
-      result = filter.setup_and_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.setup_and_run("I am a member of SPECTRE.", :no_span_caps => true)
-      assert_equal("<p>I am a member of SPECTRE.</p>", result)
+      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

@@ -19,8 +19,8 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
     end
 
     # Set content
-    raw_content      = %[<a href="/foo">foo</a>]
-    expected_content = %[<a href="../..">foo</a>]
+    raw_content      = %(<a href="/foo">foo</a>)
+    expected_content = %(<a href="../..">foo</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -43,8 +43,8 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
     end
 
     # Set content
-    raw_content      = %[<a href='/foo'>foo</a>]
-    expected_content = %[<a href="../..">foo</a>]
+    raw_content      = %(<a href='/foo'>foo</a>)
+    expected_content = %(<a href="../..">foo</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -67,8 +67,8 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
     end
 
     # Set content
-    raw_content      = %[<a href=/foo>foo</a>]
-    expected_content = %[<a href="../..">foo</a>]
+    raw_content      = %(<a href=/foo>foo</a>)
+    expected_content = %(<a href="../..">foo</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -127,8 +127,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[<a href="/foo">foo</a> <a href="/bar">bar</a>]
-    expected_content = %[<a href="../..">foo</a> <a href="../../../bar">bar</a>]
+    raw_content      = %(<a href="/foo">foo</a> <a href="/bar">bar</a>)
+    expected_content = %(<a href="../..">foo</a> <a href="../../../bar">bar</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -151,8 +151,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[<a href="/"><img src="/bar.png" /></a>]
-    expected_content = %[<a href="../../../"><img src="../../../bar.png"></a>]
+    raw_content      = %(<a href="/"><img src="/bar.png" /></a>)
+    expected_content = %(<a href="../../../"><img src="../../../bar.png"></a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -175,8 +175,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[stuff href="/foo" more stuff]
-    expected_content = %[stuff href="/foo" more stuff]
+    raw_content      = %(stuff href="/foo" more stuff)
+    expected_content = %(stuff href="/foo" more stuff)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -199,8 +199,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[<a href="/">foo</a>]
-    expected_content = %[<a href="../../">foo</a>]
+    raw_content      = %(<a href="/">foo</a>)
+    expected_content = %(<a href="../../">foo</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -223,8 +223,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[<a href="//example.com/">example.com</a>]
-    expected_content = %[<a href="//example.com/">example.com</a>]
+    raw_content      = %(<a href="//example.com/">example.com</a>)
+    expected_content = %(<a href="//example.com/">example.com</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -247,8 +247,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[<a href="#max-payne">Max Payne</a>]
-    expected_content = %[<a href="#max-payne">Max Payne</a>]
+    raw_content      = %(<a href="#max-payne">Max Payne</a>)
+    expected_content = %(<a href="#max-payne">Max Payne</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -271,8 +271,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[<a href="http://example.com/">Example</a>]
-    expected_content = %[<a href="http://example.com/">Example</a>]
+    raw_content      = %(<a href="http://example.com/">Example</a>)
+    expected_content = %(<a href="http://example.com/">Example</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -295,8 +295,8 @@ EOS
     end
 
     # Set content
-    raw_content      = %[<a href="example">Example</a>]
-    expected_content = %[<a href="example">Example</a>]
+    raw_content      = %(<a href="example">Example</a>)
+    expected_content = %(<a href="example">Example</a>)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -318,7 +318,7 @@ EOS
       @item_rep.path = '/woof/meow/'
     end
 
-    raw_content    = %[<object data="/example"><param name="movie" content="/example"></object>]
+    raw_content    = %(<object data="/example"><param name="movie" content="/example"></object>)
     actual_content = filter.setup_and_run(raw_content, :type => :html)
 
     assert_match(/<object data="..\/..\/example">/, actual_content)
@@ -332,7 +332,7 @@ EOS
 
     # Test
     assert_raises(RuntimeError) do
-      filter.setup_and_run("moo")
+      filter.setup_and_run('moo')
     end
   end
 
@@ -668,12 +668,13 @@ XML
       end
 
       # Set content
-      raw_content = %[
+      raw_content = %(
 <link rel="stylesheet" href="/foo.css" />
 <!--[if lt IE 9]>
     <script src="/js/lib/html5shiv.js"></script>
 <![endif]-->
-]
+
+)
 
       actual_content = filter.setup_and_run(raw_content.freeze, :type => :xhtml)
 
@@ -700,15 +701,16 @@ XML
       end
 
       # Set content
-      raw_content = %[
+      raw_content = %(
 <!--[if lt IE 9]>
     <script src="/js/lib/html5shiv.js"></script>
 <![endif]-->
-]
+
+)
 
       # Test
       actual_content = filter.setup_and_run(raw_content.freeze, :type => :html)
-      assert actual_content.include? %[<script src="../../js/lib/html5shiv.js">]
+      assert actual_content.include? %(<script src="../../js/lib/html5shiv.js">)
     end
   end
 
@@ -728,8 +730,8 @@ XML
     end
 
     # Set content
-    raw_content      = %[&lt;!DOCTYPE html>]
-    expected_content = %[&lt;!DOCTYPE html&gt;]
+    raw_content      = %(&lt;!DOCTYPE html>)
+    expected_content = %(&lt;!DOCTYPE html&gt;)
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)

data/test/filters/test_rubypants.rb

@@ -8,8 +8,8 @@ class Nanoc::Filters::RubyPantsTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::RubyPants.new
 
       # Run filter
-      result = filter.setup_and_run("Wait---what?")
-      assert_equal("Wait&#8212;what?", result)
+      result = filter.setup_and_run('Wait---what?')
+      assert_equal('Wait&#8212;what?', result)
     end
   end
 

data/test/filters/test_sass.rb

@@ -64,8 +64,8 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
       filter = create_filter
 
       # Create sample file
-      File.open('moo.sass', 'w') { |io| io.write %Q{@import subdir/relative} }
-      FileUtils.mkdir_p("subdir")
+      File.open('moo.sass', 'w') { |io| io.write %Q(@import subdir/relative) }
+      FileUtils.mkdir_p('subdir')
       File.open('subdir/relative.sass', 'w') { |io| io.write "body\n  color: red" }
 
       # Run filter
@@ -251,7 +251,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
 
         # Check
         output_files = Dir['output/**/*'].select { |f| File.file?(f) }
-        assert_equal [ 'output/style/super/main.css' ], output_files
+        assert_equal ['output/style/super/main.css'], output_files
         assert_match(/^p\s*\{\s*color:\s*red;?\s*\}/, File.read('output/style/super/main.css'))
 
         # Update included file
@@ -265,22 +265,22 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
 
         # Recheck
         output_files = Dir['output/**/*'].select { |f| File.file?(f) }
-        assert_equal [ 'output/style/super/main.css' ], output_files
+        assert_equal ['output/style/super/main.css'], output_files
         assert_match(/^p\s*\{\s*color:\s*blue;?\s*\}/, File.read('output/style/super/main.css'))
       end
     end
   end
 
-private
+  private
 
-  def create_filter(params={})
+  def create_filter(params = {})
     FileUtils.mkdir_p('content')
     File.open('content/xyzzy.sass', 'w') { |io| io.write('p\n  color: green')}
 
-    items = [ Nanoc::Item.new(
+    items = [Nanoc::Item.new(
       'blah',
       { :content_filename => 'content/xyzzy.sass' },
-      '/blah/') ]
+      '/blah/')]
     params = { :item => items[0], :items => items }.merge(params)
     ::Nanoc::Filters::Sass.new(params)
   end

data/test/filters/test_slim.rb

@@ -13,11 +13,11 @@ class Nanoc::Filters::SlimTest < Nanoc::TestCase
 
       # Run filter (assigns without @)
       result = filter.setup_and_run('p = rabbit')
-      assert_equal("<p>The rabbit is on the branch.</p>", result)
+      assert_equal('<p>The rabbit is on the branch.</p>', result)
 
       # Run filter (assigns with @)
       result = filter.setup_and_run('p = @rabbit')
-      assert_equal("<p>The rabbit is on the branch.</p>", result)
+      assert_equal('<p>The rabbit is on the branch.</p>', result)
     end
   end
 
@@ -26,7 +26,7 @@ class Nanoc::Filters::SlimTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Slim.new({ :content => 'The rabbit is on the branch.' })
 
       result = filter.setup_and_run('p = yield')
-      assert_equal("<p>The rabbit is on the branch.</p>", result)
+      assert_equal('<p>The rabbit is on the branch.</p>', result)
     end
   end
 

data/test/filters/test_uglify_js.rb

@@ -8,7 +8,7 @@ class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::UglifyJS.new
 
       # Run filter
-      input = "foo = 1; (function(bar) { if (true) alert(bar); })(foo)"
+      input = 'foo = 1; (function(bar) { if (true) alert(bar); })(foo)'
       result = filter.setup_and_run(input)
       assert_match(/foo=1,function\((.)\)\{alert\(\1\)\}\(foo\);/, result)
     end

data/test/filters/test_yui_compressor.rb

@@ -17,10 +17,10 @@ class Nanoc::Filters::YUICompressorTest < Nanoc::TestCase
       JAVASCRIPT
 
       result = filter.setup_and_run(sample_js, { :type => 'js', :munge => true })
-      assert_match "function factorial(c){var a=1;for(var b=2;b<=c;b++){a*=b}return a};", result
+      assert_match 'function factorial(c){var a=1;for(var b=2;b<=c;b++){a*=b}return a};', result
 
       result = filter.setup_and_run(sample_js, { :type => 'js', :munge => false })
-      assert_match "function factorial(n){var result=1;for(var i=2;i<=n;i++){result*=i}return result};", result
+      assert_match 'function factorial(n){var result=1;for(var i=2;i<=n;i++){result*=i}return result};', result
     end
   end
 
@@ -35,7 +35,7 @@ class Nanoc::Filters::YUICompressorTest < Nanoc::TestCase
       CSS
 
       result = filter.setup_and_run(sample_css, { :type => 'css' })
-      assert_match "*{margin:0}", result
+      assert_match '*{margin:0}', result
     end
   end
 

data/test/gem_loader.rb

@@ -3,7 +3,7 @@
 begin
   require 'rubygems'
 
-  gemspec = File.expand_path("nanoc.gemspec", Dir.pwd)
+  gemspec = File.expand_path('nanoc.gemspec', Dir.pwd)
   Gem::Specification.load(gemspec).dependencies.each do |dep|
     gem dep.name, *dep.requirement.as_list
   end

data/test/helper.rb

@@ -40,7 +40,7 @@ module Nanoc::TestHelpers
   def if_have(*libs)
     libs.each do |lib|
       if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && lib == 'nokogiri' && disable_nokogiri?
-        skip "Pure Java Nokogiri has issues that cause problems with nanoc (see https://github.com/nanoc/nanoc/pull/422) -- run without DISABLE_NOKOGIRI to enable Nokogiri tests"
+        skip 'Pure Java Nokogiri has issues that cause problems with nanoc (see https://github.com/nanoc/nanoc/pull/422) -- run without DISABLE_NOKOGIRI to enable Nokogiri tests'
         return
       end
 
@@ -56,15 +56,13 @@ module Nanoc::TestHelpers
   end
 
   def if_implemented
-    begin
-      yield
-    rescue NotImplementedError, NameError
-      skip $!
-      return
-    end
+    yield
+  rescue NotImplementedError, NameError
+    skip $!
+    return
   end
 
-  def with_site(params={})
+  def with_site(params = {})
     # Build site name
     site_name = params[:name]
     if site_name.nil?
@@ -182,7 +180,7 @@ EOS
     P(object).tags(:example).each do |example|
       # Classify
       lines = example.text.lines.map do |line|
-        [ line =~ /^\s*# ?=>/ ? :result : :code, line ]
+        [line =~ /^\s*# ?=>/ ? :result : :code, line]
       end
 
       # Join
@@ -237,12 +235,12 @@ EOS
     Nanoc.on_windows?
   end
 
-  def have_command?(cmd)
-    which, null = on_windows? ? ["where", "NUL"] : ["which", "/dev/null"]
+  def command?(cmd)
+    which, null = on_windows? ? ['where', 'NUL'] : ['which', '/dev/null']
     system("#{which} #{cmd} > #{null} 2>&1")
   end
 
-  def have_symlink?
+  def symlinks_supported?
     File.symlink nil, nil
   rescue NotImplementedError
     return false
@@ -251,11 +249,11 @@ EOS
   end
 
   def skip_unless_have_command(cmd)
-    skip "Could not find external command \"#{cmd}\"" unless have_command?(cmd)
+    skip "Could not find external command \"#{cmd}\"" unless command?(cmd)
   end
 
-  def skip_unless_have_symlink
-    skip "Symlinks are not supported by Ruby on Windows" unless have_symlink?
+  def skip_unless_symlinks_supported
+    skip 'Symlinks are not supported by Ruby on Windows' unless symlinks_supported?
   end
 
 end
@@ -273,6 +271,6 @@ end
 #
 class Time
   def inspect
-    strftime("%a %b %d %H:%M:%S.#{"%06d" % usec} %Z %Y")
+    strftime("%a %b %d %H:%M:%S.#{'%06d' % usec} %Z %Y")
   end
 end