nanoc 4.6.0 → 4.6.1

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

@@ -0,0 +1,141 @@
+describe Nanoc::Int::Compiler::Stages::CompileReps do
+  let(:stage) do
+    described_class.new(
+      outdatedness_store: outdatedness_store,
+      dependency_store: dependency_store,
+      action_provider: action_provider,
+      compilation_context: compilation_context,
+      compiled_content_cache: compiled_content_cache,
+    )
+  end
+
+  let(:compilation_context) do
+    Nanoc::Int::Compiler::CompilationContext.new(
+      action_provider: action_provider,
+      reps: reps,
+      site: site,
+      compiled_content_cache: compiled_content_cache,
+      snapshot_repo: snapshot_repo,
+    )
+  end
+
+  let(:action_provider) { double(:action_provider) }
+  let(:reps) { Nanoc::Int::ItemRepRepo.new }
+  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(:dependency_store) { Nanoc::Int::DependencyStore.new(items.to_a) }
+
+  let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }
+  let(:item) { Nanoc::Int::Item.new('<%= 1 + 2 %>', {}, '/hi.md') }
+
+  let(:other_rep) { Nanoc::Int::ItemRep.new(other_item, :default) }
+  let(:other_item) { Nanoc::Int::Item.new('other content', {}, '/other.md') }
+
+  let(:site) do
+    Nanoc::Int::Site.new(
+      config: config,
+      code_snippets: code_snippets,
+      items: items,
+      layouts: layouts,
+    )
+  end
+
+  let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+  let(:layouts) { [] }
+  let(:code_snippets) { [] }
+
+  let(:items) do
+    Nanoc::Int::IdentifiableCollection.new(config).tap do |col|
+      col << item
+      col << other_item
+    end
+  end
+
+  let(:memory) do
+    actions =
+      [
+        Nanoc::Int::ProcessingActions::Filter.new(:erb, {}),
+        Nanoc::Int::ProcessingActions::Snapshot.new(:last, nil),
+      ]
+
+    Nanoc::Int::RuleMemory.new(nil, actions: actions)
+  end
+
+  before do
+    reps << rep
+    reps << other_rep
+
+    reps.each do |rep|
+      rep.snapshot_defs << Nanoc::Int::SnapshotDef.new(:last)
+    end
+
+    allow(action_provider).to receive(:memory_for).with(rep).and_return(memory)
+    allow(action_provider).to receive(:memory_for).with(other_rep).and_return(memory)
+  end
+
+  describe '#compile_reps' do
+    subject { stage.run }
+
+    before do
+      allow(action_provider).to receive(:snapshots_defs_for).with(rep).and_return(snapshot_defs_for_rep)
+      allow(action_provider).to receive(:snapshots_defs_for).with(other_rep).and_return(snapshot_defs_for_rep)
+    end
+
+    let(:snapshot_defs_for_rep) do
+      [Nanoc::Int::SnapshotDef.new(:last)]
+    end
+
+    let(:snapshot_defs_for_other_rep) do
+      [Nanoc::Int::SnapshotDef.new(:last)]
+    end
+
+    context 'rep not in outdatedness store' do
+      it 'keeps the item rep out of the outdatedness store' do
+        expect(outdatedness_store.include?(rep)).not_to be
+        expect { subject }.not_to change { outdatedness_store.include?(rep) }
+      end
+    end
+
+    context 'rep in outdatedness store' do
+      before { outdatedness_store.add(rep) }
+
+      it 'compiles individual reps' do
+        expect { subject }.to change { snapshot_repo.get(rep, :last) }
+          .from(nil)
+          .to(some_textual_content('3'))
+      end
+
+      it 'removes the item rep from the outdatedness store' do
+        expect { subject }.to change { outdatedness_store.include?(rep) }.from(true).to(false)
+      end
+
+      context 'exception' do
+        let(:item) { Nanoc::Int::Item.new('<%= raise "lol" %>', {}, '/hi.md') }
+
+        it 'wraps exception' do
+          expect { subject }.to raise_error(Nanoc::Int::Errors::CompilationError)
+        end
+
+        it 'contains the right item rep in the wrapped exception' do
+          expect { subject }.to raise_error do |err|
+            expect(err.item_rep).to eql(rep)
+          end
+        end
+
+        it 'contains the right wrapped exception' do
+          expect { subject }.to raise_error do |err|
+            expect(err.unwrap).to be_a(RuntimeError)
+            expect(err.unwrap.message).to eq('lol')
+          end
+        end
+
+        it 'keeps the item rep in the outdatedness store' do
+          expect(outdatedness_store.include?(rep)).to be
+          expect { subject rescue nil }.not_to change { outdatedness_store.include?(rep) }
+        end
+      end
+    end
+  end
+end

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

@@ -147,7 +147,7 @@ describe Nanoc::Int::ItemRepSelector do
 
       example do
         expect(successfully_yielded).to eq [:b, :c, :d, :e, :a]
-        expect(tentatively_yielded).to eq [:a, :b, :c, :d, :e, :a]
+        expect(tentatively_yielded).to eq [:a, :b, :a, :c, :a, :d, :a, :e, :a]
       end
     end
 
@@ -165,5 +165,20 @@ describe Nanoc::Int::ItemRepSelector do
         expect(tentatively_yielded).to eq [:a, :b, :a, :c, :a, :d, :a, :e, :a]
       end
     end
+
+    context 'unrelated roots' do
+      let(:dependencies) do
+        {
+          a: [:d],
+          b: [:e],
+          c: [],
+        }
+      end
+
+      it 'picks prioritised roots' do
+        expect(successfully_yielded).to eq [:d, :a, :e, :b, :c]
+        expect(tentatively_yielded).to eq [:a, :d, :a, :b, :e, :b, :c]
+      end
+    end
   end
 end

data/spec/nanoc/cli/commands/compile/timing_recorder_spec.rb

@@ -27,7 +27,7 @@ describe Nanoc::CLI::Commands::Compile::TimingRecorder, stdio: true do
     Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :erb)
 
     expect { listener.stop }
-      .to output(/^erb \|     1  1\.00s  1\.00s  1\.00s   1\.00s$/).to_stdout
+      .to output(/^erb \|     1   1\.00s   1\.00s   1\.00s   1\.00s$/).to_stdout
   end
 
   it 'records multiple from filtering_started to filtering_ended' do
@@ -43,7 +43,7 @@ describe Nanoc::CLI::Commands::Compile::TimingRecorder, stdio: true do
     Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :erb)
 
     expect { listener.stop }
-      .to output(/^erb \|     2  1\.00s  1\.50s  2\.00s   3\.00s$/).to_stdout
+      .to output(/^erb \|     2   1\.00s   1\.50s   2\.00s   3\.00s$/).to_stdout
   end
 
   it 'records single from filtering_started over compilation_{suspended,started} to filtering_ended' do
@@ -61,6 +61,6 @@ describe Nanoc::CLI::Commands::Compile::TimingRecorder, stdio: true do
 
     # FIXME: wrong count (should be 1, not 2)
     expect { listener.stop }
-      .to output(/^erb \|     2  1\.00s  2\.50s  4\.00s   5\.00s$/).to_stdout
+      .to output(/^erb \|     2   1\.00s   2\.50s   4\.00s   5\.00s$/).to_stdout
   end
 end

data/spec/nanoc/data_sources/filesystem_spec.rb

@@ -47,20 +47,32 @@ describe Nanoc::DataSources::Filesystem do
           expect(subject[0].attributes).to eq(expected_attributes)
           expect(subject[0].identifier).to eq(Nanoc::Identifier.new('/bar/'))
           expect(subject[0].checksum_data).to be_nil
-          expect(subject[0].content_checksum_data).to eq('test 1')
+          expect(subject[0].attributes_checksum_data).to be_a(String)
+          expect(subject[0].attributes_checksum_data.size).to eq(20)
+          expect(subject[0].content_checksum_data).to be_a(String)
+          expect(subject[0].content_checksum_data.size).to eq(20)
         end
 
-        it 'has the right attributes checksum data' do
-          cs = YAML.load(subject[0].attributes_checksum_data)
+        context 'split files' do
+          let(:block) do
+            lambda do
+              FileUtils.mkdir_p('foo')
 
-          expect(cs[:attributes]).to eq("num: 1\n")
-          expect(cs[:extra_attributes]).to eq(
-            filename: 'foo/bar.html',
-            content_filename: 'foo/bar.html',
-            meta_filename: nil,
-            extension: 'html',
-            mtime: now,
-          )
+              File.write('foo/bar.html', 'test 1')
+              FileUtils.touch('foo/bar.html', mtime: now)
+
+              File.write('foo/bar.yaml', "---\nnum: 1\n")
+              FileUtils.touch('foo/bar.yaml', mtime: now)
+            end
+          end
+
+          it 'has a different attributes checksum' do
+            expect(block).to change { data_source.send(:load_objects, 'foo', klass)[0].attributes_checksum_data }
+          end
+
+          it 'has the same content checksum' do
+            expect(block).not_to change { data_source.send(:load_objects, 'foo', klass)[0].content_checksum_data }
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -176,6 +176,18 @@ files:
 - lib/nanoc/base/services/action_provider.rb
 - lib/nanoc/base/services/checksummer.rb
 - lib/nanoc/base/services/compiler.rb
+- lib/nanoc/base/services/compiler/phases.rb
+- lib/nanoc/base/services/compiler/phases/cache.rb
+- lib/nanoc/base/services/compiler/phases/mark_done.rb
+- lib/nanoc/base/services/compiler/phases/recalculate.rb
+- lib/nanoc/base/services/compiler/phases/resume.rb
+- lib/nanoc/base/services/compiler/phases/write.rb
+- lib/nanoc/base/services/compiler/stages.rb
+- lib/nanoc/base/services/compiler/stages/cleanup.rb
+- lib/nanoc/base/services/compiler/stages/compile_reps.rb
+- lib/nanoc/base/services/compiler/stages/determine_outdatedness.rb
+- lib/nanoc/base/services/compiler/stages/preprocess.rb
+- lib/nanoc/base/services/compiler/stages/prune.rb
 - lib/nanoc/base/services/compiler_loader.rb
 - lib/nanoc/base/services/dependency_tracker.rb
 - lib/nanoc/base/services/executor.rb
@@ -354,6 +366,7 @@ files:
 - spec/nanoc/base/repos/store_spec.rb
 - spec/nanoc/base/services/compiler/phases/cache_spec.rb
 - spec/nanoc/base/services/compiler/stages/cleanup_spec.rb
+- spec/nanoc/base/services/compiler/stages/compile_reps_spec.rb
 - spec/nanoc/base/services/dependency_tracker_spec.rb
 - spec/nanoc/base/services/executor_spec.rb
 - spec/nanoc/base/services/item_rep_router_spec.rb
@@ -568,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.