nanoc 3.7.4 → 3.7.5

data/test/data_sources/test_filesystem_verbose.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
-
   def new_data_source(params = nil)
     # Mock site
     site = Nanoc::Site.new({})
@@ -42,22 +41,22 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
 
     # Check items
     assert_equal(2, items.size)
-    assert(items.any? { |a|
+    assert(items.any? do |a|
       a[:title]            == 'Foo' &&
       a[:extension]        == 'html' &&
       a[:content_filename] == 'content/foo/foo.html' &&
       a[:meta_filename]    == 'content/foo/foo.yaml'
-    })
-    assert(items.any? { |a|
+    end)
+    assert(items.any? do |a|
       a[:title]            == 'Bar' &&
       a[:extension]        == 'xml' &&
       a[:content_filename] == 'content/bar/bar.xml' &&
       a[:meta_filename]    == 'content/bar/bar.yaml'
-    })
+    end)
   end
 
   def test_items_with_period_in_name
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    data_source = new_data_source(allow_periods_in_identifiers: true)
 
     # Create foo.css
     FileUtils.mkdir_p('content/foo')
@@ -67,7 +66,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
     File.open('content/foo/foo.css', 'w') do |io|
       io.write('body.foo {}')
     end
-    
+
     # Create foo.bar.css
     FileUtils.mkdir_p('content/foo.bar')
     File.open('content/foo.bar/foo.bar.yaml', 'w') do |io|
@@ -76,10 +75,10 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
     File.open('content/foo.bar/foo.bar.css', 'w') do |io|
       io.write('body.foobar {}')
     end
-    
+
     # Load
     items = data_source.items.sort_by { |i| i[:title] }
-    
+
     # Check
     assert_equal 2, items.size
     assert_equal '/foo/',                        items[0].identifier
@@ -114,18 +113,18 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
 
     # Check items
     assert_equal(2, items.size)
-    assert(items.any? { |a|
-      a[:title]            == nil &&
-      a[:extension]        == 'html' &&
+    assert(items.any? do |a|
+      a[:title].nil? &&
+      a[:extension] == 'html' &&
       a[:content_filename] == 'content/foo/foo.html' &&
-      a[:meta_filename]    == nil
-    })
-    assert(items.any? { |a|
-      a[:title]            == 'Bar' &&
-      a[:extension]        == nil &&
-      a[:content_filename] == nil &&
-      a[:meta_filename]    == 'content/bar/bar.yaml'
-    })
+      a[:meta_filename].nil?
+    end)
+    assert(items.any? do |a|
+      a[:title] == 'Bar' &&
+      a[:extension].nil? &&
+      a[:content_filename].nil? &&
+      a[:meta_filename] == 'content/bar/bar.yaml'
+    end)
   end
 
   def test_layouts
@@ -164,7 +163,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
     File.open('layouts/foo/foo.html', 'w') do |io|
       io.write('body.foo {}')
     end
-    
+
     # Create bar.html.erb
     FileUtils.mkdir_p('layouts/bar')
     File.open('layouts/bar/bar.yaml', 'w') do |io|
@@ -173,10 +172,10 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
     File.open('layouts/bar/bar.html.erb', 'w') do |io|
       io.write('body.foobar {}')
     end
-    
+
     # Load
-    layouts = data_source.layouts.sort_by { |i| i.identifier }
-    
+    layouts = data_source.layouts.sort_by(&:identifier)
+
     # Check
     assert_equal 2, layouts.size
     assert_equal '/bar/', layouts[0].identifier
@@ -186,7 +185,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
   end
 
   def test_layouts_with_period_in_name_allowing_periods_in_identifiers
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    data_source = new_data_source(allow_periods_in_identifiers: true)
 
     # Create foo.html
     FileUtils.mkdir_p('layouts/foo')
@@ -196,7 +195,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
     File.open('layouts/foo/foo.html', 'w') do |io|
       io.write('body.foo {}')
     end
-    
+
     # Create bar.html.erb
     FileUtils.mkdir_p('layouts/bar.xyz')
     File.open('layouts/bar.xyz/bar.xyz.yaml', 'w') do |io|
@@ -205,10 +204,10 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
     File.open('layouts/bar.xyz/bar.xyz.html', 'w') do |io|
       io.write('body.foobar {}')
     end
-    
+
     # Load
-    layouts = data_source.layouts.sort_by { |i| i.identifier }
-    
+    layouts = data_source.layouts.sort_by(&:identifier)
+
     # Check
     assert_equal 2, layouts.size
     assert_equal '/bar.xyz/', layouts[0].identifier
@@ -220,7 +219,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
   def test_create_item_at_root
     # Create item
     data_source = new_data_source
-    data_source.create_item('content here', { :foo => 'bar' }, '/')
+    data_source.create_item('content here', { foo: 'bar' }, '/')
 
     # Check file existance
     assert File.directory?('content')
@@ -235,7 +234,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
   def test_create_item_not_at_root
     # Create item
     data_source = new_data_source
-    data_source.create_item('content here', { :foo => 'bar' }, '/moo/')
+    data_source.create_item('content here', { foo: 'bar' }, '/moo/')
 
     # Check file existance
     assert File.directory?('content/moo')
@@ -250,7 +249,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
   def test_create_layout
     # Create layout
     data_source = new_data_source
-    data_source.create_layout('content here', { :foo => 'bar' }, '/moo/')
+    data_source.create_layout('content here', { foo: 'bar' }, '/moo/')
 
     # Check file existance
     assert File.directory?('layouts/moo')
@@ -351,5 +350,4 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
       data_source.items
     end
   end
-
 end

data/test/data_sources/test_static.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::DataSources::StaticTest < Nanoc::TestCase
-
   def new_data_source(params = nil)
     # Mock site
     site = Nanoc::Site.new({})
@@ -17,7 +16,7 @@ class Nanoc::DataSources::StaticTest < Nanoc::TestCase
     skip_unless_symlinks_supported
 
     # Create data source
-    data_source = new_data_source(:prefix => 'foo')
+    data_source = new_data_source(prefix: 'foo')
 
     # Create sample files
     FileUtils.mkdir_p('foo')
@@ -33,19 +32,19 @@ class Nanoc::DataSources::StaticTest < Nanoc::TestCase
 
     # Check all files
     expected_filenames = ['foo/a.png', 'foo/1/b.png', 'foo/c.png'].sort
-    actual_filenames   = Nanoc::Extra::FilesystemTools.all_files_in('foo').sort
+    actual_filenames   = Nanoc::Extra::FilesystemTools.all_files_in('foo', nil).sort
     assert_equal expected_filenames, actual_filenames
 
     # Check items
-    items = data_source.send(:items).sort_by { |i| i.identifier }
-    actual_item_identifiers   = items.map { |i| i.identifier }.sort
+    items = data_source.send(:items).sort_by(&:identifier)
+    actual_item_identifiers   = items.map(&:identifier).sort
     expected_item_identifiers = %w( /a.png/ /1/b.png/ /c.png/ ).sort
     assert_equal expected_item_identifiers, actual_item_identifiers
   end
 
   def test_items
     # Create data source
-    data_source = new_data_source(:prefix => 'foo')
+    data_source = new_data_source(prefix: 'foo')
 
     # Create sample files
     FileUtils.mkdir_p('foo')
@@ -58,33 +57,33 @@ class Nanoc::DataSources::StaticTest < Nanoc::TestCase
     expected_out = [
       Nanoc::Item.new(
         'foo/bar.png',
-        { :extension => 'png', :filename => 'foo/bar.png' },
+        { extension: 'png', filename: 'foo/bar.png' },
         '/bar.png/',
-        :binary => true,
-        :mtime => File.mtime('foo/bar.png'),
-        :checksum => Pathname.new('foo/bar.png').checksum
+        binary: true,
+        mtime: File.mtime('foo/bar.png'),
+        checksum: Pathname.new('foo/bar.png').checksum
       ),
       Nanoc::Item.new(
         'foo/b.c.css',
-        { :extension => 'css', :filename => 'foo/b.c.css' },
+        { extension: 'css', filename: 'foo/b.c.css' },
         '/b.c.css/',
-        :binary => true,
-        :mtime => File.mtime('foo/b.c.css'),
-        :checksum => Pathname.new('foo/b.c.css').checksum
+        binary: true,
+        mtime: File.mtime('foo/b.c.css'),
+        checksum: Pathname.new('foo/b.c.css').checksum
       ),
       Nanoc::Item.new(
         'foo/a/b/c.gif',
-        { :extension => 'gif', :filename => 'foo/a/b/c.gif' },
+        { extension: 'gif', filename: 'foo/a/b/c.gif' },
         '/a/b/c.gif/',
-        :binary => true,
-        :mtime => File.mtime('foo/a/b/c.gif'),
-        :checksum => Pathname.new('foo/a/b/c.gif').checksum
+        binary: true,
+        mtime: File.mtime('foo/a/b/c.gif'),
+        checksum: Pathname.new('foo/a/b/c.gif').checksum
       )
-    ].sort_by { |i| i.identifier }
+    ].sort_by(&:identifier)
 
-    actual_out = data_source.send(:items).sort_by { |i| i.identifier }
+    actual_out = data_source.send(:items).sort_by(&:identifier)
 
-    (0..expected_out.size-1).each do |i|
+    (0..expected_out.size - 1).each do |i|
       assert_equal expected_out[i].raw_content, actual_out[i].raw_content, 'content must match'
       assert_equal expected_out[i].identifier, actual_out[i].identifier, 'identifier must match'
       assert_equal expected_out[i].mtime, actual_out[i].mtime, 'mtime must match'

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
-
   def test_run_ok
     VCR.use_cassette('css_run_ok') do
       with_site do |site|
@@ -34,9 +33,31 @@ class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
 
         # Check
         refute check.issues.empty?
+        assert_equal 1, check.issues.size
+        assert_equal 'line 1: Property coxlor doesn\'t exist: h1 { coxlor: rxed; }',
+          check.issues.to_a[0].description
       end
     end
   end
 
-end
+  def test_run_parse_error
+    VCR.use_cassette('css_run_parse_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 { ; {') }
+
+        # Run check
+        check = Nanoc::Extra::Checking::Checks::CSS.new(site)
+        check.run
 
+        # Check
+        refute check.issues.empty?
+        assert_equal 1, check.issues.size
+        assert_equal 'line 1: Parse Error: h1 { ; {',
+          check.issues.to_a[0].description
+      end
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
-
   def test_run
     with_site do |site|
       # Create files
@@ -52,13 +51,13 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
 
   def test_fallback_to_get_when_head_is_not_allowed
     with_site do |site|
-      #Create check
+      # Create check
       check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(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
 
-      #Test
+      # Test
       assert_nil check.validate('http://127.0.0.1:9204')
       refute_nil check.validate('http://127.0.0.1:9204/405')
     end
@@ -75,5 +74,4 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
       assert_equal '/meow?foo=bar', check.send(:path_for_url, URI.parse('http://example.com/meow?foo=bar'))
     end
   end
-
 end

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
-
   def test_run_ok
     VCR.use_cassette('html_run_ok') do
       with_site do |site|
@@ -34,9 +33,11 @@ class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
 
         # Check
         refute check.issues.empty?
+        assert_equal 2, check.issues.size
+        assert_equal 'line 1: no document type declaration; will parse without validation: <h2>Hi!</h1>', check.issues.to_a[0].description
+        assert_equal 'line 1: end tag for element "H1" which is not open: <h2>Hi!</h1>', check.issues.to_a[1].description
+          check.issues.to_a[0].description
       end
     end
   end
-
 end
-

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
-
   def test_run
     with_site do |site|
       # Create files
@@ -57,7 +56,7 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
     with_site do |site|
       # Create check
       check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
-      site.config.update({ :checks => { :internal_links => { :exclude => ['^/excluded\d+'] } } })
+      site.config.update({ checks: { internal_links: { exclude: ['^/excluded\d+'] } } })
 
       # Test
       assert check.send(:valid?, '/excluded1', 'output/origin')
@@ -77,5 +76,4 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
       refute check.send(:valid?, 'stuff/wrong%20foo', 'output/origin')
     end
   end
-
 end

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
-
   def check_class
     Nanoc::Extra::Checking::Checks::Stale
   end
@@ -14,7 +13,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
   end
 
   def test_run_ok
-    with_site do |site|
+    with_site do |_site|
       assert Dir['content/*'].empty?
       assert Dir['output/*'].empty?
 
@@ -30,7 +29,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
   end
 
   def test_run_error
-    with_site do |site|
+    with_site do |_site|
       assert Dir['content/*'].empty?
       assert Dir['output/*'].empty?
 
@@ -44,7 +43,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
   end
 
   def test_run_excluded
-    with_site do |site|
+    with_site do |_site|
       assert Dir['content/*'].empty?
       assert Dir['output/*'].empty?
 
@@ -56,7 +55,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
   end
 
   def test_run_excluded_with_broken_config
-    with_site do |site|
+    with_site do |_site|
       assert Dir['content/*'].empty?
       assert Dir['output/*'].empty?
 
@@ -66,5 +65,4 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
       refute calc_issues.empty?
     end
   end
-
 end

data/test/extra/checking/test_check.rb

@@ -1,7 +1,6 @@
 # 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)
@@ -20,5 +19,4 @@ class Nanoc::Extra::Checking::CheckTest < Nanoc::TestCase
       end
     end
   end
-
 end

data/test/extra/checking/test_dsl.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
-
   def test_from_file
-    with_site do |site|
+    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')
 
@@ -14,5 +13,4 @@ class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
       assert_equal [:bar], dsl.deploy_checks
     end
   end
-
 end