nanoc 4.0.0b2 → 4.0.0b3

data/test/base/test_store.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Int::StoreTest < Nanoc::TestCase
   class TestStore < Nanoc::Int::Store
     def data

data/test/cli/commands/test_check.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::Commands::CheckTest < Nanoc::TestCase
   def test_check_stale
     with_site do |_site|

data/test/cli/commands/test_compile.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
   def test_profiling_information
     with_site do |_site|

data/test/cli/commands/test_create_site.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_create_site_with_existing_name
     Nanoc::CLI.run %w( create_site foo )
@@ -88,7 +86,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
         io.write("string_pattern_type: glob\n")
         io.write("data_sources:\n")
         io.write("  -\n")
-        io.write("    type: filesystem_unified\n")
+        io.write("    type: filesystem\n")
         io.write("    identifier_type: full\n")
       end
       site = Nanoc::Int::Site.new('.')

data/test/cli/commands/test_deploy.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   def test_deploy
     skip_unless_have_command 'rsync'

data/test/cli/commands/test_help.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::Commands::HelpTest < Nanoc::TestCase
   def test_run
     Nanoc::CLI.run %w( help )

data/test/cli/commands/test_info.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::Commands::InfoTest < Nanoc::TestCase
   def test_run
     Nanoc::CLI.run %w( info )

data/test/cli/commands/test_prune.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   def test_run_without_yes
     with_site do |_site|
@@ -31,7 +29,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
         io << 'string_pattern_type: legacy' << "\n"
         io << 'data_sources:' << "\n"
         io << '  -' << "\n"
-        io << '    type: filesystem_unified' << "\n"
+        io << '    type: filesystem' << "\n"
         io << '    identifier_type: legacy' << "\n"
       end
       FileUtils.mkdir_p('output2')
@@ -79,7 +77,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
         io << 'string_pattern_type: legacy' << "\n"
         io << 'data_sources:' << "\n"
         io << '  -' << "\n"
-        io << '    type: filesystem_unified' << "\n"
+        io << '    type: filesystem' << "\n"
         io << '    identifier_type: legacy' << "\n"
       end
       FileUtils.mkdir_p('output')

data/test/cli/test_cleaning_stream.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
   class Stream
     attr_accessor :called_methods

data/test/cli/test_cli.rb

@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 class Nanoc::CLITest < Nanoc::TestCase
   COMMAND_CODE = <<EOS
-# encoding: utf-8
-
 usage       '_test [options]'
 summary     'meh'
 description 'longer meh'
@@ -14,8 +10,6 @@ end
 EOS
 
   SUBCOMMAND_CODE = <<EOS
-# encoding: utf-8
-
 usage       '_sub [options]'
 summary     'meh sub'
 description 'longer meh sub'

data/test/cli/test_error_handler.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
   def setup
     super

data/test/cli/test_logger.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::CLI::LoggerTest < Nanoc::TestCase
   def test_stub
   end

data/test/data_sources/test_filesystem.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
   class SampleFilesystemDataSource < Nanoc::DataSource
     include Nanoc::DataSources::Filesystem

data/test/data_sources/test_filesystem_unified.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
   def new_data_source(params = nil)
     # Mock site
@@ -117,6 +115,21 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     assert_nil items[0].raw_content
   end
 
+  def test_load_layouts_with_nil_dir_name
+    # Create data source
+    data_source = new_data_source(layouts_dir: nil)
+
+    # Create sample files
+    FileUtils.mkdir_p('layouts')
+    File.write('layouts/stuff.txt', 'blah blah')
+
+    # Load
+    layouts = data_source.layouts
+
+    # Check
+    assert_empty(layouts)
+  end
+
   def test_load_binary_layouts
     # Create data source
     data_source = new_data_source

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
   def test_run_ok
     VCR.use_cassette('css_run_ok') do
@@ -10,7 +8,7 @@ class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
         File.open('output/style.css', 'w') { |io| io.write('h1 { color: red; }') }
 
         # Run check
-        check = Nanoc::Extra::Checking::Checks::CSS.new(site)
+        check = Nanoc::Extra::Checking::Checks::CSS.create(site)
         check.run
 
         # Check
@@ -28,7 +26,7 @@ class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
         File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
 
         # Run check
-        check = Nanoc::Extra::Checking::Checks::CSS.new(site)
+        check = Nanoc::Extra::Checking::Checks::CSS.create(site)
         check.run
 
         # Check
@@ -49,7 +47,7 @@ class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
         File.open('output/style.css', 'w') { |io| io.write('h1 { ; {') }
 
         # Run check
-        check = Nanoc::Extra::Checking::Checks::CSS.new(site)
+        check = Nanoc::Extra::Checking::Checks::CSS.create(site)
         check.run
 
         # Check

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
   def test_run
     with_site do |site|
@@ -9,7 +7,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
       File.open('output/bar.html', 'w') { |io| io.write('<a href="http://example.com/">not broken</a>') }
 
       # Create check
-      check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::ExternalLinks.create(site)
       def check.request_url_once(url)
         Net::HTTPResponse.new('1.1', url.path == '/' ? '200' : '404', 'okay')
       end
@@ -23,7 +21,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
   def test_valid_by_path
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::ExternalLinks.create(site)
       def check.request_url_once(url)
         Net::HTTPResponse.new('1.1', url.path == '/200' ? '200' : '404', 'okay')
       end
@@ -38,7 +36,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
   def test_valid_by_query
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::ExternalLinks.create(site)
       def check.request_url_once(url)
         Net::HTTPResponse.new('1.1', url.query == 'status=200' ? '200' : '404', 'okay')
       end
@@ -52,7 +50,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
   def test_fallback_to_get_when_head_is_not_allowed
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::ExternalLinks.create(site)
       def check.request_url_once(url, req_method = Net::HTTP::Head)
         Net::HTTPResponse.new('1.1', (req_method == Net::HTTP::Head || url.path == '/405') ? '405' : '200', 'okay')
       end
@@ -65,7 +63,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
 
   def test_path_for_url
     with_site do |site|
-      check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::ExternalLinks.create(site)
 
       assert_equal '/',             check.send(:path_for_url, URI.parse('http://example.com'))
       assert_equal '/',             check.send(:path_for_url, URI.parse('http://example.com/'))

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
   def test_run_ok
     VCR.use_cassette('html_run_ok') do
@@ -10,7 +8,7 @@ class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
         File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
 
         # Run check
-        check = Nanoc::Extra::Checking::Checks::HTML.new(site)
+        check = Nanoc::Extra::Checking::Checks::HTML.create(site)
         check.run
 
         # Check
@@ -28,7 +26,7 @@ class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
         File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
 
         # Run check
-        check = Nanoc::Extra::Checking::Checks::HTML.new(site)
+        check = Nanoc::Extra::Checking::Checks::HTML.create(site)
         check.run
 
         # Check

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
   def test_run
     with_site do |site|
@@ -10,7 +8,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
       File.open('output/bar.html', 'w') { |io| io.write('<a href="/foo.txt">not broken</a>') }
 
       # Create check
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
       check.run
 
       # Test
@@ -28,7 +26,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
       File.open('output/stuff/blah', 'w') { |io| io.write('hi') }
 
       # Create check
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
 
       # Test
       assert check.send(:valid?, 'foo',         'output/origin')
@@ -45,7 +43,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
       FileUtils.mkdir_p('output/stuff')
       File.open('output/stuff/right', 'w') { |io| io.write('hi') }
 
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
 
       assert check.send(:valid?, 'stuff/right?foo=123', 'output/origin')
       refute check.send(:valid?, 'stuff/wrong?foo=123', 'output/origin')
@@ -55,7 +53,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
   def test_exclude
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
       site.config.update({ checks: { internal_links: { exclude: ['^/excluded\d+'] } } })
 
       # Test
@@ -70,7 +68,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
       FileUtils.mkdir_p('output/stuff')
       File.open('output/stuff/right foo', 'w') { |io| io.write('hi') }
 
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
 
       assert check.send(:valid?, 'stuff/right%20foo', 'output/origin')
       refute check.send(:valid?, 'stuff/wrong%20foo', 'output/origin')

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
   def create_output_file(name, lines)
     FileUtils.mkdir_p('output')
@@ -24,7 +22,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<audio src="https://nanoc.ws/theme-song.flac"></audio>',
         '<video src="https://nanoc.ws/screen-cast.mkv"></video>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert check.issues.empty?
@@ -42,7 +40,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<audio src="/theme-song.flac"></audio>',
         '<video src="/screen-cast.mkv"></video>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert check.issues.empty?
@@ -60,7 +58,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<audio src="//nanoc.ws/theme-song.flac"></audio>',
         '<video src="//nanoc.ws/screen-cast.mkv"></video>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert check.issues.empty?
@@ -78,7 +76,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<audio src="theme-song.flac"></audio>',
         '<video src="screen-cast.mkv"></video>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert check.issues.empty?
@@ -96,7 +94,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<audio src="?query-string"></audio>',
         '<video src="?query-string"></video>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert check.issues.empty?
@@ -114,7 +112,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<audio src="#fragment"></audio>',
         '<video src="#fragment"></video>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert check.issues.empty?
@@ -133,7 +131,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<audio src="http://nanoc.ws/theme-song.flac"></audio>',
         '<video src="http://nanoc.ws/screencast.mkv"></video>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       issues = check.issues.to_a
@@ -179,7 +177,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<video target="http://nanoc.ws/screen-cast.mkv"></video>',
         '<p>http://nanoc.ws/harmless-text</p>'
       ])
-      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert check.issues.empty?

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
   def check_class
     Nanoc::Extra::Checking::Checks::Stale
@@ -7,7 +5,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
 
   def calc_issues
     site = Nanoc::Int::Site.new('.')
-    check = check_class.new(site)
+    check = check_class.create(site)
     check.run
     check.issues
   end

data/test/extra/checking/test_check.rb

@@ -1,11 +1,8 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::CheckTest < Nanoc::TestCase
   def test_output_filenames
     with_site do |site|
-      check = Nanoc::Extra::Checking::Check.new(site)
-      assert check.output_filenames.empty?
       File.open('output/foo.html', 'w') { |io| io.write 'hello' }
+      check = Nanoc::Extra::Checking::Check.create(site)
       assert_equal ['output/foo.html'], check.output_filenames
     end
   end
@@ -13,9 +10,8 @@ class Nanoc::Extra::Checking::CheckTest < Nanoc::TestCase
   def test_no_output_dir
     with_site do |site|
       site.config[:output_dir] = 'non-existent'
-      check = Nanoc::Extra::Checking::Check.new(site)
       assert_raises Nanoc::Extra::Checking::OutputDirNotFoundError do
-        check.output_filenames
+        Nanoc::Extra::Checking::Check.create(site)
       end
     end
   end

data/test/extra/checking/test_dsl.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
   def test_from_file
     with_site do |_site|

data/test/extra/checking/test_runner.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
   def test_run_specific
     with_site do |site|

data/test/extra/core_ext/test_pathname.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 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

data/test/extra/core_ext/test_time.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::ExtraCoreExtTimeTest < Nanoc::TestCase
   def test___nanoc_to_iso8601_date
     assert_equal('2008-05-19', Time.utc(2008, 5, 19, 14, 20, 0, 0).__nanoc_to_iso8601_date)