nanoc 4.6.1 → 4.6.2

data/spec/nanoc/rule_dsl/rule_memory_calculator_spec.rb

@@ -47,16 +47,16 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_name).to eql(:raw)
-          expect(subject[0].path).to be_nil
+          expect(subject[0].snapshot_names).to eql([:raw])
+          expect(subject[0].paths).to be_empty
 
           expect(subject[1]).to be_a(Nanoc::Int::ProcessingActions::Filter)
           expect(subject[1].filter_name).to eql(:erb)
           expect(subject[1].params).to eql(speed: :over_9000)
 
           expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[2].snapshot_name).to eql(:pre)
-          expect(subject[2].path).to be_nil
+          expect(subject[2].snapshot_names).to eql([:pre])
+          expect(subject[2].paths).to be_empty
 
           expect(subject[3]).to be_a(Nanoc::Int::ProcessingActions::Layout)
           expect(subject[3].layout_identifier).to eql('/default.*')
@@ -67,14 +67,10 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           expect(subject[4].params).to eql({})
 
           expect(subject[5]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[5].snapshot_name).to eql(:post)
-          expect(subject[5].path).to be_nil
+          expect(subject[5].snapshot_names).to eql([:post, :last])
+          expect(subject[5].paths).to be_empty
 
-          expect(subject[6]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[6].snapshot_name).to eql(:last)
-          expect(subject[6].path).to be_nil
-
-          expect(subject.size).to eql(7)
+          expect(subject.size).to eql(6)
         end
       end
 
@@ -89,18 +85,10 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_name).to eql(:raw)
-          expect(subject[0].path).to be_nil
-
-          expect(subject[1]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[1].snapshot_name).to eql(:last)
-          expect(subject[1].path).to be_nil
-
-          expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[2].snapshot_name).to eql(:pre)
-          expect(subject[2].path).to be_nil
+          expect(subject[0].snapshot_names).to eql([:raw, :last, :pre])
+          expect(subject[0].paths).to be_empty
 
-          expect(subject.size).to eql(3)
+          expect(subject.size).to eql(1)
         end
       end
 
@@ -119,18 +107,10 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_name).to eql(:raw)
-          expect(subject[0].path).to be_nil
-
-          expect(subject[1]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[1].snapshot_name).to eql(:last)
-          expect(subject[1].path).to eq('/foo.md')
+          expect(subject[0].snapshot_names).to eql([:raw, :last, :pre])
+          expect(subject[0].paths).to eq(['/foo.md'])
 
-          expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[2].snapshot_name).to eql(:pre)
-          expect(subject[2].path).to be_nil
-
-          expect(subject.size).to eql(3)
+          expect(subject.size).to eql(1)
         end
       end
 
@@ -149,18 +129,10 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_name).to eql(:raw)
-          expect(subject[0].path).to be_nil
-
-          expect(subject[1]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[1].snapshot_name).to eql(:last)
-          expect(subject[1].path).to be_nil
+          expect(subject[0].snapshot_names).to eql([:raw, :last, :pre])
+          expect(subject[0].paths).to be_empty
 
-          expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[2].snapshot_name).to eql(:pre)
-          expect(subject[2].path).to be_nil
-
-          expect(subject.size).to eql(3)
+          expect(subject.size).to eql(1)
         end
       end
     end
@@ -215,10 +187,19 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
     let(:view_context) { double(:view_context) }
 
     before do
+      Class.new(Nanoc::Filter) do
+        identifier :rule_memory_calculator_spec_snapshot_def_test
+        type text: :binary
+
+        def run(content, params = {})
+          # …
+        end
+      end
+
       rules_proc = proc do
         filter :erb, speed: :over_9000
         layout '/default.*'
-        filter :typohero
+        filter :rule_memory_calculator_spec_snapshot_def_test
       end
       rule = Nanoc::RuleDSL::Rule.new(Nanoc::Int::Pattern.from('/list.*'), :csv, rules_proc)
       rules_collection.add_item_compilation_rule(rule)
@@ -226,20 +207,23 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
       expect(compilation_context).to receive(:create_view_context).and_return(view_context)
     end
 
-    example do
-      expect(subject[0]).to be_a(Nanoc::Int::SnapshotDef)
-      expect(subject[0].name).to eql(:raw)
+    it 'creates snapshot defs' do
+      expect(subject.size).to eql(4)
+      expect(subject).to all(be_a(Nanoc::Int::SnapshotDef))
+    end
 
-      expect(subject[1]).to be_a(Nanoc::Int::SnapshotDef)
+    it 'has the right names' do
+      expect(subject[0].name).to eql(:raw)
       expect(subject[1].name).to eql(:pre)
-
-      expect(subject[2]).to be_a(Nanoc::Int::SnapshotDef)
       expect(subject[2].name).to eql(:post)
-
-      expect(subject[3]).to be_a(Nanoc::Int::SnapshotDef)
       expect(subject[3].name).to eql(:last)
+    end
 
-      expect(subject.size).to eql(4)
+    it 'has the right binary-ness' do
+      expect(subject[0]).not_to be_binary
+      expect(subject[1]).not_to be_binary
+      expect(subject[2]).to be_binary
+      expect(subject[3]).to be_binary
     end
   end
 end

data/spec/spec_helper.rb

@@ -67,7 +67,7 @@ RSpec.configure do |c|
     File.write('Rules', 'passthrough "/**/*"')
   end
 
-  c.include(Nanoc::Spec::HelperHelper, helper: true)
+  c.include(Nanoc::Spec::HelperHelper, helper: true) # rubocop:disable Style/MixinGrouping
 
   # Set focus if any
   if ENV.fetch('FOCUS', false)

data/test/base/test_compiler.rb

@@ -5,8 +5,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     site ||= Nanoc::Int::Site.new(
       config: nil,
       code_snippets: [],
-      items: [],
-      layouts: [],
+      data_source: Nanoc::Int::InMemDataSource.new([], []),
     )
 
     reps = Nanoc::Int::ItemRepRepo.new
@@ -76,11 +75,11 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       site.compile
 
       assert File.file?('output/moo-raw.txt')
-      # assert File.file?('output/moo-pre.txt')
+      assert File.file?('output/moo-pre.txt')
       assert File.file?('output/moo-post.txt')
       assert File.file?('output/moo-last.txt')
       assert_equal '<%= 1 %> <%%= 2 %> <%%%= 3 %>', File.read('output/moo-raw.txt')
-      # assert_equal '1 2 <%= 3 %>',                  File.read('output/moo-pre.txt')
+      assert_equal '1 2 <%= 3 %>',                  File.read('output/moo-pre.txt')
       assert_equal 'head 1 2 3 foot',               File.read('output/moo-post.txt')
       assert_equal 'head 1 2 3 foot',               File.read('output/moo-last.txt')
     end

data/test/base/test_item_array.rb

@@ -7,9 +7,7 @@ class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
     @one = Nanoc::Int::Item.new('Item One', {}, '/one/')
     @two = Nanoc::Int::Item.new('Item Two', {}, '/two/')
 
-    @items = Nanoc::Int::IdentifiableCollection.new({})
-    @items << @one
-    @items << @two
+    @items = Nanoc::Int::IdentifiableCollection.new({}, [@one, @two])
   end
 
   def test_change_item_identifier
@@ -27,9 +25,7 @@ class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
   end
 
   def test_brackets_with_glob
-    @items = Nanoc::Int::IdentifiableCollection.new(string_pattern_type: 'glob')
-    @items << @one
-    @items << @two
+    @items = Nanoc::Int::IdentifiableCollection.new({ string_pattern_type: 'glob' }, [@one, @two])
 
     assert_equal @one, @items['/on*/']
     assert_equal @two, @items['/*wo/']
@@ -57,7 +53,7 @@ class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
 
   def test_regex
     foo = Nanoc::Int::Item.new('Item Foo', {}, '/foo/')
-    @items << foo
+    @items = Nanoc::Int::IdentifiableCollection.new({}, [@one, @two, foo])
 
     assert_equal @one, @items[/n/]
     assert_equal @two, @items[%r{o/}] # not foo
@@ -67,15 +63,8 @@ class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
     assert_nil @items['/foo/']
 
     foo = Nanoc::Int::Item.new('Item Foo', {}, '/foo/')
-    @items << foo
+    @items = Nanoc::Int::IdentifiableCollection.new({}, [@one, @two, foo])
 
     assert_equal foo, @items['/foo/']
   end
-
-  def test_concat
-    new_item = Nanoc::Int::Item.new('New item', {}, '/new/')
-    @items.concat([new_item])
-
-    assert_equal new_item, @items['/new/']
-  end
 end

data/test/checking/checks/test_html.rb

@@ -39,9 +39,10 @@ class Nanoc::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
+        assert_equal 3, check.issues.size
+        assert_equal 'line 1: Start tag seen without seeing a doctype first. Expected e.g. “<!DOCTYPE html>”.: <h2>Hi!</h1>', check.issues.to_a[0].description
+        assert_equal 'line 1: Element “head” is missing a required instance of child element “title”.: <h2>Hi!</h1>', check.issues.to_a[1].description
+        assert_equal 'line 1: End tag “h1” seen, but there were open elements.: <h2>Hi!</h1>', check.issues.to_a[2].description
       end
     end
   end

data/test/cli/commands/test_compile.rb

@@ -166,7 +166,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
     # Create data
     item = Nanoc::Int::Item.new('content', {}, '/')
     rep = Nanoc::Int::ItemRep.new(item, :default)
-    rep.raw_paths[:last] = 'output/foo.txt'
+    rep.raw_paths[:last] = ['output/foo.txt']
     rep.compiled = true
 
     # Listen
@@ -188,7 +188,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
     # Create data
     item = Nanoc::Int::Item.new('content', {}, '/')
     rep = Nanoc::Int::ItemRep.new(item, :default)
-    rep.raw_paths[:last] = 'output/foo.txt'
+    rep.raw_paths[:last] = ['output/foo.txt']
 
     # Listen
     listener = new_file_action_printer([rep])

data/test/filters/test_relativize_paths.rb

@@ -15,7 +15,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -41,7 +41,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -67,7 +67,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -93,7 +93,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -131,7 +131,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -157,7 +157,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -183,7 +183,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -209,7 +209,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     # Set content
@@ -235,7 +235,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     # Set content
@@ -261,7 +261,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     # Set content
@@ -287,7 +287,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     # Set content
@@ -313,7 +313,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     # Set content
@@ -339,7 +339,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     raw_content    = %(<object data="/example"><param name="movie" content="/example"></object>)
@@ -363,7 +363,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -399,7 +399,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -425,7 +425,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -451,7 +451,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -477,7 +477,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content
@@ -506,7 +506,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     # Set content
@@ -532,7 +532,7 @@ EOS
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/woof/meow/'
+      @item_rep.paths[:last] = ['/woof/meow/']
     end
 
     # Set content
@@ -559,7 +559,7 @@ EOS
           ),
           :blah,
         )
-        @item_rep.paths[:last] = '/foo/bar/baz/'
+        @item_rep.paths[:last] = ['/foo/bar/baz/']
       end
 
       # Set content
@@ -592,7 +592,7 @@ XML
           ),
           :blah,
         )
-        @item_rep.paths[:last] = '/foo/bar/baz/'
+        @item_rep.paths[:last] = ['/foo/bar/baz/']
       end
 
       # Set content
@@ -624,7 +624,7 @@ XML
           ),
           :blah,
         )
-        @item_rep.paths[:last] = '/foo/bar/baz/'
+        @item_rep.paths[:last] = ['/foo/bar/baz/']
       end
 
       # Set content
@@ -661,7 +661,7 @@ XML
           ),
           :blah,
         )
-        @item_rep.paths[:last] = '/foo/bar/baz/'
+        @item_rep.paths[:last] = ['/foo/bar/baz/']
       end
 
       # Set content
@@ -703,7 +703,7 @@ XML
           ),
           :blah,
         )
-        @item_rep.paths[:last] = '/foo/bar/baz/'
+        @item_rep.paths[:last] = ['/foo/bar/baz/']
       end
 
       # Set content
@@ -738,7 +738,7 @@ XML
           ),
           :blah,
         )
-        @item_rep.paths[:last] = '/foo/baz/'
+        @item_rep.paths[:last] = ['/foo/baz/']
       end
 
       # Set content
@@ -772,7 +772,7 @@ XML
           ),
           :blah,
         )
-        @item_rep.paths[:last] = '/foo/baz/'
+        @item_rep.paths[:last] = ['/foo/baz/']
       end
 
       # Set content
@@ -803,7 +803,7 @@ XML
         ),
         :blah,
       )
-      @item_rep.paths[:last] = '/foo/bar/baz/'
+      @item_rep.paths[:last] = ['/foo/bar/baz/']
     end
 
     # Set content