nanoc 4.7.5 → 4.7.6

data/spec/nanoc/regressions/gh_981_spec.rb

@@ -11,11 +11,11 @@ EOS
   end
 
   it 'creates at first' do
-    expect { Nanoc::CLI.run(%w(compile --verbose)) }.to output(%r{create.*output/foo\.html$}).to_stdout
+    expect { Nanoc::CLI.run(%w[compile --verbose]) }.to output(%r{create.*output/foo\.html$}).to_stdout
   end
 
   it 'skips the item on second try' do
-    Nanoc::CLI.run(%w(compile))
-    expect { Nanoc::CLI.run(%w(compile --verbose)) }.to output(%r{skip.*output/foo\.html$}).to_stdout
+    Nanoc::CLI.run(%w[compile])
+    expect { Nanoc::CLI.run(%w[compile --verbose]) }.to output(%r{skip.*output/foo\.html$}).to_stdout
   end
 end

data/spec/nanoc/rule_dsl/action_sequence_calculator_spec.rb

@@ -67,7 +67,7 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
           expect(subject[4].params).to eql({})
 
           expect(subject[5]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[5].snapshot_names).to eql(%i(post last))
+          expect(subject[5].snapshot_names).to eql(%i[post last])
           expect(subject[5].paths).to be_empty
 
           expect(subject.size).to eql(6)
@@ -85,7 +85,7 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_names).to eql(%i(raw last pre))
+          expect(subject[0].snapshot_names).to eql(%i[raw last pre])
           expect(subject[0].paths).to be_empty
 
           expect(subject.size).to eql(1)
@@ -107,7 +107,7 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_names).to eql(%i(raw last pre))
+          expect(subject[0].snapshot_names).to eql(%i[raw last pre])
           expect(subject[0].paths).to eq(['/foo.md'])
 
           expect(subject.size).to eql(1)
@@ -129,7 +129,7 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_names).to eql(%i(raw last pre))
+          expect(subject[0].snapshot_names).to eql(%i[raw last pre])
           expect(subject[0].paths).to be_empty
 
           expect(subject.size).to eql(1)
@@ -171,4 +171,43 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
       end
     end
   end
+
+  describe '#compact_snapshots' do
+    subject { action_sequence_calculator.compact_snapshots(action_sequence) }
+
+    let(:action_sequence) { Nanoc::Int::ActionSequence.new(rep) }
+    let(:rep) { double(:rep) }
+
+    before do
+      action_sequence.add_snapshot(:a1, nil)
+      action_sequence.add_snapshot(:a2, '/a2.md')
+      action_sequence.add_snapshot(:a3, nil)
+      action_sequence.add_filter(:erb, awesomeness: 'high')
+      action_sequence.add_snapshot(:b1, '/b1.md')
+      action_sequence.add_snapshot(:b2, nil)
+      action_sequence.add_snapshot(:b3, '/b3.md')
+      action_sequence.add_filter(:erb, awesomeness: 'high')
+      action_sequence.add_snapshot(:c, nil)
+    end
+
+    example do
+      expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
+      expect(subject[0].snapshot_names).to eql(%i[a1 a2 a3])
+      expect(subject[0].paths).to eql(['/a2.md'])
+
+      expect(subject[1]).to be_a(Nanoc::Int::ProcessingActions::Filter)
+
+      expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
+      expect(subject[2].snapshot_names).to eql(%i[b1 b2 b3])
+      expect(subject[2].paths).to eql(['/b1.md', '/b3.md'])
+
+      expect(subject[3]).to be_a(Nanoc::Int::ProcessingActions::Filter)
+
+      expect(subject[4]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
+      expect(subject[4].snapshot_names).to eql([:c])
+      expect(subject[4].paths).to be_empty
+
+      expect(subject.size).to eql(5)
+    end
+  end
 end

data/test/base/core_ext/array_spec.rb

@@ -12,7 +12,7 @@ describe 'Array#__nanoc_freeze_recursively' do
   include Nanoc::TestHelpers
 
   it 'should prevent first-level elements from being modified' do
-    array = [:a, %i(b c), :d]
+    array = [:a, %i[b c], :d]
     array.__nanoc_freeze_recursively
 
     assert_raises_frozen_error do
@@ -21,7 +21,7 @@ describe 'Array#__nanoc_freeze_recursively' do
   end
 
   it 'should prevent second-level elements from being modified' do
-    array = [:a, %i(b c), :d]
+    array = [:a, %i[b c], :d]
     array.__nanoc_freeze_recursively
 
     assert_raises_frozen_error do

data/test/base/test_compiler.rb

@@ -122,7 +122,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
   def test_disallow_routes_not_starting_with_slash
     # Create site
-    Nanoc::CLI.run %w(create_site bar)
+    Nanoc::CLI.run %w[create_site bar]
 
     FileUtils.cd('bar') do
       # Create routes
@@ -149,7 +149,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
   def test_disallow_duplicate_routes
     # Create site
-    Nanoc::CLI.run %w(create_site bar)
+    Nanoc::CLI.run %w[create_site bar]
 
     FileUtils.cd('bar') do
       # Create routes
@@ -176,7 +176,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
   def test_disallow_multiple_snapshots_with_the_same_name
     # Create site
-    Nanoc::CLI.run %w(create_site bar)
+    Nanoc::CLI.run %w[create_site bar]
 
     FileUtils.cd('bar') do
       # Create routes
@@ -398,8 +398,8 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
-      assert_equal Set.new(%w(content/blah.dat)), Set.new(Dir['content/*'])
-      assert_equal Set.new(%w(output/blah.dat)), Set.new(Dir['output/*'])
+      assert_equal Set.new(%w[content/blah.dat]), Set.new(Dir['content/*'])
+      assert_equal Set.new(%w[output/blah.dat]), Set.new(Dir['output/*'])
     end
   end
 
@@ -420,7 +420,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_find_layouts_by_glob
-    Nanoc::CLI.run %w(create_site bar)
+    Nanoc::CLI.run %w[create_site bar]
     FileUtils.cd('bar') do
       File.open('Rules', 'w') do |io|
         io.write "compile '/**/*' do\n"

data/test/base/test_filter.rb

@@ -9,14 +9,6 @@ class Nanoc::FilterTest < Nanoc::TestCase
     assert_equal({}, filter.instance_eval { @assigns })
   end
 
-  def test_assigns
-    # Create filter
-    filter = Nanoc::Filter.new(foo: 'bar')
-
-    # Check assigns
-    assert_equal('bar', filter.assigns[:foo])
-  end
-
   def test_assigns_with_instance_variables
     # Create filter
     filter = Nanoc::Filter.new(foo: 'bar')

data/test/base/test_site.rb

@@ -98,7 +98,7 @@ EOF
   end
 
   def test_identifier_classes
-    Nanoc::CLI.run %w(create_site bar)
+    Nanoc::CLI.run %w[create_site bar]
     FileUtils.cd('bar') do
       FileUtils.mkdir_p('content')
       FileUtils.mkdir_p('layouts')

data/test/checking/test_runner.rb

@@ -5,7 +5,7 @@ class Nanoc::Checking::RunnerTest < Nanoc::TestCase
     with_site do |site|
       File.open('output/blah', 'w') { |io| io.write('I am stale! Haha!') }
       runner = Nanoc::Checking::Runner.new(site)
-      runner.run_specific(%w(stale))
+      runner.run_specific(%w[stale])
     end
   end
 
@@ -17,7 +17,7 @@ class Nanoc::Checking::RunnerTest < Nanoc::TestCase
 
       runner = Nanoc::Checking::Runner.new(site)
       ios = capturing_stdio do
-        runner.run_specific(%w(my_foo_check))
+        runner.run_specific(%w[my_foo_check])
       end
 
       assert ios[:stdout].include?('I AM FOO!')

data/test/cli/commands/test_check.rb

@@ -6,12 +6,12 @@ class Nanoc::CLI::Commands::CheckTest < Nanoc::TestCase
       FileUtils.mkdir_p('output')
 
       # Should not raise now
-      Nanoc::CLI.run %w(check stale)
+      Nanoc::CLI.run %w[check stale]
 
       # Should raise now
       File.open('output/blah.html', 'w') { |io| io.write 'moo' }
       assert_raises Nanoc::Int::Errors::GenericTrivial do
-        Nanoc::CLI.run %w(check stale)
+        Nanoc::CLI.run %w[check stale]
       end
     end
   end

data/test/cli/commands/test_compile.rb

@@ -23,7 +23,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
         io.write "layout '*', :erb\n"
       end
 
-      Nanoc::CLI.run %w(compile --verbose)
+      Nanoc::CLI.run %w[compile --verbose]
     end
   end
 
@@ -60,7 +60,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w(compile)
+      Nanoc::CLI.run %w[compile]
       assert File.file?('output/stray.html')
 
       File.open('nanoc.yaml', 'w') do |io|
@@ -70,7 +70,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w(compile)
+      Nanoc::CLI.run %w[compile]
       refute File.file?('output/stray.html')
     end
   end
@@ -110,7 +110,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w(compile)
+      Nanoc::CLI.run %w[compile]
       assert File.file?('output/stray.html')
 
       File.open('nanoc.yaml', 'w') do |io|
@@ -121,7 +121,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w(compile)
+      Nanoc::CLI.run %w[compile]
       refute File.file?('output/stray.html')
       assert File.directory?('output/excluded_dir'), 'excluded_dir should still be there'
     end
@@ -207,7 +207,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
   def new_file_action_printer(reps)
     # Ensure CLI is loaded
     begin
-      Nanoc::CLI.run(%w(help %))
+      Nanoc::CLI.run(%w[help %])
     rescue SystemExit
     end
 

data/test/cli/commands/test_create_site.rb

@@ -2,14 +2,14 @@ require 'helper'
 
 class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_create_site_with_existing_name
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
     assert_raises(::Nanoc::Int::Errors::GenericTrivial) do
-      Nanoc::CLI.run %w(create_site foo)
+      Nanoc::CLI.run %w[create_site foo]
     end
   end
 
   def test_can_compile_new_site
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
 
     FileUtils.cd('foo') do
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -21,14 +21,14 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     FileUtils.mkdir('foo')
 
     FileUtils.cd('foo') do
-      Nanoc::CLI.run %w(create_site ./)
+      Nanoc::CLI.run %w[create_site ./]
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
 
   def test_can_compile_new_site_with_binary_items
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
 
     FileUtils.cd('foo') do
       File.open('content/blah', 'w') { |io| io << 'asdf' }
@@ -42,7 +42,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_can_compile_site_in_nonempty_directory
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
-    Nanoc::CLI.run %w(create_site foo --force)
+    Nanoc::CLI.run %w[create_site foo --force]
 
     FileUtils.cd('foo') do
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -53,7 +53,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_compiled_site_output
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
-    Nanoc::CLI.run %w(create_site foo --force)
+    Nanoc::CLI.run %w[create_site foo --force]
 
     FileUtils.cd('foo') do
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -72,7 +72,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     original_encoding = Encoding.default_external
     Encoding.default_external = 'ISO-8859-1' # ew!
 
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
 
     FileUtils.cd('foo') do
       # Try with encoding = default encoding = utf-8
@@ -99,9 +99,9 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   end
 
   def test_new_site_has_correct_stylesheets
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
     FileUtils.cd('foo') do
-      Nanoc::CLI.run %w(compile)
+      Nanoc::CLI.run %w[compile]
 
       assert File.file?('content/stylesheet.css')
       assert_match(/\/stylesheet.css/, File.read('output/index.html'))
@@ -111,12 +111,12 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_new_site_prunes_by_default
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
-    Nanoc::CLI.run %w(create_site foo --force)
+    Nanoc::CLI.run %w[create_site foo --force]
 
     FileUtils.cd('foo') do
       File.write('output/blah.txt', 'stuff')
 
-      Nanoc::CLI.run %w(compile)
+      Nanoc::CLI.run %w[compile]
 
       refute File.file?('output/blah.txt')
     end

data/test/cli/commands/test_help.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class Nanoc::CLI::Commands::HelpTest < Nanoc::TestCase
   def test_run
-    Nanoc::CLI.run %w(help)
-    Nanoc::CLI.run %w(help co)
+    Nanoc::CLI.run %w[help]
+    Nanoc::CLI.run %w[help co]
   end
 end

data/test/cli/commands/test_info.rb

@@ -2,6 +2,6 @@ require 'helper'
 
 class Nanoc::CLI::Commands::InfoTest < Nanoc::TestCase
   def test_run
-    Nanoc::CLI.run %w(info)
+    Nanoc::CLI.run %w[info]
   end
 end

data/test/cli/commands/test_prune.rb

@@ -15,7 +15,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output2/index.html', 'w') { |io| io.write 'this is a index.' }
 
       assert_raises SystemExit do
-        Nanoc::CLI.run %w(prune)
+        Nanoc::CLI.run %w[prune]
       end
 
       assert File.file?('output2/index.html')
@@ -43,7 +43,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output2/foo.html', 'w')   { |io| io.write 'this is a foo.' }
       File.open('output2/index.html', 'w') { |io| io.write 'this is a index.' }
 
-      Nanoc::CLI.run %w(prune --yes)
+      Nanoc::CLI.run %w[prune --yes]
 
       assert File.file?('output2/index.html')
       assert !File.file?('output2/foo.html')
@@ -63,7 +63,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output2/foo.html', 'w')   { |io| io.write 'this is a foo.' }
       File.open('output2/index.html', 'w') { |io| io.write 'this is a index.' }
 
-      Nanoc::CLI.run %w(prune --dry-run)
+      Nanoc::CLI.run %w[prune --dry-run]
 
       assert File.file?('output2/index.html')
       assert File.file?('output2/foo.html')
@@ -96,7 +96,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output/bad-dir/blah', 'w')   { |io| io.write 'stuff' }
       File.open('output/index.html', 'w')     { |io| io.write 'stuff' }
 
-      Nanoc::CLI.run %w(prune --yes)
+      Nanoc::CLI.run %w[prune --yes]
 
       assert File.file?('output/index.html')
       assert File.file?('output/good-dir/blah')
@@ -126,7 +126,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output-real/some-file.html', 'w') { |io| io.write 'stuff' }
       File.open('output-real/index.html', 'w')     { |io| io.write 'stuff' }
 
-      Nanoc::CLI.run %w(prune --yes)
+      Nanoc::CLI.run %w[prune --yes]
 
       assert File.file?('output-real/index.html')
       assert !File.directory?('output-real/some-dir')
@@ -144,7 +144,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       FileUtils.mkdir_p('output/a/b/c')
       File.open('output/a/b/c/index.html', 'w') { |io| io.write 'stuff' }
 
-      Nanoc::CLI.run %w(prune --yes)
+      Nanoc::CLI.run %w[prune --yes]
 
       assert !File.file?('output/a/b/c/index.html')
       assert !File.directory?('output/a/b/c')

data/test/cli/test_cleaning_stream.rb

@@ -20,7 +20,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
   end
 
   def test_forward
-    methods = %i(write << tty? tty? flush tell print puts string reopen exist? exists? close)
+    methods = %i[write << tty? tty? flush tell print puts string reopen exist? exists? close]
 
     s = Stream.new
     cs = Nanoc::CLI::CleaningStream.new(s)

data/test/cli/test_cli.rb

@@ -22,7 +22,7 @@ end
 EOS
 
   def test_load_custom_commands
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
 
     FileUtils.cd('foo') do
       # Create command
@@ -31,7 +31,7 @@ EOS
 
       # Run command
       begin
-        Nanoc::CLI.run %w(_test)
+        Nanoc::CLI.run %w[_test]
       rescue SystemExit
         assert false, 'Running _test should not cause system exit'
       end
@@ -43,7 +43,7 @@ EOS
   end
 
   def test_load_custom_commands_nested
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
     FileUtils.cd('foo') do
       # Create command
       FileUtils.mkdir_p('commands')
@@ -59,7 +59,7 @@ EOS
 
       # Run command
       begin
-        Nanoc::CLI.run %w(_test _sub)
+        Nanoc::CLI.run %w[_test _sub]
       rescue SystemExit
         assert false, 'Running _test sub should not cause system exit'
       end
@@ -71,7 +71,7 @@ EOS
   end
 
   def test_load_custom_commands_non_default_commands_dirs
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
     FileUtils.cd('foo') do
       File.open('nanoc.yaml', 'w') { |io| io.write('commands_dirs: [commands, commands_alt]') }
 
@@ -89,7 +89,7 @@ EOS
 
       # Run command
       begin
-        Nanoc::CLI.run %w(_test _sub)
+        Nanoc::CLI.run %w[_test _sub]
       rescue SystemExit
         assert false, 'Running _test sub should not cause system exit'
       end
@@ -101,7 +101,7 @@ EOS
   end
 
   def test_load_custom_commands_broken
-    Nanoc::CLI.run %w(create_site foo)
+    Nanoc::CLI.run %w[create_site foo]
 
     FileUtils.cd('foo') do
       # Create command
@@ -112,11 +112,11 @@ EOS
       position_before = $stderr.tell
       Nanoc::CLI::ErrorHandler.disable
       assert_raises RuntimeError do
-        Nanoc::CLI.run %w(_test)
+        Nanoc::CLI.run %w[_test]
       end
       Nanoc::CLI::ErrorHandler.enable
       assert_raises SystemExit do
-        Nanoc::CLI.run %w(_test)
+        Nanoc::CLI.run %w[_test]
       end
       position_after = $stderr.tell