nanoc 4.7.5 → 4.7.6

data/test/data_sources/test_filesystem.rb

@@ -547,12 +547,12 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Write sample files
     FileUtils.mkdir_p('foo')
-    %w(foo.html foo.yaml bar.entry.html foo/qux.yaml).each do |filename|
+    %w[foo.html foo.yaml bar.entry.html foo/qux.yaml].each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
     # Write stray files
-    %w(foo.html~ foo.yaml.orig bar.entry.html.bak).each do |filename|
+    %w[foo.html~ foo.yaml.orig bar.entry.html.bak].each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
@@ -574,12 +574,12 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Write sample files
     FileUtils.mkdir_p('foo')
-    %w(foo.html foo.yaml bar.html.erb foo/qux.yaml).each do |filename|
+    %w[foo.html foo.yaml bar.html.erb foo/qux.yaml].each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
     # Write stray files
-    %w(foo.html~ foo.yaml.orig bar.entry.html.bak).each do |filename|
+    %w[foo.html~ foo.yaml.orig bar.entry.html.bak].each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
@@ -600,7 +600,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
     # Write sample files
-    %w(aaa/foo.html bbb/foo.html ccc/foo.html).each do |filename|
+    %w[aaa/foo.html bbb/foo.html ccc/foo.html].each do |filename|
       FileUtils.mkdir_p(File.dirname(filename))
       File.open(filename, 'w') { |io| io.write('test') }
     end
@@ -620,7 +620,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, config)
 
     # Write sample files
-    %w(stuff/foo.html stuff/foo.md stuff/foo.yaml).each do |filename|
+    %w[stuff/foo.html stuff/foo.md stuff/foo.yaml].each do |filename|
       FileUtils.mkdir_p(File.dirname(filename))
       File.open(filename, 'w') { |io| io.write('test') }
     end
@@ -631,7 +631,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     assert_equal 2, res.values[0].size
     assert_equal 'yaml', res.values[0][0]
     assert_equal Array, res.values[0][1].class
-    assert_equal %w(html md), res.values[0][1].sort
+    assert_equal %w[html md], res.values[0][1].sort
   end
 
   def test_all_split_files_in_with_multiple_content_files
@@ -639,7 +639,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
     # Write sample files
-    %w(foo.html foo.xhtml foo.txt foo.yaml bar.html qux.yaml).each do |filename|
+    %w[foo.html foo.xhtml foo.txt foo.yaml bar.html qux.yaml].each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 

data/test/extra/core_ext/test_pathname.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class Nanoc::Extra::CoreExtPathnameTest < Nanoc::TestCase
   def test_components
-    assert_equal %w(/ a bb ccc dd e), Pathname.new('/a/bb/ccc/dd/e').__nanoc_components
+    assert_equal %w[/ a bb ccc dd e], Pathname.new('/a/bb/ccc/dd/e').__nanoc_components
   end
 
   def test_include_component

data/test/extra/test_link_collector.rb

@@ -24,7 +24,7 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
     end
 
     # Create validator
-    collector = Nanoc::Extra::LinkCollector.new(%w(file-a.html file-b.html))
+    collector = Nanoc::Extra::LinkCollector.new(%w[file-a.html file-b.html])
 
     # Test
     hrefs_with_filenames = collector.filenames_per_href
@@ -60,7 +60,7 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
     end
 
     # Create validator
-    collector = Nanoc::Extra::LinkCollector.new(%w(file-a.html file-b.html), :external)
+    collector = Nanoc::Extra::LinkCollector.new(%w[file-a.html file-b.html], :external)
 
     # Test
     hrefs_with_filenames = collector.filenames_per_href
@@ -93,7 +93,7 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
     end
 
     # Create validator
-    collector = Nanoc::Extra::LinkCollector.new(%w(file-a.html file-b.html), :internal)
+    collector = Nanoc::Extra::LinkCollector.new(%w[file-a.html file-b.html], :internal)
 
     # Test
     hrefs_with_filenames = collector.filenames_per_href

data/test/extra/test_piper.rb

@@ -5,7 +5,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     stdout = StringIO.new
     stderr = StringIO.new
 
-    cmd = %w(ls -l)
+    cmd = %w[ls -l]
 
     File.open('foo.txt', 'w') { |io| io.write('hi') }
     File.open('bar.txt', 'w') { |io| io.write('ho') }
@@ -23,7 +23,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     stderr = StringIO.new
 
     input = 'Hello World!'
-    cmd = %w(cat)
+    cmd = %w[cat]
 
     piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     piper.run(cmd, input)
@@ -36,7 +36,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     stdout = StringIO.new
     stderr = StringIO.new
 
-    cmd = %w(cat kafhawilgoiwaejagoualjdsfilofiewaguihaifeowuiga)
+    cmd = %w[cat kafhawilgoiwaejagoualjdsfilofiewaguihaifeowuiga]
 
     piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     assert_raises(Nanoc::Extra::Piper::Error) do

data/test/filters/colorize_syntax/test_common.rb

@@ -51,6 +51,30 @@ EOS
     end
   end
 
+  def test_full_page_html5
+    # Create filter
+    filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+    # Get input and expected output
+    input = <<EOS
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Foo</title>
+</head>
+<body>
+  <pre title="moo"><code class="language-ruby"># comment</code></pre>
+</body>
+</html>
+EOS
+    expected_output_regex = %r{^<!DOCTYPE html>\s*<html>\s*<head>\s*<meta 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, syntax: :html5, default_colorizer: :dummy, is_fullpage: true)
+    assert_match expected_output_regex, actual_output
+  end
+
   def test_colorize_syntax_with_missing_executables
     if_have 'nokogiri' do
       begin
@@ -64,7 +88,7 @@ EOS
         input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
 
         # Run filter
-        %i(albino pygmentize simon_highlight).each do |colorizer|
+        %i[albino pygmentize simon_highlight].each do |colorizer|
           begin
             input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
             filter.setup_and_run(

data/test/filters/test_relativize_paths.rb

@@ -117,6 +117,44 @@ EOS
     assert_match(expected1, actual_content)
   end
 
+  def test_filter_html5_with_boilerplate
+    # Create filter with mock item
+    filter = Nanoc::Filters::RelativizePaths.new
+
+    # Mock item
+    filter.instance_eval do
+      @item_rep = Nanoc::Int::ItemRep.new(
+        Nanoc::Int::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
+    end
+
+    # Set content
+    raw_content = <<EOS
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Hello</title>
+  </head>
+  <body>
+    <a href=/foo>foo</a>
+  </body>
+</html>
+EOS
+    expected0 = %r{<a href="\.\./\.\.">foo</a>}
+    expected1 = %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: :html5)
+    assert_match(expected0, actual_content)
+    assert_match(expected1, actual_content)
+  end
+
   def test_filter_html_multiple
     # Create filter with mock item
     filter = Nanoc::Filters::RelativizePaths.new

data/test/helper.rb

@@ -249,7 +249,7 @@ EOS
   end
 
   def command?(cmd)
-    which, null = on_windows? ? %w(where NUL) : ['which', '/dev/null']
+    which, null = on_windows? ? %w[where NUL] : ['which', '/dev/null']
     system("#{which} #{cmd} > #{null} 2>&1")
   end
 

data/test/helpers/test_capturing.rb

@@ -46,14 +46,14 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
       File.open('content/includee.erb', 'w') do |io|
         io.write '{<% content_for :blah do %>Old content<% end %>}'
       end
-      Nanoc::CLI.run(%w(compile))
+      Nanoc::CLI.run(%w[compile])
       assert_equal '[Old content]', File.read('output/includer/index.html')
 
       # Compile again
       File.open('content/includee.erb', 'w') do |io|
         io.write '{<% content_for :blah do %>New content<% end %>}'
       end
-      Nanoc::CLI.run(%w(compile))
+      Nanoc::CLI.run(%w[compile])
       assert_equal '[New content]', File.read('output/includer/index.html')
     end
   end
@@ -85,7 +85,7 @@ EOS
 
     result = ::ERB.new(content).result(binding)
 
-    expected = %w(head before basic after foot)
+    expected = %w[head before basic after foot]
     actual   = result.scan(/[a-z]+/)
     assert_equal expected, actual
   end
@@ -113,14 +113,14 @@ EOS
       File.open('content/includee.erb', 'w') do |io|
         io.write '{<% content_for :blah do %>Old content<% end %>}'
       end
-      Nanoc::CLI.run(%w(compile))
+      Nanoc::CLI.run(%w[compile])
       assert_equal '{[nil-Old content]}', File.read('output/includer/index.html')
 
       # Compile again
       File.open('content/includee.erb', 'w') do |io|
         io.write '{<% content_for :blah do %>New content<% end %>}'
       end
-      Nanoc::CLI.run(%w(compile))
+      Nanoc::CLI.run(%w[compile])
       assert_equal '{[nil-New content]}', File.read('output/includer/index.html')
     end
   end
@@ -141,7 +141,7 @@ EOS
         io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
       end
 
-      Nanoc::CLI.run(%w(compile))
+      Nanoc::CLI.run(%w[compile])
       assert_equal 'Foo!', File.read('output/self/index.html')
     end
   end
@@ -164,7 +164,7 @@ EOS
       File.open('content/includer.erb', 'w') do |io|
         io.write 'Old-<%= content_for(@items["/includee/"], :blah) %>'
       end
-      Nanoc::CLI.run(%w(compile))
+      Nanoc::CLI.run(%w[compile])
       assert_equal '{}', File.read('output/includee/index.html')
       assert_equal 'Old-Content', File.read('output/includer/index.html')
 
@@ -172,7 +172,7 @@ EOS
       File.open('content/includer.erb', 'w') do |io|
         io.write 'New-<%= content_for(@items["/includee/"], :blah) %>'
       end
-      Nanoc::CLI.run(%w(compile))
+      Nanoc::CLI.run(%w[compile])
       assert_equal '{}', File.read('output/includee/index.html')
       assert_equal 'New-Content', File.read('output/includer/index.html')
     end

data/test/rule_dsl/test_action_provider.rb

@@ -20,7 +20,7 @@ class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
 
   def test_per_rules_file_preprocessor
     # Create site
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
     FileUtils.cd('foo') do
       # Create a bonus rules file
       File.write(
@@ -51,7 +51,7 @@ class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
 
   def test_per_rules_file_postprocessor
     # Create site
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
     FileUtils.cd('foo') do
       # Create a bonus rules file
       File.write(

data/test/rule_dsl/test_rule.rb

@@ -16,7 +16,7 @@ class Nanoc::Int::RuleTest < Nanoc::TestCase
   def test_matches
     pattern    = Nanoc::Int::Pattern.from(%r{/(.*)/(.*)/})
     identifier = '/anything/else/'
-    expected   = %w(anything else)
+    expected   = %w[anything else]
 
     rule = Nanoc::RuleDSL::Rule.new(pattern, :string, proc {})
 

data/test/test_gem.rb

@@ -15,7 +15,7 @@ class Nanoc::GemTest < Nanoc::TestCase
     stdout = StringIO.new
     stderr = StringIO.new
     piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
-    piper.run(%w(gem build nanoc.gemspec), nil)
+    piper.run(%w[gem build nanoc.gemspec], nil)
     files_after = Set.new Dir['**/*']
 
     # Check new files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.7.5
+  version: 4.7.6
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement