nanoc 4.3.7 → 4.3.8

data/test/{extra/checking → checking}/checks/test_css.rb

@@ -1,4 +1,4 @@
-class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
+class Nanoc::Checking::Checks::CSSTest < Nanoc::TestCase
   def test_run_ok
     VCR.use_cassette('css_run_ok') do
       with_site do |site|
@@ -8,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.create(site)
+        check = Nanoc::Checking::Checks::CSS.create(site)
         check.run
 
         # Check
@@ -26,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.create(site)
+        check = Nanoc::Checking::Checks::CSS.create(site)
         check.run
 
         # Check
@@ -49,7 +49,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.create(site)
+        check = Nanoc::Checking::Checks::CSS.create(site)
         check.run
 
         # Check

data/test/{extra/checking → checking}/checks/test_external_links.rb

@@ -1,4 +1,4 @@
-class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
+class Nanoc::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
   def test_run
     with_site do |site|
       # Create files
@@ -7,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.create(site)
+      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
       def check.request_url_once(url)
         Net::HTTPResponse.new('1.1', url.path == '/' ? '200' : '404', 'okay')
       end
@@ -21,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.create(site)
+      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
       def check.request_url_once(url)
         Net::HTTPResponse.new('1.1', url.path == '/200' ? '200' : '404', 'okay')
       end
@@ -36,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.create(site)
+      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
       def check.request_url_once(url)
         Net::HTTPResponse.new('1.1', url.query == 'status=200' ? '200' : '404', 'okay')
       end
@@ -50,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.create(site)
+      check = Nanoc::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
@@ -63,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.create(site)
+      check = Nanoc::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/'))
@@ -76,7 +76,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
   def test_excluded
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::ExternalLinks.create(site)
+      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
       site.config.update({ checks: { external_links: { exclude: ['^http://excluded.com$'] } } })
 
       # Test
@@ -89,7 +89,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
   def test_excluded_file
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::ExternalLinks.create(site)
+      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
       site.config.update({ checks: { external_links: { exclude_files: ['blog/page'] } } })
 
       # Test

data/test/{extra/checking → checking}/checks/test_html.rb

@@ -1,4 +1,4 @@
-class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
+class Nanoc::Checking::Checks::HTMLTest < Nanoc::TestCase
   def test_run_ok
     VCR.use_cassette('html_run_ok') do
       with_site do |site|
@@ -8,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.create(site)
+        check = Nanoc::Checking::Checks::HTML.create(site)
         check.run
 
         # Check
@@ -26,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.create(site)
+        check = Nanoc::Checking::Checks::HTML.create(site)
         check.run
 
         # Check

data/test/{extra/checking → checking}/checks/test_internal_links.rb

@@ -1,4 +1,4 @@
-class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
+class Nanoc::Checking::Checks::InternalLinksTest < Nanoc::TestCase
   def test_run
     with_site do |site|
       # Create files
@@ -8,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.create(site)
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       check.run
 
       # Test
@@ -23,7 +23,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
       File.open('output/bar.html', 'w') { |io| io.write('<link rel="stylesheet" href="/styledinges.css">') }
 
       # Create check
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       check.run
 
       # Test
@@ -41,7 +41,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.create(site)
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
 
       # Test
       assert check.send(:valid?, 'foo',         'output/origin')
@@ -58,7 +58,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.create(site)
+      check = Nanoc::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')
@@ -68,7 +68,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
   def test_exclude
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       site.config.update({ checks: { internal_links: { exclude: ['^/excluded\d+'] } } })
 
       # Test
@@ -81,7 +81,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
   def test_exclude_targets
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       site.config.update({ checks: { internal_links: { exclude_targets: ['^/excluded\d+'] } } })
 
       # Test
@@ -94,7 +94,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
   def test_exclude_origins
     with_site do |site|
       # Create check
-      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       site.config.update({ checks: { internal_links: { exclude_origins: ['^/excluded'] } } })
 
       # Test
@@ -108,7 +108,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.create(site)
+      check = Nanoc::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 → checking}/checks/test_mixed_content.rb

@@ -1,4 +1,4 @@
-class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
+class Nanoc::Checking::Checks::MixedContentTest < Nanoc::TestCase
   def create_output_file(name, lines)
     FileUtils.mkdir_p('output')
     File.open('output/' + name, 'w') do |io|
@@ -22,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert_empty check.issues
@@ -40,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert_empty check.issues
@@ -58,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert_empty check.issues
@@ -76,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert_empty check.issues
@@ -94,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert_empty check.issues
@@ -112,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert_empty check.issues
@@ -131,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       issues = check.issues.to_a
@@ -177,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.create(site)
+      check = Nanoc::Checking::Checks::MixedContent.create(site)
       check.run
 
       assert_empty check.issues

data/test/{extra/checking → checking}/checks/test_stale.rb

@@ -1,11 +1,11 @@
-class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
+class Nanoc::Checking::Checks::StaleTest < Nanoc::TestCase
   def check_class
-    Nanoc::Extra::Checking::Checks::Stale
+    Nanoc::Checking::Checks::Stale
   end
 
   def calc_issues
     site = Nanoc::Int::SiteLoader.new.new_from_cwd
-    runner = Nanoc::Extra::Checking::Runner.new(site)
+    runner = Nanoc::Checking::Runner.new(site)
     runner.run_checks([check_class])
   end
 

data/test/{extra/checking → checking}/test_check.rb

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

data/test/{extra/checking → checking}/test_dsl.rb

@@ -1,11 +1,11 @@
-class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
+class Nanoc::Checking::DSLTest < Nanoc::TestCase
   def test_from_file
     with_site do |_site|
       File.open('Checks', 'w') { |io| io.write("check :foo do\n\nend\ndeploy_check :bar\n") }
-      dsl = Nanoc::Extra::Checking::DSL.from_file('Checks')
+      dsl = Nanoc::Checking::DSL.from_file('Checks')
 
       # One new check
-      refute Nanoc::Extra::Checking::Check.named(:foo).nil?
+      refute Nanoc::Checking::Check.named(:foo).nil?
 
       # One check marked for deployment
       assert_equal [:bar], dsl.deploy_checks
@@ -16,7 +16,7 @@ class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
     with_site do |_site|
       File.write('stuff.rb', '$greeting = "hello"')
       File.write('Checks', 'require "./stuff"')
-      Nanoc::Extra::Checking::DSL.from_file('Checks')
+      Nanoc::Checking::DSL.from_file('Checks')
       assert_equal 'hello', $greeting
     end
   end
@@ -24,7 +24,7 @@ class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
   def test_has_absolute_path
     with_site do |_site|
       File.write('Checks', '$stuff = __FILE__')
-      Nanoc::Extra::Checking::DSL.from_file('Checks')
+      Nanoc::Checking::DSL.from_file('Checks')
       assert($stuff.start_with?('/'))
     end
   end

data/test/{extra/checking → checking}/test_runner.rb

@@ -1,8 +1,8 @@
-class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
+class Nanoc::Checking::RunnerTest < Nanoc::TestCase
   def test_run_specific
     with_site do |site|
       File.open('output/blah', 'w') { |io| io.write('I am stale! Haha!') }
-      runner = Nanoc::Extra::Checking::Runner.new(site)
+      runner = Nanoc::Checking::Runner.new(site)
       runner.run_specific(%w(stale))
     end
   end
@@ -13,7 +13,7 @@ class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
         io.write('check :my_foo_check do ; puts "I AM FOO!" ; end')
       end
 
-      runner = Nanoc::Extra::Checking::Runner.new(site)
+      runner = Nanoc::Checking::Runner.new(site)
       ios = capturing_stdio do
         runner.run_specific(%w(my_foo_check))
       end
@@ -28,7 +28,7 @@ class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
         io.write('check :my_foo_check do ; end')
       end
 
-      runner = Nanoc::Extra::Checking::Runner.new(site)
+      runner = Nanoc::Checking::Runner.new(site)
       ios = capturing_stdio do
         runner.list_checks
       end

data/test/data_sources/test_filesystem.rb

@@ -483,24 +483,6 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     assert_equal nil,            data_source.send(:filename_for, '/foo', nil)
   end
 
-  def test_compile_huge_site
-    if_implemented do
-      # Create data source
-      data_source = new_data_source
-
-      # Create a lot of items
-      count = Process.getrlimit(Process::RLIMIT_NOFILE)[0] + 5
-      count.times do |i|
-        FileUtils.mkdir_p("content/#{i}")
-        File.open("content/#{i}/#{i}.html", 'w') { |io| io << "This is item #{i}." }
-        File.open("content/#{i}/#{i}.yaml", 'w') { |io| io << "title: Item #{i}"   }
-      end
-
-      # Read all items
-      data_source.items
-    end
-  end
-
   def test_compile_iso_8859_1_site
     # Check encoding
     unless ''.respond_to?(:encode)

data/test/{extra → data_sources}/test_filesystem_tools.rb

@@ -1,4 +1,4 @@
-class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
+class Nanoc::DataSources::FilesystemToolsTest < Nanoc::TestCase
   def setup
     super
     skip_unless_symlinks_supported
@@ -30,7 +30,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
       'dir0/sub/sub/sub/sub/sub/sub/sub/sub/sub/foo.md',
       'dir0/sub/sub/sub/sub/sub/sub/sub/sub/sub/sub/foo.md',
     ]
-    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir0', nil).sort
+    actual_files = Nanoc::DataSources::Filesystem::Tools.all_files_in('dir0', nil).sort
     assert_equal expected_files, actual_files
   end
 
@@ -44,8 +44,8 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
       File.symlink("../dir#{i}", "dir#{i - 1}/sub")
     end
 
-    assert_raises Nanoc::Extra::FilesystemTools::MaxSymlinkDepthExceededError do
-      Nanoc::Extra::FilesystemTools.all_files_in('dir0', nil)
+    assert_raises Nanoc::DataSources::Filesystem::Tools::MaxSymlinkDepthExceededError do
+      Nanoc::DataSources::Filesystem::Tools.all_files_in('dir0', nil)
     end
   end
 
@@ -59,7 +59,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     File.symlink('../bar', 'foo/barlink')
 
     expected_files = ['foo/barlink/y.md', 'foo/x.md']
-    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('foo', nil).sort
+    actual_files   = Nanoc::DataSources::Filesystem::Tools.all_files_in('foo', nil).sort
     assert_equal expected_files, actual_files
   end
 
@@ -72,7 +72,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
 
     # Check
     expected_files = ['dir/bar-link', 'dir/foo']
-    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('dir', nil).sort
+    actual_files   = Nanoc::DataSources::Filesystem::Tools.all_files_in('dir', nil).sort
     assert_equal expected_files, actual_files
   end
 
@@ -83,7 +83,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     File.symlink('baz', 'qux')
 
     expected = File.expand_path('foo')
-    actual   = Nanoc::Extra::FilesystemTools.resolve_symlink('qux')
+    actual   = Nanoc::DataSources::Filesystem::Tools.resolve_symlink('qux')
     assert_equal expected, actual
   end
 
@@ -94,8 +94,8 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
       File.symlink("symlink-#{i - 1}", "symlink-#{i}")
     end
 
-    assert_raises Nanoc::Extra::FilesystemTools::MaxSymlinkDepthExceededError do
-      Nanoc::Extra::FilesystemTools.resolve_symlink('symlink-7')
+    assert_raises Nanoc::DataSources::Filesystem::Tools::MaxSymlinkDepthExceededError do
+      Nanoc::DataSources::Filesystem::Tools.resolve_symlink('symlink-7')
     end
   end
 
@@ -105,7 +105,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     File.open('dir/.DS_Store', 'w') { |io| io.write('o hai') }
     File.open('dir/.htaccess', 'w') { |io| io.write('o hai') }
 
-    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir', nil).sort
+    actual_files = Nanoc::DataSources::Filesystem::Tools.all_files_in('dir', nil).sort
     assert_equal [], actual_files
   end
 
@@ -114,7 +114,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     FileUtils.mkdir_p('dir')
     File.open('dir/.other', 'w') { |io| io.write('o hai') }
 
-    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir', '**/.other').sort
+    actual_files = Nanoc::DataSources::Filesystem::Tools.all_files_in('dir', '**/.other').sort
     assert_equal ['dir/.other'], actual_files
   end
 
@@ -124,7 +124,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     File.open('dir/.other', 'w') { |io| io.write('o hai') }
     File.open('dir/.DS_Store', 'w') { |io| io.write('o hai') }
 
-    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir', ['**/.other', '**/.DS_Store']).sort
+    actual_files = Nanoc::DataSources::Filesystem::Tools.all_files_in('dir', ['**/.other', '**/.DS_Store']).sort
     assert_equal ['dir/.other', 'dir/.DS_Store'].sort, actual_files.sort
   end
 
@@ -136,7 +136,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     pattern = { dotfiles: '**/.other' }
 
     assert_raises Nanoc::Int::Errors::GenericTrivial, "Do not know how to handle extra_files: #{pattern.inspect}" do
-      Nanoc::Extra::FilesystemTools.all_files_in('dir0', pattern)
+      Nanoc::DataSources::Filesystem::Tools.all_files_in('dir0', pattern)
     end
   end
 end