nanoc 3.6.9 → 3.6.10

data/test/base/core_ext/array_spec.rb

@@ -58,8 +58,8 @@ end
 describe 'Array#checksum' do
 
   it 'should work' do
-    expectation = '78468f950645150238a26f5b8f2dde39a75a7028'
-    [ [ :foo, 123 ]].checksum.must_equal expectation
+    expectation = 'CEUlNvu/3DUmlbtpFRiLHU8oHA0='
+    [ [ :foo, 123 ] ].checksum.must_equal expectation
   end
 
 end

data/test/base/core_ext/hash_spec.rb

@@ -82,15 +82,18 @@ end
 describe 'Hash#checksum' do
 
   it 'should work' do
-    expectation = '78468f950645150238a26f5b8f2dde39a75a7028'
+    expectation = 'wy7gHokc700tqJ/BmJ+EK6/F0bc='
     { :foo => 123 }.checksum.must_equal expectation
-    [ [ :foo, 123 ]].checksum.must_equal expectation
   end
 
-  it 'should sort keys' do
+  it 'should not sort keys' do
+    if RUBY_VERSION =~ /\A1\.8./
+      skip "Ruby 1.8.x does not have ordered hashes"
+    end
+
     a = { :a => 1, :c => 2, :b => 3 }.checksum
     b = { :a => 1, :b => 3, :c => 2 }.checksum
-    a.must_equal b
+    a.wont_equal b
   end
 
 end

data/test/base/core_ext/pathname_spec.rb

@@ -7,12 +7,12 @@ describe 'Pathname#checksum' do
       # Create file
       FileUtils.mkdir_p('tmp')
       File.open('tmp/myfile', 'w') { |io| io.write('') }
-      now = Time.now
-      File.utime(now, now, 'tmp/myfile')
+      timestamp = Time.at(1234569)
+      File.utime(timestamp, timestamp, 'tmp/myfile')
 
       # Create checksum
       pathname = Pathname.new('tmp/myfile')
-      pathname.checksum.must_equal '0-' + now.to_s
+      pathname.checksum.must_equal 'oU+0fYgGm4EDTl+uErBv8rB9YhU='
     ensure
       FileUtils.rm_rf('tmp')
     end
@@ -23,12 +23,12 @@ describe 'Pathname#checksum' do
       # Create file
       FileUtils.mkdir_p('tmp')
       File.open('tmp/myfile', 'w') { |io| io.write('abc') }
-      now = Time.now
-      File.utime(now, now, 'tmp/myfile')
+      timestamp = Time.at(1234569)
+      File.utime(timestamp, timestamp, 'tmp/myfile')
 
       # Create checksum
       pathname = Pathname.new('tmp/myfile')
-      pathname.checksum.must_equal '3-' + now.to_s
+      pathname.checksum.must_equal 'IAoqYXvcDheQjaYmZ8waPtEO8zU='
     ensure
       FileUtils.rm_rf('tmp')
     end

data/test/base/core_ext/string_spec.rb

@@ -27,11 +27,11 @@ end
 describe 'String#checksum' do
 
   it 'should work on empty strings' do
-    ''.checksum.must_equal 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
+    ''.checksum.must_equal 'PfY7essFItpoXa1f6EuB/deyUmQ='
   end
 
   it 'should work on all strings' do
-    'abc'.checksum.must_equal 'a9993e364706816aba3e25717850c26c9cd0d89d'
+    'abc'.checksum.must_equal 'NkkYRO+25f6psNSeCYykXKCg3C0='
   end
 
 end

data/test/base/temp_filename_factory_spec.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+describe Nanoc::TempFilenameFactory do
+
+  subject do
+    Nanoc::TempFilenameFactory.instance
+  end
+
+  let(:prefix) { 'foo' }
+
+  before do
+    subject.cleanup(prefix)
+  end
+
+  describe '#create' do
+
+    it 'should create unique paths' do
+      path_a = subject.create(prefix)
+      path_b = subject.create(prefix)
+      path_a.wont_equal(path_b)
+    end
+
+    it 'should return absolute paths' do
+      path = subject.create(prefix)
+      path.must_match(/\A\//)
+    end
+
+    it 'should create the containing directory' do
+      Dir[subject.root_dir + '/**/*'].must_equal([])
+      path = subject.create(prefix)
+      File.directory?(File.dirname(path)).must_equal(true)
+    end
+
+    it 'should reuse the same path after cleanup' do
+      path_a = subject.create(prefix)
+      subject.cleanup(prefix)
+      path_b = subject.create(prefix)
+      path_a.must_equal(path_b)
+    end
+
+  end
+
+  describe '#cleanup' do
+
+    it 'should remove generated files' do
+      path_a = subject.create(prefix)
+      File.file?(path_a).wont_equal(true) # not yet used
+
+      File.open(path_a, 'w') { |io| io << 'hi!' }
+      File.file?(path_a).must_equal(true)
+
+      subject.cleanup(prefix)
+      File.file?(path_a).wont_equal(true)
+    end
+
+  end
+
+  describe 'other instance' do
+
+    let(:other_instance) do
+      Nanoc::TempFilenameFactory.new
+    end
+
+    it 'should create unique paths across instances' do
+      path_a = subject.create(prefix)
+      path_b = other_instance.create(prefix)
+      path_a.wont_equal(path_b)
+    end
+
+  end
+
+end

data/test/base/test_site.rb

@@ -113,6 +113,32 @@ EOF
     end
   end
 
+  def test_multiple_items_with_same_identifier
+    with_site do
+      File.open('content/sam.html', 'w') { |io| io.write('I am Sam!') }
+      FileUtils.mkdir_p('content/sam')
+      File.open('content/sam/index.html', 'w') { |io| io.write('I am Sam, too!') }
+
+      assert_raises(Nanoc::Errors::DuplicateIdentifier) do
+        site = Nanoc::Site.new('.')
+        site.load
+      end
+    end
+  end
+
+  def test_multiple_layouts_with_same_identifier
+    with_site do
+      File.open('layouts/sam.html', 'w') { |io| io.write('I am Sam!') }
+      FileUtils.mkdir_p('layouts/sam')
+      File.open('layouts/sam/index.html', 'w') { |io| io.write('I am Sam, too!') }
+
+      assert_raises(Nanoc::Errors::DuplicateIdentifier) do
+        site = Nanoc::Site.new('.')
+        site.load
+      end
+    end
+  end
+
 end
 
 describe 'Nanoc::Site#initialize' do

data/test/cli/commands/test_prune.rb

@@ -94,6 +94,10 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
 
   def test_run_with_symlink_to_output_dir
     skip_unless_have_symlink
+    if defined?(JRUBY_VERSION) && JRUBY_VERSION == '1.7.11'
+      skip "JRuby 1.7.11 has buggy File.find behavior (see https://github.com/jruby/jruby/issues/1647)"
+    end
+
     with_site do |site|
       # Set output dir
       FileUtils.rm_rf('output')

data/test/extra/checking/checks/test_css.rb

@@ -3,34 +3,38 @@
 class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
 
   def test_run_ok
-    with_site do |site|
-      # Create files
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write('<h1>Hi!</h1>') }
-      File.open('output/style.css', 'w') { |io| io.write('h1 { color: red; }') }
-
-      # Run check
-      check = Nanoc::Extra::Checking::Checks::CSS.new(site)
-      check.run
-
-      # Check
-      assert check.issues.empty?
+    VCR.use_cassette('css_run_ok') do
+      with_site do |site|
+        # Create files
+        FileUtils.mkdir_p('output')
+        File.open('output/blah.html', 'w') { |io| io.write('<h1>Hi!</h1>') }
+        File.open('output/style.css', 'w') { |io| io.write('h1 { color: red; }') }
+
+        # Run check
+        check = Nanoc::Extra::Checking::Checks::CSS.new(site)
+        check.run
+
+        # Check
+        assert check.issues.empty?
+      end
     end
   end
 
   def test_run_error
-    with_site do |site|
-      # Create files
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write('<h1>Hi!</h1>') }
-      File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
-
-      # Run check
-      check = Nanoc::Extra::Checking::Checks::CSS.new(site)
-      check.run
-
-      # Check
-      refute check.issues.empty?
+    VCR.use_cassette('css_run_error') do
+      with_site do |site|
+        # Create files
+        FileUtils.mkdir_p('output')
+        File.open('output/blah.html', 'w') { |io| io.write('<h1>Hi!</h1>') }
+        File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
+
+        # Run check
+        check = Nanoc::Extra::Checking::Checks::CSS.new(site)
+        check.run
+
+        # Check
+        refute check.issues.empty?
+      end
     end
   end
 

data/test/extra/checking/checks/test_html.rb

@@ -3,34 +3,38 @@
 class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
 
   def test_run_ok
-    with_site do |site|
-      # Create files
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write('<!DOCTYPE html><html><head><meta charset="utf-8"><title>Hello</title></head><body><h1>Hi!</h1></body>') }
-      File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
-
-      # Run check
-      check = Nanoc::Extra::Checking::Checks::HTML.new(site)
-      check.run
-
-      # Check
-      assert check.issues.empty?
+    VCR.use_cassette('html_run_ok') do
+      with_site do |site|
+        # Create files
+        FileUtils.mkdir_p('output')
+        File.open('output/blah.html', 'w') { |io| io.write('<!DOCTYPE html><html><head><meta charset="utf-8"><title>Hello</title></head><body><h1>Hi!</h1></body>') }
+        File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
+
+        # Run check
+        check = Nanoc::Extra::Checking::Checks::HTML.new(site)
+        check.run
+
+        # Check
+        assert check.issues.empty?
+      end
     end
   end
 
   def test_run_error
-    with_site do |site|
-      # Create files
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write('<h2>Hi!</h1>') }
-      File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
-
-      # Run check
-      check = Nanoc::Extra::Checking::Checks::HTML.new(site)
-      check.run
-
-      # Check
-      refute check.issues.empty?
+    VCR.use_cassette('html_run_error') do
+      with_site do |site|
+        # Create files
+        FileUtils.mkdir_p('output')
+        File.open('output/blah.html', 'w') { |io| io.write('<h2>Hi!</h1>') }
+        File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
+
+        # Run check
+        check = Nanoc::Extra::Checking::Checks::HTML.new(site)
+        check.run
+
+        # Check
+        refute check.issues.empty?
+      end
     end
   end
 

data/test/extra/test_piper.rb

@@ -33,4 +33,16 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     assert_equal('', stderr.string)
   end
 
+  def test_no_such_command
+    stdout = StringIO.new
+    stderr = StringIO.new
+
+    cmd = %w( cat kafhawilgoiwaejagoualjdsfilofiewaguihaifeowuiga )
+
+    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/filters/test_colorize_syntax.rb

@@ -282,7 +282,7 @@ puts 'hi!'
 </code></pre>
 after
 EOS
-      expected_output = <<EOS
+      expected_output = <<EOS.sub(/\s*\Z/m, '')
 before
 <pre><code>
 #!/usr/bin/env ruby
@@ -292,7 +292,7 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.setup_and_run(input)
+      actual_output = filter.setup_and_run(input).sub(/\s*\Z/m, '')
       assert_equal(expected_output, actual_output)
     end
   end
@@ -312,7 +312,7 @@ puts 'hi!'
 </code></pre>
 after
 EOS
-      expected_output = <<EOS
+      expected_output = <<EOS.sub(/\s*\Z/m, '')
 before
 #{CODERAY_PRE}<pre><code class=\"language-ruby\"><span class=\"doctype\">#!/usr/bin/env ruby</span>
 puts <span class=\"string\"><span class=\"delimiter\">'</span><span class=\"content\">hi!</span><span class=\"delimiter\">'</span></span></code></pre>#{CODERAY_POST}
@@ -320,7 +320,7 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.setup_and_run(input)
+      actual_output = filter.setup_and_run(input).sub(/\s*\Z/m, '')
       assert_equal(expected_output, actual_output)
     end
   end
@@ -372,7 +372,7 @@ before
 </code></pre>
 after
 EOS
-      expected_output = <<EOS
+      expected_output = <<EOS.sub(/\s*\Z/m, '')
 before
 #{CODERAY_PRE}<pre><code class="language-ruby">  <span class=\"keyword\">def</span> <span class=\"function\">foo</span>
   <span class=\"keyword\">end</span></code></pre>#{CODERAY_POST}
@@ -380,7 +380,7 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.setup_and_run(input)
+      actual_output = filter.setup_and_run(input).sub(/\s*\Z/m, '')
       assert_equal(expected_output, actual_output)
     end
   end

data/test/filters/test_erb.rb

@@ -66,6 +66,10 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
   end
 
   def test_safe_level
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+      skip 'JRuby does not implement safe levels'
+    end
+
     # Set up
     filter = ::Nanoc::Filters::ERB.new
     File.open('moo', 'w') { |io| io.write("one miiillion dollars") }

data/test/filters/test_pandoc.rb

@@ -15,4 +15,19 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
     end
   end
 
+  def test_params
+    if_have 'pandoc-ruby' do
+      skip_unless_have_command "pandoc"
+
+      # Create filter
+      filter = ::Nanoc::Filters::Pandoc.new
+
+      # Run filter
+      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)
+    end
+  end
+
 end

data/test/filters/test_relativize_paths.rb

@@ -103,7 +103,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
 </html>
 EOS
     expected_match_0 = %r{<a href="\.\./\.\.">foo</a>}
-    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*$}
+    expected_match_1 = %r{\A\s*<!DOCTYPE html\s*>\s*<html>\s*<head>(.|\s)*<title>Hello</title>\s*</head>\s*<body>\s*<a href="../..">foo</a>\s*</body>\s*</html>\s*\Z}m
 
     # Test
     actual_content = filter.setup_and_run(raw_content, :type => :html)
@@ -303,7 +303,6 @@ EOS
     assert_equal(expected_content, actual_content)
   end
 
-
   def test_filter_html_object_with_relative_path
     # Create filter with mock item
     filter = Nanoc::Filters::RelativizePaths.new
@@ -319,13 +318,11 @@ EOS
       @item_rep.path = '/woof/meow/'
     end
 
-    # Set content
-    raw_content      = %[<object data="/example"><param name="movie" content="/example"></object>]
-    expected_content = %[<object data="../../example"><param name="movie" content="../../example"></object>]
-
-    # Test
+    raw_content    = %[<object data="/example"><param name="movie" content="/example"></object>]
     actual_content = filter.setup_and_run(raw_content, :type => :html)
-    assert_equal(expected_content, actual_content)
+
+    assert_match(/<object data="..\/..\/example">/, actual_content)
+    assert_match(/<param (name="movie" )?content="..\/..\/example"/, actual_content)
   end
 
 
@@ -503,6 +500,7 @@ EOS
       end
 
       # Set content
+      expected = /<bar boo="\.\.\/\.\.">baz<\/bar>/
       raw_content = <<-XML
 <?xml version="1.0" encoding="utf-8"?>
 <foo>
@@ -510,16 +508,9 @@ EOS
 </foo>
 XML
 
-      expected_content = <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<foo>
-  <bar boo="../..">baz</bar>
-</foo>
-XML
-
-      # Test
       actual_content = filter.setup_and_run(raw_content, :type => :xml, :select => ['*/@boo'])
-      assert_equal(expected_content, actual_content)
+
+      assert_match(expected, actual_content)
     end
   end
 
@@ -546,15 +537,10 @@ XML
 </foo>
 XML
 
-      expected_content = <<-XML
-<foo>
-  <bar><far href="../..">baz</far></bar>
-</foo>
-XML
-
-      # Test
       actual_content = filter.setup_and_run(raw_content, :type => :xml, :select => ['far/@href'])
-      assert_equal(expected_content, actual_content)
+
+      assert_match(/<foo>/, actual_content)
+      assert_match(/<bar><far href="..\/..">baz<\/far><\/bar>/, actual_content)
     end
   end
 
@@ -581,19 +567,14 @@ XML
 </foo>
 XML
 
-      expected_content = <<-XML
-<foo xmlns="http://example.org">
-  <bar><a href="../..">baz</a></bar>
-</foo>
-XML
-
-      # Test
       actual_content = filter.setup_and_run(raw_content, {
-        :type => :xml, 
-        :namespaces => {:ex => 'http://example.org'}, 
+        :type => :xml,
+        :namespaces => {:ex => 'http://example.org'},
         :select => ['ex:a/@href']
       })
-      assert_equal(expected_content, actual_content)
+
+      assert_match(/<foo xmlns="http:\/\/example.org">/,    actual_content)
+      assert_match(/<bar><a href="..\/..">baz<\/a><\/bar>/, actual_content)
     end
   end
 
@@ -628,21 +609,12 @@ XML
 </html>
 XML
 
-      expected_match = %r{^<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>.*<meta.*charset.*>
-    <link rel="stylesheet" href="../../../css" />
-    <script src="../../../js"></script>
-  </head>
-  <body>
-    <a href="../..">bar</a>
-    <img src="../../../img" />
-  </body>
-</html>}
-
-      # Test
       actual_content = filter.setup_and_run(raw_content, :type => :xhtml)
-      assert_match expected_match, actual_content
+
+      assert_match(/<link[^>]*href="..\/..\/..\/css"[^>]*\/>/, actual_content)
+      assert_match(/<script src="..\/..\/..\/js">/,            actual_content)
+      assert_match(/<img src="..\/..\/..\/img"[^>]*\/>/,       actual_content)
+      assert_match(/<a href="..\/..">bar<\/a>/,                actual_content)
     end
   end
 
@@ -670,16 +642,12 @@ XML
 </p>
 XML
 
-      expected_content = <<-XML
-<a href="../..">bar</a>
-<p>
-  <img src="../../../img" />
-</p>
-XML
+      expected_content =
+        %r{\A\s*<a href="../..">bar</a>\s*<p>\s*<img src="../../../img" />\s*</p>\s*\Z}m
 
       # Test
       actual_content = filter.setup_and_run(raw_content.freeze, :type => :xhtml)
-      assert_equal(expected_content, actual_content)
+      assert_match(expected_content, actual_content)
     end
   end
 
@@ -707,16 +675,10 @@ XML
 <![endif]-->
 ]
 
-      expected_content = %[
-<link rel="stylesheet" href="../../foo.css" />
-<!--[if lt IE 9]>
-    <script src="../../js/lib/html5shiv.js"></script>
-<![endif]-->
-]
-
-      # Test
       actual_content = filter.setup_and_run(raw_content.freeze, :type => :xhtml)
-      assert_equal(expected_content, actual_content)
+
+      assert_match(/<link (rel="stylesheet" )?href="..\/..\/foo.css" /,      actual_content)
+      assert_match(/<script src="..\/..\/js\/lib\/html5shiv.js"><\/script>/, actual_content)
     end
   end