nanoc 3.7.4 → 3.7.5

data/test/cli/commands/test_sync.rb

@@ -1,5 +1,4 @@
 class Nanoc::CLI::Commands::SyncTest < Nanoc::TestCase
-
   def test_run
     with_site do
       File.open('lib/foo_data_source.rb', 'w') do |io|
@@ -25,5 +24,4 @@ class Nanoc::CLI::Commands::SyncTest < Nanoc::TestCase
       assert_equal File.read('foo_source_data.yaml'), 'sync: true'
     end
   end
-
 end

data/test/cli/commands/test_update.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::UpdateTest < Nanoc::TestCase
-
   def test_stub
   end
-
 end

data/test/cli/commands/test_watch.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
-
   def test_run
-    with_site do |s|
+    with_site do |_s|
       watch_thread = Thread.new do
         Nanoc::CLI.run %w( watch )
       end
@@ -19,7 +18,7 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
   end
 
   def test_notify
-    with_site do |s|
+    with_site do |_s|
       watch_thread = Thread.new do
         Nanoc::CLI.run %w( watch )
       end
@@ -50,7 +49,7 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
       sleep 0.5
     end
     unless File.file?(filename)
-      raise RuntimeError, "Expected #{filename} to appear but it didn't :("
+      raise "Expected #{filename} to appear but it didn't :("
     end
   end
 
@@ -64,7 +63,7 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
 
     actual_content = File.read(filename)
     if actual_content != expected_content
-      raise RuntimeError, "Expected #{filename} to have " \
+      raise "Expected #{filename} to have " \
         "content #{expected_content.inspect} but it had " \
         "content #{actual_content.inspect} instead :("
     end
@@ -72,5 +71,4 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
     # Ugly, but seems to be necessary or changes are not picked up. :(
     sleep 0.5
   end
-
 end

data/test/cli/test_cleaning_stream.rb

@@ -1,19 +1,16 @@
 # encoding: utf-8
 
 class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
-
   class Stream
-
     attr_accessor :called_methods
 
     def initialize
       @called_methods = Set.new
     end
 
-    def method_missing(symbol, *args)
+    def method_missing(symbol, *_args)
       @called_methods << symbol
     end
-
   end
 
   def test_forward
@@ -51,10 +48,11 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
 
   def test_broken_pipe
     stream = StringIO.new
-    def stream.write(s); raise Errno::EPIPE.new; end
+    def stream.write(_s)
+      raise Errno::EPIPE.new
+    end
 
     cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
     cleaning_stream.write('lol')
   end
-
 end

data/test/cli/test_cli.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::CLITest < Nanoc::TestCase
-
   COMMAND_CODE = <<EOS
 # encoding: utf-8
 
@@ -119,18 +118,24 @@ EOS
     }
     with_env_vars(new_env_diff) do
       io = StringIO.new
-      def io.tty?; true; end
+      def io.tty?
+        true
+      end
       refute Nanoc::CLI.enable_utf8?(io)
 
       io = StringIO.new
-      def io.tty?; false; end
+      def io.tty?
+        false
+      end
       assert Nanoc::CLI.enable_utf8?(io)
     end
   end
 
   def test_enable_utf8
     io = StringIO.new
-    def io.tty?; true; end
+    def io.tty?
+      true
+    end
 
     new_env_diff = {
       'LC_ALL'   => 'en_US.ISO-8859-1',
@@ -153,5 +158,4 @@ EOS
       with_env_vars({ 'LANG'     => 'en_US.utf8'  }) { assert Nanoc::CLI.enable_utf8?(io) }
     end
   end
-
 end

data/test/cli/test_error_handler.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
-
   def setup
     super
     @handler = Nanoc::CLI::ErrorHandler.new
@@ -13,13 +12,17 @@ class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
   end
 
   def test_resolution_for_with_known_gem_without_bundler
-    def @handler.using_bundler?; false; end
+    def @handler.using_bundler?
+      false
+    end
     error = LoadError.new('no such file to load -- kramdown')
     assert_match(/^Install the 'kramdown' gem using `gem install kramdown`./, @handler.send(:resolution_for, error))
   end
 
   def test_resolution_for_with_known_gem_with_bundler
-    def @handler.using_bundler?; true; end
+    def @handler.using_bundler?
+      true
+    end
     error = LoadError.new('no such file to load -- kramdown')
     assert_match(/^Make sure the gem is added to Gemfile/, @handler.send(:resolution_for, error))
   end
@@ -33,15 +36,15 @@ class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
     error = new_error(20)
 
     stream = StringIO.new
-    @handler.send(:write_stack_trace, stream, error, :verbose => false)
+    @handler.send(:write_stack_trace, stream, error, verbose: false)
     assert_match(/See full crash log for details./, stream.string)
 
     stream = StringIO.new
-    @handler.send(:write_stack_trace, stream, error, :verbose => false)
+    @handler.send(:write_stack_trace, stream, error, verbose: false)
     assert_match(/See full crash log for details./, stream.string)
 
     stream = StringIO.new
-    @handler.send(:write_stack_trace, stream, error, :verbose => true)
+    @handler.send(:write_stack_trace, stream, error, verbose: true)
     refute_match(/See full crash log for details./, stream.string)
   end
 
@@ -60,5 +63,4 @@ class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
       return e
     end
   end
-
 end

data/test/cli/test_logger.rb

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

data/test/data_sources/test_filesystem.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
-
   class SampleFilesystemDataSource < Nanoc::DataSource
     include Nanoc::DataSources::Filesystem
   end
@@ -71,7 +70,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
   def test_all_split_files_in_allowing_periods_in_identifiers
     # Create data source
-    data_source = Nanoc::DataSources::FilesystemCompact.new(nil, nil, nil, { :allow_periods_in_identifiers => true })
+    data_source = Nanoc::DataSources::FilesystemCompact.new(nil, nil, nil, { allow_periods_in_identifiers: true })
 
     # Write sample files
     FileUtils.mkdir_p('foo')
@@ -86,7 +85,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Get all files
     output_expected = {
-      './foo'       => ['yaml', 'html'],
+      './foo'       => %w(yaml html),
       './bar.entry' => [nil,    'html'],
       './foo/qux'   => ['yaml', nil]
     }
@@ -113,7 +112,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Get all files
     output_expected = {
-      './foo'       => ['yaml', 'html'],
+      './foo'       => %w(yaml html),
       './bar'       => [nil,    'html.erb'],
       './foo/qux'   => ['yaml', nil]
     }
@@ -159,7 +158,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
   def test_basename_of_allowing_periods_in_identifiers
     # Create data source
-    data_source = Nanoc::DataSources::FilesystemCompact.new(nil, nil, nil, { :allow_periods_in_identifiers => true })
+    data_source = Nanoc::DataSources::FilesystemCompact.new(nil, nil, nil, { allow_periods_in_identifiers: true })
 
     # Get input and expected output
     expected = {
@@ -219,7 +218,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
   def test_ext_of_allowing_periods_in_identifiers
     # Create data source
-    data_source = Nanoc::DataSources::FilesystemCompact.new(nil, nil, nil, { :allow_periods_in_identifiers => true })
+    data_source = Nanoc::DataSources::FilesystemCompact.new(nil, nil, nil, { allow_periods_in_identifiers: true })
 
     # Get input and expected output
     expected = {
@@ -417,14 +416,14 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
   def test_parse_utf8_bom
     File.open('test.html', 'w') do |io|
-      io.write [0xEF, 0xBB, 0xBF].map { |i| i.chr }.join
+      io.write [0xEF, 0xBB, 0xBF].map(&:chr).join
       io.write "-----\n"
       io.write "utf8bomawareness: high\n"
       io.write "-----\n"
       io.write "content goes here\n"
     end
 
-    data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, :encoding => 'utf-8')
+    data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, encoding: 'utf-8')
 
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'utf8bomawareness' => 'high' }, result[0])
@@ -476,8 +475,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Parse it
     result = data_source.instance_eval { parse('test.html', 'test.yaml', 'foobar') }
-    assert_equal({ 'foo' => 'bar'}, result[0])
+    assert_equal({ 'foo' => 'bar' }, result[0])
     assert_equal('blah blah',       result[1])
   end
-
 end

data/test/data_sources/test_filesystem_unified.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
-
   def new_data_source(params = nil)
     # Mock site
     site = Nanoc::Site.new({})
@@ -16,7 +15,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
   def test_create_object_not_at_root
     # Create item
     data_source = new_data_source
-    data_source.send(:create_object, 'foobar', 'content here', { :foo => 'bar' }, '/asdf/')
+    data_source.send(:create_object, 'foobar', 'content here', { foo: 'bar' }, '/asdf/')
 
     # Check file existance
     assert File.directory?('foobar')
@@ -32,7 +31,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
   def test_create_object_at_root
     # Create item
     data_source = new_data_source
-    data_source.send(:create_object, 'foobar', 'content here', { :foo => 'bar' }, '/')
+    data_source.send(:create_object, 'foobar', 'content here', { foo: 'bar' }, '/')
 
     # Check file existance
     assert File.directory?('foobar')
@@ -55,6 +54,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       def initialize(*stuff)
         @stuff = stuff
       end
+
       def ==(other)
         @stuff == other.stuff
       end
@@ -77,30 +77,30 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
         'test 1',
         { 'num' => 1, :filename => 'foo/bar.html',   :extension => 'html', :file => File.open('foo/bar.html') },
         '/bar/',
-        :binary => false, :mtime => File.mtime('foo/bar.html')
+        binary: false, mtime: File.mtime('foo/bar.html')
       ),
       klass.new(
         'test 2',
         { 'num' => 2, :filename => 'foo/b.c.html',   :extension => 'c.html', :file => File.open('foo/b.c.html') },
         '/b/',
-        :binary => false, :mtime => File.mtime('foo/b.c.html')
+        binary: false, mtime: File.mtime('foo/b.c.html')
       ),
       klass.new(
         'test 3',
         { 'num' => 3, :filename => 'foo/a/b/c.html', :extension => 'html', :file => File.open('foo/a/b/c.html') },
         '/a/b/c/',
-        :binary => false, :mtime => File.mtime('foo/a/b/c.html')
+        binary: false, mtime: File.mtime('foo/a/b/c.html')
       )
     ]
     actual_out = data_source.send(:load_objects, 'foo', 'The Foo', klass).sort_by { |i| i.stuff[0] }
 
     # Check
-    (0..expected_out.size-1).each do |i|
+    (0..expected_out.size - 1).each do |i|
       assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0], 'content must match'
       assert_equal expected_out[i].stuff[2], actual_out[i].stuff[2], 'identifier must match'
       assert_equal expected_out[i].stuff[3][:mtime], actual_out[i].stuff[3][:mtime], 'mtime must match'
       assert_equal expected_out[i].stuff[1][:file].path, actual_out[i].stuff[1][:file].path, 'file paths must match'
-      expected_out[i].stuff[1][:file].close;
+      expected_out[i].stuff[1][:file].close
       actual_out[i].stuff[1][:file].close
       ['num', :filename, :extension].each do |key|
         assert_equal expected_out[i].stuff[1][key], actual_out[i].stuff[1][key], "attribute key #{key} must match"
@@ -142,7 +142,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
   def test_identifier_for_filename_allowing_periods_in_identifiers
     # Create data source
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    data_source = new_data_source(allow_periods_in_identifiers: true)
 
     # Get input and expected output
     expected = {
@@ -198,7 +198,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       'foo/blah_index.yaml'  => '/foo/blah_index/'
     }
 
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    data_source = new_data_source(allow_periods_in_identifiers: true)
     expectations.each_pair do |meta_filename, expected_identifier|
       content_filename = meta_filename.sub(/yaml$/, 'html')
       [meta_filename, content_filename].each do |filename|
@@ -246,7 +246,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       '/foo/index'            => '/foo/',
     }
 
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    data_source = new_data_source(allow_periods_in_identifiers: true)
     expected.each_pair do |input, expected_output|
       actual_output = data_source.send(:identifier_for_filename, input)
       assert_equal(
@@ -278,7 +278,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
   def test_load_objects_allowing_periods_in_identifiers
     # Create data source
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    data_source = new_data_source(allow_periods_in_identifiers: true)
 
     # Create a fake class
     klass = Class.new do
@@ -286,6 +286,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       def initialize(*stuff)
         @stuff = stuff
       end
+
       def ==(other)
         @stuff == other.stuff
       end
@@ -316,7 +317,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :file             => nil
         },
         '/a/b/c/',
-        :binary => false, :mtime => File.mtime('foo/a/b/c.yaml')
+        binary: false, mtime: File.mtime('foo/a/b/c.yaml')
       ),
       klass.new(
         'test 2',
@@ -328,18 +329,18 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :file             => File.open('foo/b.c.html')
         },
         '/b.c/',
-        :binary => false, :mtime => File.mtime('foo/b.c.html') > File.mtime('foo/b.c.yaml') ? File.mtime('foo/b.c.html') : File.mtime('foo/b.c.yaml')
+        binary: false, mtime: File.mtime('foo/b.c.html') > File.mtime('foo/b.c.yaml') ? File.mtime('foo/b.c.html') : File.mtime('foo/b.c.yaml')
       ),
       klass.new(
         'test 3',
         {
-          :content_filename => 'foo/car.html',
-          :meta_filename    => nil,
-          :extension        => 'html',
-          :file             => File.open('foo/car.html')
+          content_filename: 'foo/car.html',
+          meta_filename: nil,
+          extension: 'html',
+          file: File.open('foo/car.html')
         },
         '/car/',
-        :binary => false, :mtime => File.mtime('foo/car.html')
+        binary: false, mtime: File.mtime('foo/car.html')
       )
     ]
 
@@ -347,7 +348,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     actual_out = data_source.send(:load_objects, 'foo', 'The Foo', klass).sort_by { |i| i.stuff[2] }
 
     # Check
-    (0..expected_out.size-1).each do |i|
+    (0..expected_out.size - 1).each do |i|
       assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0], 'content must match'
       assert_equal expected_out[i].stuff[2], actual_out[i].stuff[2], 'identifier must match'
       assert_equal expected_out[i].stuff[3][:mtime], actual_out[i].stuff[3][:mtime], 'mtime must match'
@@ -374,6 +375,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       def initialize(*stuff)
         @stuff = stuff
       end
+
       def ==(other)
         @stuff == other.stuff
       end
@@ -404,7 +406,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :file             => nil
         },
         '/a/b/c/',
-        :binary => false, :mtime => File.mtime('foo/a/b/c.yaml')
+        binary: false, mtime: File.mtime('foo/a/b/c.yaml')
       ),
       klass.new(
         'test 2',
@@ -416,18 +418,18 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :file             => File.open('foo/b.html.erb')
         },
         '/b/',
-        :binary => false, :mtime => File.mtime('foo/b.html.erb') > File.mtime('foo/b.yaml') ? File.mtime('foo/b.html.erb') : File.mtime('foo/b.yaml')
+        binary: false, mtime: File.mtime('foo/b.html.erb') > File.mtime('foo/b.yaml') ? File.mtime('foo/b.html.erb') : File.mtime('foo/b.yaml')
       ),
       klass.new(
         'test 3',
         {
-          :content_filename => 'foo/car.html',
-          :meta_filename    => nil,
-          :extension        => 'html',
-          :file             => File.open('foo/car.html')
+          content_filename: 'foo/car.html',
+          meta_filename: nil,
+          extension: 'html',
+          file: File.open('foo/car.html')
         },
         '/car/',
-        :binary => false, :mtime => File.mtime('foo/car.html')
+        binary: false, mtime: File.mtime('foo/car.html')
       )
     ]
 
@@ -435,7 +437,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     actual_out = data_source.send(:load_objects, 'foo', 'The Foo', klass).sort_by { |i| i.stuff[2] }
 
     # Check
-    (0..expected_out.size-1).each do |i|
+    (0..expected_out.size - 1).each do |i|
       assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0], 'content must match'
       assert_equal expected_out[i].stuff[2], actual_out[i].stuff[2], 'identifier must match'
       assert_equal expected_out[i].stuff[3][:mtime], actual_out[i].stuff[3][:mtime], 'mtime must match'
@@ -454,17 +456,17 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
   def test_create_object_allowing_periods_in_identifiers
     # Create data source
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    data_source = new_data_source(allow_periods_in_identifiers: true)
 
     # Create object without period
-    data_source.send(:create_object, 'foo', 'some content', { :some => 'attributes' }, '/asdf/')
+    data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/asdf/')
     assert File.file?('foo/asdf.html')
     data = data_source.send(:parse, 'foo/asdf.html', nil, 'moo')
     assert_equal({ 'some' => 'attributes' }, data[0])
     assert_equal('some content',             data[1])
 
     # Create object with period
-    data_source.send(:create_object, 'foo', 'some content', { :some => 'attributes' }, '/as.df/')
+    data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/as.df/')
     assert File.file?('foo/as.df.html')
     data = data_source.send(:parse, 'foo/as.df.html', nil, 'moo')
     assert_equal({ 'some' => 'attributes' }, data[0])
@@ -476,7 +478,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     data_source = new_data_source
 
     # Create object without period
-    data_source.send(:create_object, 'foo', 'some content', { :some => 'attributes' }, '/asdf/')
+    data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/asdf/')
     assert File.file?('foo/asdf.html')
     data = data_source.send(:parse, 'foo/asdf.html', nil, 'moo')
     assert_equal({ 'some' => 'attributes' }, data[0])
@@ -484,7 +486,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
     # Create object with period
     assert_raises(RuntimeError) do
-      data_source.send(:create_object, 'foo', 'some content', { :some => 'attributes' }, '/as.df/')
+      data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/as.df/')
     end
   end
 
@@ -568,5 +570,4 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     assert_equal 1, items.size
     assert_equal Encoding.find('UTF-8'), items[0].raw_content.encoding
   end
-
 end