nanoc 3.7.4 → 3.7.5

data/test/base/core_ext/array_spec.rb

@@ -1,27 +1,22 @@
 # encoding: utf-8
 
 describe 'Array#symbolize_keys_recursively' do
-
   it 'should convert keys to symbols' do
     array_old = [:abc, 'xyz', { 'foo' => 'bar', :baz => :qux }]
-    array_new = [:abc, 'xyz', { :foo  => 'bar', :baz => :qux }]
+    array_new = [:abc, 'xyz', { foo: 'bar', baz: :qux }]
     array_old.symbolize_keys_recursively.must_equal array_new
   end
-
 end
 
 describe 'Array#stringify_keys_recursively' do
-
   it 'should convert keys to strings' do
     array_old = [:abc, 'xyz', { :foo  => 'bar', 'baz' => :qux }]
     array_new = [:abc, 'xyz', { 'foo' => 'bar', 'baz' => :qux }]
     array_old.stringify_keys_recursively.must_equal array_new
   end
-
 end
 
 describe 'Array#freeze_recursively' do
-
   include Nanoc::TestHelpers
 
   it 'should prevent first-level elements from being modified' do
@@ -52,14 +47,11 @@ describe 'Array#freeze_recursively' do
     assert a[0].frozen?
     assert_equal a, a[0]
   end
-
 end
 
 describe 'Array#checksum' do
-
   it 'should work' do
     expectation = 'CEUlNvu/3DUmlbtpFRiLHU8oHA0='
     [[:foo, 123]].checksum.must_equal expectation
   end
-
 end

data/test/base/core_ext/hash_spec.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 
 describe 'Hash#symbolize_keys_recursively' do
-
   it 'should convert keys to symbols' do
     hash_old = { 'foo' => 'bar' }
-    hash_new = { :foo  => 'bar' }
+    hash_new = { foo: 'bar' }
     hash_old.symbolize_keys_recursively.must_equal hash_new
   end
 
@@ -13,11 +12,9 @@ describe 'Hash#symbolize_keys_recursively' do
     hash_new = hash_old
     hash_old.symbolize_keys_recursively.must_equal hash_new
   end
-
 end
 
 describe 'Hash#stringify_keys_recursively' do
-
   it 'should leave strings as strings' do
     hash_old = { 'foo' => 'bar' }
     hash_new = { 'foo' => 'bar' }
@@ -25,7 +22,7 @@ describe 'Hash#stringify_keys_recursively' do
   end
 
   it 'should convert symbols to strings' do
-    hash_old = { :foo  => 'bar' }
+    hash_old = { foo: 'bar' }
     hash_new = { 'foo' => 'bar' }
     hash_old.stringify_keys_recursively.must_equal hash_new
   end
@@ -41,15 +38,13 @@ describe 'Hash#stringify_keys_recursively' do
     hash_new = { ''  => 'bar' }
     hash_old.stringify_keys_recursively.must_equal hash_new
   end
-
 end
 
 describe 'Hash#freeze_recursively' do
-
   include Nanoc::TestHelpers
 
   it 'should prevent first-level elements from being modified' do
-    hash = { :a => { :b => :c } }
+    hash = { a: { b: :c } }
     hash.freeze_recursively
 
     assert_raises_frozen_error do
@@ -58,7 +53,7 @@ describe 'Hash#freeze_recursively' do
   end
 
   it 'should prevent second-level elements from being modified' do
-    hash = { :a => { :b => :c } }
+    hash = { a: { b: :c } }
     hash.freeze_recursively
 
     assert_raises_frozen_error do
@@ -76,24 +71,17 @@ describe 'Hash#freeze_recursively' do
     assert a[:x].frozen?
     assert_equal a, a[:x]
   end
-
 end
 
 describe 'Hash#checksum' do
-
   it 'should work' do
     expectation = 'wy7gHokc700tqJ/BmJ+EK6/F0bc='
-    { :foo => 123 }.checksum.must_equal expectation
+    { foo: 123 }.checksum.must_equal expectation
   end
 
   it 'should not sort keys' do
-    if RUBY_VERSION =~ /\A1\.8./
-      skip 'Ruby 1.8.x does not have ordered hashes'
-    end
-
-    a = { :a => 1, :c => 2, :b => 3 }.checksum
-    b = { :a => 1, :b => 3, :c => 2 }.checksum
+    a = { a: 1, c: 2, b: 3 }.checksum
+    b = { a: 1, b: 3, c: 2 }.checksum
     a.wont_equal b
   end
-
 end

data/test/base/core_ext/pathname_spec.rb

@@ -1,13 +1,12 @@
 # encoding: utf-8
 
 describe 'Pathname#checksum' do
-
   it 'should work on empty files' do
     begin
       # Create file
       FileUtils.mkdir_p('tmp')
       File.open('tmp/myfile', 'w') { |io| io.write('') }
-      timestamp = Time.at(1234569)
+      timestamp = Time.at(1_234_569)
       File.utime(timestamp, timestamp, 'tmp/myfile')
 
       # Create checksum
@@ -23,7 +22,7 @@ describe 'Pathname#checksum' do
       # Create file
       FileUtils.mkdir_p('tmp')
       File.open('tmp/myfile', 'w') { |io| io.write('abc') }
-      timestamp = Time.at(1234569)
+      timestamp = Time.at(1_234_569)
       File.utime(timestamp, timestamp, 'tmp/myfile')
 
       # Create checksum
@@ -33,5 +32,4 @@ describe 'Pathname#checksum' do
       FileUtils.rm_rf('tmp')
     end
   end
-
 end

data/test/base/core_ext/string_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 describe 'String#cleaned_identifier' do
-
   it 'should not convert already clean paths' do
     '/foo/bar/'.cleaned_identifier.must_equal '/foo/bar/'
   end
@@ -21,11 +20,9 @@ describe 'String#cleaned_identifier' do
   it 'should remove double slashes at end' do
     '/foo/bar//'.cleaned_identifier.must_equal '/foo/bar/'
   end
-
 end
 
 describe 'String#checksum' do
-
   it 'should work on empty strings' do
     ''.checksum.must_equal 'PfY7essFItpoXa1f6EuB/deyUmQ='
   end
@@ -33,5 +30,4 @@ describe 'String#checksum' do
   it 'should work on all strings' do
     'abc'.checksum.must_equal 'NkkYRO+25f6psNSeCYykXKCg3C0='
   end
-
 end

data/test/base/temp_filename_factory_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 describe Nanoc::TempFilenameFactory do
-
   subject do
     Nanoc::TempFilenameFactory.instance
   end
@@ -13,7 +12,6 @@ describe Nanoc::TempFilenameFactory do
   end
 
   describe '#create' do
-
     it 'should create unique paths' do
       path_a = subject.create(prefix)
       path_b = subject.create(prefix)
@@ -37,11 +35,9 @@ describe Nanoc::TempFilenameFactory do
       path_b = subject.create(prefix)
       path_a.must_equal(path_b)
     end
-
   end
 
   describe '#cleanup' do
-
     it 'should remove generated files' do
       path_a = subject.create(prefix)
       File.file?(path_a).wont_equal(true) # not yet used
@@ -60,11 +56,9 @@ describe Nanoc::TempFilenameFactory do
       subject.cleanup(prefix)
       File.directory?(subject.root_dir).wont_equal(true)
     end
-
   end
 
   describe 'other instance' do
-
     let(:other_instance) do
       Nanoc::TempFilenameFactory.new
     end
@@ -74,7 +68,5 @@ describe Nanoc::TempFilenameFactory do
       path_b = other_instance.create(prefix)
       path_a.wont_equal(path_b)
     end
-
   end
-
 end

data/test/base/test_checksum_store.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::ChecksumStoreTest < Nanoc::TestCase
-
   def test_get_with_existing_object
     require 'pstore'
 
@@ -28,5 +27,4 @@ class Nanoc::ChecksumStoreTest < Nanoc::TestCase
     obj = Nanoc::Item.new('Moo?', {}, '/animals/cow/')
     assert_equal nil, store[obj]
   end
-
 end

data/test/base/test_code_snippet.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::CodeSnippetTest < Nanoc::TestCase
-
   def test_load
     # Initialize
     $complete_insane_parrot = 'meow'
@@ -25,5 +24,4 @@ class Nanoc::CodeSnippetTest < Nanoc::TestCase
     # Ensure binding is correct
     assert_equal('meow', @foo)
   end
-
 end

data/test/base/test_compiler.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::CompilerTest < Nanoc::TestCase
-
   def test_compilation_rule_for
     # Mock rules
     rules = [mock, mock, mock]
@@ -54,14 +53,14 @@ class Nanoc::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[/.*/] = [:erb, { :foo => 'bar' }]
+    compiler.rules_collection.layout_filter_mapping[/.*/] = [:erb, { foo: 'bar' }]
 
     # Mock layout
     layout = MiniTest::Mock.new
     layout.expect(:identifier, '/some_layout/')
 
     # Check
-    assert_equal([:erb, { :foo => 'bar' }], compiler.rules_collection.filter_for_layout(layout))
+    assert_equal([:erb, { foo: 'bar' }], compiler.rules_collection.filter_for_layout(layout))
   end
 
   def test_filter_for_layout_with_existant_layout_and_unknown_filter
@@ -70,14 +69,14 @@ class Nanoc::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[/.*/] = [:some_unknown_filter, { :foo => 'bar' }]
+    compiler.rules_collection.layout_filter_mapping[/.*/] = [:some_unknown_filter, { foo: 'bar' }]
 
     # Mock layout
     layout = MiniTest::Mock.new
     layout.expect(:identifier, '/some_layout/')
 
     # Check
-    assert_equal([:some_unknown_filter, { :foo => 'bar' }], compiler.rules_collection.filter_for_layout(layout))
+    assert_equal([:some_unknown_filter, { foo: 'bar' }], compiler.rules_collection.filter_for_layout(layout))
   end
 
   def test_filter_for_layout_with_nonexistant_layout
@@ -86,7 +85,7 @@ class Nanoc::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[%r{^/foo/$}] = [:erb, { :foo => 'bar' }]
+    compiler.rules_collection.layout_filter_mapping[%r{^/foo/$}] = [:erb, { foo: 'bar' }]
 
     # Mock layout
     layout = MiniTest::Mock.new
@@ -102,10 +101,10 @@ class Nanoc::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[%r{^/a/b/c/.*/$}] = [:erb, { :char => 'd' }]
-    compiler.rules_collection.layout_filter_mapping[%r{^/a/.*/$}]     = [:erb, { :char => 'b' }]
-    compiler.rules_collection.layout_filter_mapping[%r{^/a/b/.*/$}]   = [:erb, { :char => 'c' }] # never used!
-    compiler.rules_collection.layout_filter_mapping[%r{^/.*/$}]       = [:erb, { :char => 'a' }]
+    compiler.rules_collection.layout_filter_mapping[%r{^/a/b/c/.*/$}] = [:erb, { char: 'd' }]
+    compiler.rules_collection.layout_filter_mapping[%r{^/a/.*/$}]     = [:erb, { char: 'b' }]
+    compiler.rules_collection.layout_filter_mapping[%r{^/a/b/.*/$}]   = [:erb, { char: 'c' }] # never used!
+    compiler.rules_collection.layout_filter_mapping[%r{^/.*/$}]       = [:erb, { char: 'a' }]
 
     # Mock layout
     layouts = [mock, mock, mock, mock]
@@ -137,10 +136,10 @@ class Nanoc::CompilerTest < Nanoc::TestCase
 
     # Set snapshot filenames
     rep.raw_paths = {
-      :raw  => 'raw.txt',
-      :pre  => 'pre.txt',
-      :post => 'post.txt',
-      :last => 'last.txt'
+      raw: 'raw.txt',
+      pre: 'pre.txt',
+      post: 'post.txt',
+      last: 'last.txt'
     }
 
     # Create rule
@@ -217,7 +216,7 @@ class Nanoc::CompilerTest < Nanoc::TestCase
   end
 
   def test_compile_with_two_dependent_reps
-    with_site(:compilation_rule_content => 'filter :erb') do |site|
+    with_site(compilation_rule_content: 'filter :erb') do |site|
       File.open('content/foo.html', 'w') do |io|
         io.write('<%= @items.find { |i| i.identifier == "/bar/" }.compiled_content %>!!!')
       end
@@ -236,7 +235,7 @@ class Nanoc::CompilerTest < Nanoc::TestCase
   end
 
   def test_compile_with_two_mutually_dependent_reps
-    with_site(:compilation_rule_content => 'filter :erb') do |site|
+    with_site(compilation_rule_content: 'filter :erb') do |site|
       File.open('content/foo.html', 'w') do |io|
         io.write('<%= @items.find { |i| i.identifier == "/bar/" }.compiled_content %>')
       end
@@ -589,5 +588,4 @@ class Nanoc::CompilerTest < Nanoc::TestCase
       assert_empty stack
     end
   end
-
 end

data/test/base/test_compiler_dsl.rb

@@ -1,17 +1,16 @@
 # encoding: utf-8
 
 class Nanoc::CompilerDSLTest < Nanoc::TestCase
-
   def test_compile
-    # TODO implement
+    # TODO: implement
   end
 
   def test_route
-    # TODO implement
+    # TODO: implement
   end
 
   def test_layout
-    # TODO implement
+    # TODO: implement
   end
 
   def test_preprocess_twice
@@ -38,7 +37,7 @@ class Nanoc::CompilerDSLTest < Nanoc::TestCase
     Nanoc::CLI.run %w( create_site per-rules-file-preprocessor )
     FileUtils.cd('per-rules-file-preprocessor') do
       # Create rep
-      item = Nanoc::Item.new('foo', { :extension => 'bar' }, '/foo/')
+      item = Nanoc::Item.new('foo', { extension: 'bar' }, '/foo/')
 
       # Create a bonus rules file
       File.open('more_rules.rb', 'w') { |io| io.write "preprocess { @items['/foo/'][:preprocessed] = true }" }
@@ -59,7 +58,7 @@ class Nanoc::CompilerDSLTest < Nanoc::TestCase
       # Check that the two preprocess blocks have been added
       assert_equal 2, site.compiler.rules_collection.preprocessors.size
       refute_nil site.compiler.rules_collection.preprocessors.first
-      refute_nil site.compiler.rules_collection.preprocessors.last
+      refute_nil site.compiler.rules_collection.preprocessors.to_a.last
 
       # Apply preprocess blocks
       site.compiler.preprocess
@@ -72,7 +71,7 @@ class Nanoc::CompilerDSLTest < Nanoc::TestCase
     Nanoc::CLI.run %w( create_site with_bonus_rules )
     FileUtils.cd('with_bonus_rules') do
       # Create rep
-      item = Nanoc::Item.new('foo', { :extension => 'bar' }, '/foo/')
+      item = Nanoc::Item.new('foo', { extension: 'bar' }, '/foo/')
       rep  = Nanoc::ItemRep.new(item, :default)
 
       # Create a bonus rules file
@@ -377,9 +376,8 @@ EOS
 
   def test_config
     $venetian = 'unsnares'
-    compiler_dsl = Nanoc::CompilerDSL.new(nil, { :venetian => 'snares' })
+    compiler_dsl = Nanoc::CompilerDSL.new(nil, { venetian: 'snares' })
     compiler_dsl.instance_eval { $venetian = @config[:venetian] }
     assert_equal 'snares', $venetian
   end
-
 end

data/test/base/test_context.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 
 class Nanoc::ContextTest < Nanoc::TestCase
-
   def test_context_with_instance_variable
     # Create context
-    context = Nanoc::Context.new({ :foo => 'bar', :baz => 'quux' })
+    context = Nanoc::Context.new({ foo: 'bar', baz: 'quux' })
 
     # Ensure correct evaluation
     assert_equal('bar', eval('@foo', context.get_binding))
@@ -12,7 +11,7 @@ class Nanoc::ContextTest < Nanoc::TestCase
 
   def test_context_with_instance_method
     # Create context
-    context = Nanoc::Context.new({ :foo => 'bar', :baz => 'quux' })
+    context = Nanoc::Context.new({ foo: 'bar', baz: 'quux' })
 
     # Ensure correct evaluation
     assert_equal('bar', eval('foo', context.get_binding))
@@ -25,5 +24,4 @@ class Nanoc::ContextTest < Nanoc::TestCase
     # Run
     assert_examples_correct 'Nanoc::Context#initialize'
   end
-
 end

data/test/base/test_data_source.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::DataSourceTest < Nanoc::TestCase
-
   def test_loading
     # Create data source
     data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
@@ -40,5 +39,4 @@ class Nanoc::DataSourceTest < Nanoc::TestCase
     assert_raises(NotImplementedError) { data_source.create_item(nil, nil, nil) }
     assert_raises(NotImplementedError) { data_source.create_layout(nil, nil, nil) }
   end
-
 end