nanoc 4.7.7 → 4.7.8

data/spec/nanoc/base/errors/dependency_cycle_spec.rb

@@ -21,10 +21,10 @@ describe Nanoc::Int::Errors::DependencyCycle do
     expected = <<EOS
 The site cannot be compiled because there is a dependency cycle:
 
-    (1) item /b.md, rep :default, depends on
-    (2) item /c.md, rep :default, depends on
-    (3) item /d.md, rep :default, depends on
-    (4) item /e.md, rep :default, depends on (1)
+    (1) item /e.md, rep :default, uses compiled content of
+    (2) item /d.md, rep :default, uses compiled content of
+    (3) item /c.md, rep :default, uses compiled content of
+    (4) item /b.md, rep :default, uses compiled content of (1)
 EOS
 
     expect(error.message).to eql(expected)

data/spec/nanoc/base/services/compiler/stages/calculate_checksums_spec.rb

@@ -0,0 +1,69 @@
+describe Nanoc::Int::Compiler::Stages::CalculateChecksums do
+  let(:stage) do
+    described_class.new(items: items, layouts: layouts, code_snippets: code_snippets, config: config)
+  end
+
+  let(:config) do
+    Nanoc::Int::Configuration.new.with_defaults
+  end
+
+  let(:code_snippets) do
+    [code_snippet]
+  end
+
+  let(:items) do
+    Nanoc::Int::IdentifiableCollection.new(config, [item])
+  end
+
+  let(:layouts) do
+    Nanoc::Int::IdentifiableCollection.new(config, [layout])
+  end
+
+  let(:code_snippet) do
+    Nanoc::Int::CodeSnippet.new('woof!', 'dog.rb')
+  end
+
+  let(:item) do
+    Nanoc::Int::Item.new('hello there', {}, '/hi.md')
+  end
+
+  let(:layout) do
+    Nanoc::Int::Layout.new('t3mpl4t3', {}, '/page.erb')
+  end
+
+  describe '#run' do
+    subject { stage.run }
+
+    it 'checksums items' do
+      expect(subject.checksum_for(item))
+        .to eq(Nanoc::Int::Checksummer.calc(item))
+
+      expect(subject.content_checksum_for(item))
+        .to eq(Nanoc::Int::Checksummer.calc_for_content_of(item))
+
+      expect(subject.attributes_checksum_for(item))
+        .to eq(Nanoc::Int::Checksummer.calc_for_each_attribute_of(item))
+    end
+
+    it 'checksums layouts' do
+      expect(subject.checksum_for(layout))
+        .to eq(Nanoc::Int::Checksummer.calc(layout))
+
+      expect(subject.content_checksum_for(layout))
+        .to eq(Nanoc::Int::Checksummer.calc_for_content_of(layout))
+
+      expect(subject.attributes_checksum_for(layout))
+        .to eq(Nanoc::Int::Checksummer.calc_for_each_attribute_of(layout))
+    end
+
+    it 'checksums config' do
+      expect(subject.checksum_for(config))
+        .to eq(Nanoc::Int::Checksummer.calc(config))
+    end
+
+    it 'checksums code snippets' do
+      expect(subject.checksum_for(code_snippet))
+        .to eq(Nanoc::Int::Checksummer.calc(code_snippet))
+    end
+  end
+end

data/spec/nanoc/base/services/executor_spec.rb

@@ -408,8 +408,8 @@ describe Nanoc::Int::Executor do
     end
 
     let(:action_sequence) do
-      Nanoc::Int::ActionSequence.new(rep).tap do |seq|
-        seq.add_filter(:erb, {})
+      Nanoc::Int::ActionSequence.build(rep) do |b|
+        b.add_filter(:erb, {})
       end
     end
 

data/spec/nanoc/base/services/item_rep_router_spec.rb

@@ -62,10 +62,10 @@ describe(Nanoc::Int::ItemRepRouter) do
     end
 
     it 'picks the paths last returned' do
-      allow(action_provider).to receive(:action_sequence_for).with(reps[0])
-        .and_return(memory_without_paths, action_sequence_for_default)
-      allow(action_provider).to receive(:action_sequence_for).with(reps[1])
-        .and_return(memory_without_paths, action_sequence_for_csv)
+      allow(action_provider).to receive(:action_sequence_for)
+        .with(reps[0]).and_return(memory_without_paths, action_sequence_for_default)
+      allow(action_provider).to receive(:action_sequence_for)
+        .with(reps[1]).and_return(memory_without_paths, action_sequence_for_csv)
 
       subject
 

data/spec/nanoc/base/services/outdatedness_checker_spec.rb

@@ -3,6 +3,7 @@ describe Nanoc::Int::OutdatednessChecker do
     described_class.new(
       site: site,
       checksum_store: checksum_store,
+      checksums: checksums,
       dependency_store: dependency_store,
       action_sequence_store: action_sequence_store,
       action_sequences: action_sequences,
@@ -12,6 +13,15 @@ describe Nanoc::Int::OutdatednessChecker do
 
   let(:checksum_store) { double(:checksum_store) }
 
+  let(:checksums) do
+    Nanoc::Int::Compiler::Stages::CalculateChecksums.new(
+      items: items,
+      layouts: layouts,
+      code_snippets: code_snippets,
+      config: config,
+    ).run
+  end
+
   let(:dependency_store) do
     Nanoc::Int::DependencyStore.new(items, layouts)
   end
@@ -19,10 +29,12 @@ describe Nanoc::Int::OutdatednessChecker do
   let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item]) }
   let(:layouts) { Nanoc::Int::IdentifiableCollection.new(config) }
 
+  let(:code_snippets) { [] }
+
   let(:site) do
     Nanoc::Int::Site.new(
       config: config,
-      code_snippets: [],
+      code_snippets: code_snippets,
       data_source: Nanoc::Int::InMemDataSource.new([], []),
     )
   end
@@ -32,8 +44,8 @@ describe Nanoc::Int::OutdatednessChecker do
   end
 
   let(:old_action_sequence_for_item_rep) do
-    Nanoc::Int::ActionSequence.new(item_rep).tap do |seq|
-      seq.add_filter(:erb, {})
+    Nanoc::Int::ActionSequence.build(item_rep) do |b|
+      b.add_filter(:erb, {})
     end
   end
 
@@ -74,8 +86,8 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'action sequence differs' do
         let(:new_action_sequence_for_item_rep) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |seq|
-            seq.add_filter(:super_erb, {})
+          Nanoc::Int::ActionSequence.build(item_rep) do |b|
+            b.add_filter(:super_erb, {})
           end
         end
 
@@ -92,8 +104,8 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'action sequence differs' do
         let(:new_action_sequence_for_item_rep) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |seq|
-            seq.add_filter(:super_erb, {})
+          Nanoc::Int::ActionSequence.build(item_rep) do |b|
+            b.add_filter(:super_erb, {})
           end
         end
 
@@ -123,8 +135,8 @@ describe Nanoc::Int::OutdatednessChecker do
     let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item, other_item]) }
 
     let(:old_action_sequence_for_other_item_rep) do
-      Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
-        seq.add_filter(:erb, {})
+      Nanoc::Int::ActionSequence.build(other_item_rep) do |b|
+        b.add_filter(:erb, {})
       end
     end
 
@@ -152,6 +164,10 @@ describe Nanoc::Int::OutdatednessChecker do
       let(:distant_item) { Nanoc::Int::Item.new('distant stuff', {}, '/distant.md') }
       let(:distant_item_rep) { Nanoc::Int::ItemRep.new(distant_item, :default) }
 
+      let(:items) do
+        Nanoc::Int::IdentifiableCollection.new(config, [item, other_item, distant_item])
+      end
+
       let(:action_sequences) do
         {
           item_rep => new_action_sequence_for_item_rep,
@@ -252,9 +268,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
-            seq.add_filter(:erb, {})
-            seq.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.build(other_item_rep) do |b|
+            b.add_filter(:erb, {})
+            b.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -296,9 +312,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
-            seq.add_filter(:erb, {})
-            seq.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.build(other_item_rep) do |b|
+            b.add_filter(:erb, {})
+            b.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -329,9 +345,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
-            seq.add_filter(:erb, {})
-            seq.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.build(other_item_rep) do |b|
+            b.add_filter(:erb, {})
+            b.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -356,9 +372,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
-            seq.add_filter(:erb, {})
-            seq.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.build(other_item_rep) do |b|
+            b.add_filter(:erb, {})
+            b.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -389,9 +405,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'rules changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
-            seq.add_filter(:erb, {})
-            seq.add_filter(:donkey, {})
+          Nanoc::Int::ActionSequence.build(other_item_rep) do |b|
+            b.add_filter(:erb, {})
+            b.add_filter(:donkey, {})
           end
         end
 

data/spec/nanoc/base/services/outdatedness_rules_spec.rb

@@ -8,6 +8,7 @@ describe Nanoc::Int::OutdatednessRules do
       Nanoc::Int::OutdatednessChecker.new(
         site: site,
         checksum_store: checksum_store,
+        checksums: checksums,
         dependency_store: dependency_store,
         action_sequence_store: action_sequence_store,
         action_sequences: action_sequences,
@@ -36,6 +37,15 @@ describe Nanoc::Int::OutdatednessRules do
     let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new }
     let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: objects) }
 
+    let(:checksums) do
+      Nanoc::Int::Compiler::Stages::CalculateChecksums.new(
+        items: items,
+        layouts: layouts,
+        code_snippets: code_snippets,
+        config: config,
+      ).run
+    end
+
     let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item]) }
     let(:layouts) { Nanoc::Int::IdentifiableCollection.new(config) }
 
@@ -61,7 +71,7 @@ describe Nanoc::Int::OutdatednessRules do
         it { is_expected.not_to be }
       end
 
-      context 'only non-outdated snippets' do
+      context 'only outdated snippets' do
         let(:code_snippet) { Nanoc::Int::CodeSnippet.new('asdf', 'lib/foo.md') }
         let(:code_snippet_old) { Nanoc::Int::CodeSnippet.new('aaaaaaaa', 'lib/foo.md') }
         let(:code_snippets) { [code_snippet] }
@@ -305,8 +315,8 @@ describe Nanoc::Int::OutdatednessRules do
       let(:rule_class) { Nanoc::Int::OutdatednessRules::RulesModified }
 
       let(:old_mem) do
-        Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-          mem.add_filter(:erb, {})
+        Nanoc::Int::ActionSequence.build(item_rep) do |b|
+          b.add_filter(:erb, {})
         end
       end
 
@@ -323,9 +333,9 @@ describe Nanoc::Int::OutdatednessRules do
 
       context 'memory is different' do
         let(:new_mem) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_filter(:erb, {})
-            mem.add_filter(:donkey, {})
+          Nanoc::Int::ActionSequence.build(item_rep) do |b|
+            b.add_filter(:erb, {})
+            b.add_filter(:donkey, {})
           end
         end
 
@@ -344,6 +354,8 @@ describe Nanoc::Int::OutdatednessRules do
       let(:stored_obj) { raise 'override me' }
       let(:new_obj)    { raise 'override me' }
 
+      let(:items) { [new_obj] }
+
       shared_examples 'a document' do
         let(:stored_obj) { klass.new('a', {}, '/foo.md') }
         let(:new_obj)    { stored_obj }
@@ -463,9 +475,9 @@ describe Nanoc::Int::OutdatednessRules do
 
       context 'unknown filter' do
         let(:mem) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_snapshot(:donkey, '/foo.md')
-            mem.add_filter(:asdf, {})
+          Nanoc::Int::ActionSequence.build(item_rep) do |b|
+            b.add_snapshot(:donkey, '/foo.md')
+            b.add_filter(:asdf, {})
           end
         end
 
@@ -474,9 +486,9 @@ describe Nanoc::Int::OutdatednessRules do
 
       context 'known filter, not always outdated' do
         let(:mem) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_snapshot(:donkey, '/foo.md')
-            mem.add_filter(:erb, {})
+          Nanoc::Int::ActionSequence.build(item_rep) do |b|
+            b.add_snapshot(:donkey, '/foo.md')
+            b.add_filter(:erb, {})
           end
         end
 
@@ -485,9 +497,9 @@ describe Nanoc::Int::OutdatednessRules do
 
       context 'known filter, always outdated' do
         let(:mem) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_snapshot(:donkey, '/foo.md')
-            mem.add_filter(:xsl, {})
+          Nanoc::Int::ActionSequence.build(item_rep) do |b|
+            b.add_snapshot(:donkey, '/foo.md')
+            b.add_filter(:xsl, {})
           end
         end
 

data/spec/nanoc/cli/commands/show_data_spec.rb

@@ -167,6 +167,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
       allow(site).to receive(:compiler).and_return(compiler)
       allow(compiler).to receive(:create_outdatedness_checker).and_return(outdatedness_checker)
       allow(compiler).to receive(:reps).and_return(reps)
+      allow(compiler).to receive(:calculate_checksums)
     end
 
     context 'not outdated' do
@@ -239,6 +240,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
       allow(runner).to receive(:site).and_return(site)
       allow(site).to receive(:compiler).and_return(compiler)
       allow(compiler).to receive(:create_outdatedness_checker).and_return(outdatedness_checker)
+      allow(compiler).to receive(:calculate_checksums)
     end
 
     context 'not outdated' do

data/spec/nanoc/rule_dsl/action_sequence_calculator_spec.rb

@@ -175,21 +175,23 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
   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)
+    let(:action_sequence) do
+      Nanoc::Int::ActionSequence.build(rep) do |b|
+        b.add_snapshot(:a1, nil)
+        b.add_snapshot(:a2, '/a2.md')
+        b.add_snapshot(:a3, nil)
+        b.add_filter(:erb, awesomeness: 'high')
+        b.add_snapshot(:b1, '/b1.md')
+        b.add_snapshot(:b2, nil)
+        b.add_snapshot(:b3, '/b3.md')
+        b.add_filter(:erb, awesomeness: 'high')
+        b.add_snapshot(:c, nil)
+      end
     end
 
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
+    let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }
+
     example do
       expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
       expect(subject[0].snapshot_names).to eql(%i[a1 a2 a3])

data/spec/nanoc/rule_dsl/recording_executor_spec.rb

@@ -1,8 +1,9 @@
 describe Nanoc::RuleDSL::RecordingExecutor do
-  let(:executor) { described_class.new(action_sequence) }
+  let(:executor) { described_class.new(rep) }
 
-  let(:action_sequence) { Nanoc::Int::ActionSequence.new(rep) }
-  let(:rep) { double(:rep) }
+  let(:action_sequence) { executor.action_sequence }
+  let(:item) { Nanoc::Int::Item.new('stuff', {}, '/foo.md') }
+  let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }
 
   describe '#filter' do
     it 'records filter call without arguments' do

data/test/cli/test_cleaning_stream.rb

@@ -84,4 +84,12 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     cleaning_stream << obj
     assert_equal 'Hello… world!', stream.string
   end
+
+  def test_invalid_string
+    s = "\x80"
+    stream = StringIO.new
+    cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
+    cleaning_stream << s
+    assert_equal "\xef\xbf\xbd", stream.string
+  end
 end