nanoc 4.8.9 → 4.8.10

data/spec/nanoc/base/compiler_spec.rb

@@ -9,7 +9,6 @@ describe Nanoc::Int::Compiler do
       action_sequence_store: action_sequence_store,
       action_provider: action_provider,
       dependency_store: dependency_store,
-      reps: reps,
       outdatedness_store: outdatedness_store,
     )
   end
@@ -18,9 +17,8 @@ describe Nanoc::Int::Compiler do
   let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new }
 
   let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts, config) }
-  let(:reps) { Nanoc::Int::ItemRepRepo.new }
 
-  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }
+  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site) }
   let(:action_provider) { double(:action_provider) }
 
   let(:compiled_content_cache) { Nanoc::Int::CompiledContentCache.new(items: items) }
@@ -65,26 +63,31 @@ describe Nanoc::Int::Compiler do
   end
 
   before do
-    reps << rep
-    reps << other_rep
-
-    reps.each do |rep|
-      rep.snapshot_defs << Nanoc::Int::SnapshotDef.new(:last, binary: false)
-    end
-
     allow(Nanoc::Int::NotificationCenter).to receive(:post)
   end
 
   describe '#compile_rep' do
-    let(:stage) { compiler.send(:compile_reps_stage, action_sequences) }
+    let(:stage) { compiler.send(:compile_reps_stage, action_sequences, reps) }
 
     subject { stage.send(:compile_rep, rep, is_outdated: is_outdated) }
 
     let(:is_outdated) { true }
 
+    let(:reps) do
+      Nanoc::Int::ItemRepRepo.new.tap do |rs|
+        rs << rep
+        rs << other_rep
+
+        rs.each do |rep|
+          rep.snapshot_defs << Nanoc::Int::SnapshotDef.new(:last, binary: false)
+        end
+      end
+    end
+
     it 'generates expected output' do
+      reps = Nanoc::Int::ItemRepRepo.new
       expect { subject }
-        .to change { compiler.snapshot_repo.get(rep, :last) }
+        .to change { compiler.compilation_context(reps: reps).snapshot_repo.get(rep, :last) }
         .from(nil)
         .to(some_textual_content('3'))
     end
@@ -102,14 +105,15 @@ describe Nanoc::Int::Compiler do
       let(:item) { Nanoc::Int::Item.new('other=<%= @items["/other.*"].compiled_content %>', {}, '/hi.md') }
 
       it 'generates expected output' do
-        expect(compiler.snapshot_repo.get(rep, :last)).to be_nil
+        reps = Nanoc::Int::ItemRepRepo.new
+        expect(compiler.compilation_context(reps: reps).snapshot_repo.get(rep, :last)).to be_nil
 
         expect { stage.send(:compile_rep, rep, is_outdated: true) }
           .to raise_error(Nanoc::Int::Errors::UnmetDependency)
         stage.send(:compile_rep, other_rep, is_outdated: true)
         stage.send(:compile_rep, rep, is_outdated: true)
 
-        expect(compiler.snapshot_repo.get(rep, :last).string).to eql('other=other content')
+        expect(compiler.compilation_context(reps: reps).snapshot_repo.get(rep, :last).string).to eql('other=other content')
       end
 
       it 'generates notifications in the proper order' do

data/spec/nanoc/base/filter_spec.rb

@@ -82,20 +82,21 @@ describe Nanoc::Filter do
     let(:item_views) { [item_view] }
 
     let(:item) { Nanoc::Int::Item.new('foo', {}, '/stuff.md') }
-    let(:item_view) { Nanoc::ItemWithRepsView.new(item, view_context) }
+    let(:item_view) { Nanoc::CompilationItemView.new(item, view_context) }
     let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }
 
     let(:view_context) do
-      Nanoc::ViewContext.new(
-        reps: reps,
-        items: double(:items),
-        dependency_tracker: dependency_tracker,
+      Nanoc::ViewContextForCompilation.new(
+        reps:                reps,
+        items:               Nanoc::Int::ItemCollection.new(config),
+        dependency_tracker:  dependency_tracker,
         compilation_context: double(:compilation_context),
-        snapshot_repo: double(:snapshot_repo),
+        snapshot_repo:       double(:snapshot_repo),
       )
     end
 
     let(:dependency_tracker) { double(:dependency_tracker) }
+    let(:config) { Nanoc::Int::Configuration.new }
 
     let(:reps) { Nanoc::Int::ItemRepRepo.new }
 

data/spec/nanoc/base/repos/outdatedness_store_spec.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 describe Nanoc::Int::OutdatednessStore do
-  subject(:store) { described_class.new(site: site, reps: reps) }
+  subject(:store) { described_class.new(site: site) }
 
   let(:site) { double(:site) }
-  let(:reps) { Nanoc::Int::ItemRepRepo.new }
 
   let(:item) { Nanoc::Int::Item.new('foo', {}, '/foo.md') }
   let(:rep) { Nanoc::Int::ItemRep.new(item, :foo) }
@@ -54,19 +53,6 @@ describe Nanoc::Int::OutdatednessStore do
     end
   end
 
-  describe '#to_a' do
-    subject { store.to_a }
-
-    context 'nothing added' do
-      it { is_expected.to be_empty }
-    end
-
-    context 'one rep added' do
-      before { store.add(rep) }
-      it { is_expected.to eql([rep]) }
-    end
-  end
-
   describe 'reloading' do
     subject do
       store.store
@@ -75,27 +61,12 @@ describe Nanoc::Int::OutdatednessStore do
     end
 
     context 'not added' do
-      context 'rep part of new reps' do
-        before { reps << rep }
-        it { is_expected.not_to be }
-      end
-
-      context 'rep not part of new reps' do
-        it { is_expected.not_to be }
-      end
+      it { is_expected.not_to be }
     end
 
     context 'added' do
       before { store.add(rep) }
-
-      context 'rep part of new reps' do
-        before { reps << rep }
-        it { is_expected.to be }
-      end
-
-      context 'rep not part of new reps' do
-        it { is_expected.not_to be }
-      end
+      it { is_expected.to be }
     end
   end
 end

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

@@ -3,6 +3,7 @@
 describe Nanoc::Int::Compiler::Stages::CompileReps do
   let(:stage) do
     described_class.new(
+      reps: reps,
       outdatedness_store: outdatedness_store,
       dependency_store: dependency_store,
       action_sequences: action_sequences,
@@ -27,7 +28,7 @@ describe Nanoc::Int::Compiler::Stages::CompileReps do
   let(:compiled_content_cache) { Nanoc::Int::CompiledContentCache.new(items: items) }
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
-  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }
+  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site) }
   let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts, config) }
 
   let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }

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

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+describe Nanoc::Int::Compiler::Stages::DetermineOutdatedness do
+  let(:stage) do
+    described_class.new(
+      reps: reps,
+      outdatedness_checker: outdatedness_checker,
+      outdatedness_store: outdatedness_store,
+    )
+  end
+
+  let(:reps) do
+    Nanoc::Int::ItemRepRepo.new
+  end
+
+  let(:outdatedness_checker) do
+    double(:outdatedness_checker)
+  end
+
+  let(:outdatedness_store) do
+    Nanoc::Int::OutdatednessStore.new
+  end
+
+  describe '#run' do
+    subject { stage.run }
+
+    context 'outdatedness store is empty' do
+      let(:item) do
+        Nanoc::Int::Item.new('', {}, '/hi.md')
+      end
+
+      let(:rep) do
+        Nanoc::Int::ItemRep.new(item, :woof)
+      end
+
+      let(:other_rep) do
+        Nanoc::Int::ItemRep.new(item, :bark)
+      end
+
+      context 'outdatedness checker thinks rep is outdated' do
+        before do
+          reps << rep
+          reps << other_rep
+
+          expect(outdatedness_checker)
+            .to receive(:outdated?).with(rep).and_return(true)
+
+          expect(outdatedness_checker)
+            .to receive(:outdated?).with(other_rep).and_return(false)
+        end
+
+        it 'adds the rep' do
+          expect { subject }
+            .to change { outdatedness_store.include?(rep) }
+            .from(false)
+            .to(true)
+        end
+
+        it 'also adds the other rep' do
+          expect { subject }
+            .to change { outdatedness_store.include?(other_rep) }
+            .from(false)
+            .to(true)
+        end
+
+        it 'returns a list with the known rep’s item' do
+          expect(subject).to eq([rep.item])
+        end
+      end
+
+      context 'outdatedness checker thinks rep is not outdated' do
+        it 'keeps the outdatedness store empty' do
+          expect { subject }
+            .not_to change { outdatedness_store.empty? }
+        end
+
+        it 'returns an empty list' do
+          expect(subject).to be_empty
+        end
+      end
+    end
+
+    context 'outdatedness store contains known rep' do
+      let(:item) do
+        Nanoc::Int::Item.new('', {}, '/hi.md')
+      end
+
+      let(:rep) do
+        Nanoc::Int::ItemRep.new(item, :woof)
+      end
+
+      let(:other_rep) do
+        Nanoc::Int::ItemRep.new(item, :bark)
+      end
+
+      before do
+        reps << rep
+        reps << other_rep
+
+        outdatedness_store.add(rep)
+
+        expect(outdatedness_checker)
+          .to receive(:outdated?).with(other_rep).and_return(false)
+      end
+
+      it 'keeps the rep' do
+        expect { subject }
+          .not_to change { outdatedness_store.include?(rep) }
+      end
+
+      it 'also adds the other rep' do
+        expect { subject }
+          .to change { outdatedness_store.include?(other_rep) }
+          .from(false)
+          .to(true)
+      end
+
+      it 'returns a list with the known rep’s item' do
+        expect(subject).to eq([rep.item])
+      end
+    end
+
+    context 'outdatedness store contains unknown rep' do
+      let(:item) do
+        Nanoc::Int::Item.new('', {}, '/hi.md')
+      end
+
+      let(:unknown_rep) do
+        Nanoc::Int::ItemRep.new(item, :woof)
+      end
+
+      before do
+        outdatedness_store.add(unknown_rep)
+      end
+
+      it 'removes the unknown rep' do
+        expect { subject }
+          .to change { outdatedness_store.include?(unknown_rep) }
+          .from(true)
+          .to(false)
+      end
+
+      it 'returns an empty list' do
+        expect(subject).to be_empty
+      end
+    end
+  end
+end

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

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+describe Nanoc::Int::Compiler::Stages::Preprocess do
+  let(:stage) do
+    described_class.new(
+      action_provider: action_provider,
+      site: site,
+      dependency_store: dependency_store,
+      checksum_store: checksum_store,
+    )
+  end
+
+  let(:action_provider) do
+    double(:action_provider)
+  end
+
+  let(:site) do
+    Nanoc::Int::Site.new(
+      config: config,
+      code_snippets: [],
+      data_source: data_source,
+    )
+  end
+
+  let(:data_source) { Nanoc::Int::InMemDataSource.new(items, layouts) }
+  let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+  let(:items) { Nanoc::Int::ItemCollection.new(config) }
+  let(:layouts) { Nanoc::Int::LayoutCollection.new(config) }
+
+  let(:dependency_store) do
+    Nanoc::Int::DependencyStore.new(items, layouts, config, site: site)
+  end
+
+  let(:checksum_store) do
+    Nanoc::Int::ChecksumStore.new(site: site, objects: items.to_a + layouts.to_a)
+  end
+
+  describe '#run' do
+    subject { stage.run }
+
+    context 'no preprocessing needed' do
+      before do
+        expect(action_provider).to receive(:need_preprocessing?).and_return(false)
+      end
+
+      it 'marks the site as preprocessed' do
+        expect { subject }
+          .to change { site.preprocessed? }
+          .from(false)
+          .to(true)
+      end
+
+      it 'freezes the site' do
+        subject
+      end
+    end
+
+    context 'preprocessing needed' do
+      let(:new_item) { Nanoc::Int::Item.new('new item', {}, '/new.md') }
+      let(:new_layout) { Nanoc::Int::Layout.new('new layout', {}, '/new.md') }
+
+      before do
+        expect(action_provider).to receive(:need_preprocessing?).and_return(true)
+
+        expect(action_provider).to receive(:preprocess) do |site|
+          site.data_source =
+            Nanoc::Int::InMemDataSource.new(
+              Nanoc::Int::ItemCollection.new(config, [new_item]),
+              Nanoc::Int::LayoutCollection.new(config, [new_layout]),
+            )
+        end
+      end
+
+      it 'marks the site as preprocessed' do
+        expect { subject }
+          .to change { site.preprocessed? }
+          .from(false)
+          .to(true)
+      end
+
+      it 'freezes the site' do
+        expect { subject }
+          .to change { site.config.frozen? }
+          .from(false)
+          .to(true)
+      end
+
+      it 'sets items on dependency store' do
+        expect { subject }
+          .to change { dependency_store.items.to_a }
+          .from([])
+          .to([new_item])
+      end
+
+      it 'sets layouts on dependency store' do
+        expect { subject }
+          .to change { dependency_store.layouts.to_a }
+          .from([])
+          .to([new_layout])
+      end
+
+      it 'sets data on checksum store' do
+        expect { subject }
+          .to change { checksum_store.objects.to_a }
+          .from([])
+          .to(match_array([new_item, new_layout, config]))
+      end
+    end
+  end
+end

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

@@ -400,12 +400,12 @@ describe Nanoc::Int::Executor do
     end
 
     let(:view_context) do
-      Nanoc::ViewContext.new(
-        reps: double(:reps),
-        items: double(:items),
-        dependency_tracker: dependency_tracker,
+      Nanoc::ViewContextForCompilation.new(
+        reps:                Nanoc::Int::ItemRepRepo.new,
+        items:               Nanoc::Int::ItemCollection.new(config),
+        dependency_tracker:  dependency_tracker,
         compilation_context: double(:compilation_context),
-        snapshot_repo: snapshot_repo,
+        snapshot_repo:       snapshot_repo,
       )
     end
 
@@ -482,7 +482,7 @@ describe Nanoc::Int::Executor do
         let(:layout_content) { 'head <%= @item_rep.compiled_content(snapshot: :pre) %> foot' }
 
         let(:assigns) do
-          { item_rep: Nanoc::ItemRepView.new(rep, view_context) }
+          { item_rep: Nanoc::CompilationItemRepView.new(rep, view_context) }
         end
 
         before do