nanoc 4.4.6 → 4.4.7

data/lib/nanoc/base/services/compiler_loader.rb

@@ -16,6 +16,9 @@ module Nanoc::Int
 
       action_provider ||= Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
 
+      outdatedness_store =
+        Nanoc::Int::OutdatednessStore.new(site: site, reps: item_rep_repo)
+
       outdatedness_checker =
         Nanoc::Int::OutdatednessChecker.new(
           site: site,
@@ -40,6 +43,7 @@ module Nanoc::Int
         outdatedness_checker: outdatedness_checker,
         reps: item_rep_repo,
         action_provider: action_provider,
+        outdatedness_store: outdatedness_store,
       }
 
       Nanoc::Int::Compiler.new(site, params)

data/lib/nanoc/base/services/outdatedness_checker.rb

@@ -82,12 +82,8 @@ module Nanoc::Int
 
     Reasons = Nanoc::Int::OutdatednessReasons
 
-    # @param [Nanoc::Int::Site] site
-    # @param [Nanoc::Int::ChecksumStore] checksum_store
-    # @param [Nanoc::Int::DependencyStore] dependency_store
-    # @param [Nanoc::Int::RuleMemoryStore] rule_memory_store
-    # @param [Nanoc::Int::ActionProvider] action_provider
-    # @param [Nanoc::Int::ItemRepRepo] reps
+    # FIXME: Replace C::Any with proper types
+    contract C::KeywordArgs[site: Nanoc::Int::Site, checksum_store: Nanoc::Int::ChecksumStore, dependency_store: Nanoc::Int::DependencyStore, rule_memory_store: Nanoc::Int::RuleMemoryStore, action_provider: C::Any, reps: Nanoc::Int::ItemRepRepo] => C::Any
     def initialize(site:, checksum_store:, dependency_store:, rule_memory_store:, action_provider:, reps:)
       @site = site
       @checksum_store = checksum_store

data/lib/nanoc/checking/checks/external_links.rb

@@ -12,8 +12,6 @@ module ::Nanoc::Checking::Checks
     identifiers :external_links, :elinks
 
     def run
-      require 'parallel'
-
       # Find all broken external hrefs
       # TODO: de-duplicate this (duplicated in internal links check)
       filenames = output_filenames.select { |f| File.extname(f) == '.html' && !excluded_file?(f) }

data/lib/nanoc/data_sources/filesystem.rb

@@ -163,7 +163,7 @@ module Nanoc::DataSources
             attributes,
             identifier,
             content_checksum_data: proto_doc.content_checksum_data,
-            attributes_checksum_data: proto_doc.attributes_checksum_data,
+            attributes_checksum_data: attributes_checksum_data_for(proto_doc, content_filename, meta_filename),
           )
         end
       end
@@ -171,16 +171,25 @@ module Nanoc::DataSources
       res
     end
 
-    def attributes_for(proto_doc, content_filename, meta_filename)
-      extra_attributes = {
+    def attributes_checksum_data_for(proto_doc, content_filename, meta_filename)
+      YAML.dump(
+        attributes: proto_doc.attributes_checksum_data,
+        extra_attributes: extra_attributes_for(content_filename, meta_filename),
+      )
+    end
+
+    def extra_attributes_for(content_filename, meta_filename)
+      {
         filename: content_filename,
         content_filename: content_filename,
         meta_filename: meta_filename,
         extension: content_filename ? ext_of(content_filename)[1..-1] : nil,
         mtime: mtime_of(content_filename, meta_filename),
       }
+    end
 
-      extra_attributes.merge(proto_doc.attributes)
+    def attributes_for(proto_doc, content_filename, meta_filename)
+      extra_attributes_for(content_filename, meta_filename).merge(proto_doc.attributes)
     end
 
     def identifier_for(content_filename, meta_filename, dir_name)

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.4.6'.freeze
+  VERSION = '4.4.7'.freeze
 end

data/spec/nanoc/base/compiler_spec.rb

@@ -9,16 +9,18 @@ describe Nanoc::Int::Compiler do
       dependency_store: dependency_store,
       outdatedness_checker: outdatedness_checker,
       reps: reps,
+      outdatedness_store: outdatedness_store,
     )
   end
 
-  let(:checksum_store)         { :__irrelevant_checksum_store }
-  let(:rule_memory_store)      { :__irrelevant_rule_memory_store }
+  let(:checksum_store)    { Nanoc::Int::ChecksumStore.new(objects: items) }
+  let(:rule_memory_store) { Nanoc::Int::RuleMemoryStore.new }
 
   let(:dependency_store) { Nanoc::Int::DependencyStore.new(items.to_a) }
   let(:reps) { Nanoc::Int::ItemRepRepo.new }
 
   let(:outdatedness_checker) { double(:outdatedness_checker) }
+  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }
   let(:action_provider) { double(:action_provider) }
 
   let(:compiled_content_cache) { Nanoc::Int::CompiledContentCache.new(items: items) }
@@ -50,10 +52,13 @@ describe Nanoc::Int::Compiler do
   end
 
   let(:memory) do
-    [
-      Nanoc::Int::ProcessingActions::Filter.new(:erb, {}),
-      Nanoc::Int::ProcessingActions::Snapshot.new(:last, nil),
-    ]
+    actions =
+      [
+        Nanoc::Int::ProcessingActions::Filter.new(:erb, {}),
+        Nanoc::Int::ProcessingActions::Snapshot.new(:last, nil),
+      ]
+
+    Nanoc::Int::RuleMemory.new(nil, actions: actions)
   end
 
   before do
@@ -72,7 +77,10 @@ describe Nanoc::Int::Compiler do
   end
 
   describe '#compile_reps' do
-    subject { compiler.send(:compile_reps) }
+    subject do
+      compiler.send(:determine_outdatedness)
+      compiler.send(:compile_reps)
+    end
 
     before do
       allow(action_provider).to receive(:snapshots_defs_for).with(rep).and_return(snapshot_defs_for_rep)
@@ -93,6 +101,21 @@ describe Nanoc::Int::Compiler do
         .to('3')
     end
 
+    it 'removes the item rep from the outdatedness store' do
+      expect(compiler.outdatedness_store.include?(rep)).not_to be
+      expect { subject }.not_to change { compiler.outdatedness_store.include?(rep) }
+    end
+
+    context 'rep in outdatedness store' do
+      before do
+        compiler.outdatedness_store.add(rep)
+      end
+
+      it 'removes the item rep from the outdatedness store' do
+        expect { subject }.to change { compiler.outdatedness_store.include?(rep) }.from(true).to(false)
+      end
+    end
+
     context 'exception' do
       let(:item) { Nanoc::Int::Item.new('<%= raise "lol" %>', {}, '/hi.md') }
 
@@ -112,11 +135,28 @@ describe Nanoc::Int::Compiler do
           expect(err.unwrap.message).to eq('lol')
         end
       end
+
+      it 'adds the item rep to the outdatedness store' do
+        expect { subject rescue nil }.to change { compiler.outdatedness_store.include?(rep) }.from(false).to(true)
+      end
+
+      context 'rep in outdatedness store' do
+        before do
+          compiler.outdatedness_store.add(rep)
+        end
+
+        it 'keeps the item rep in the outdatedness store' do
+          expect(compiler.outdatedness_store.include?(rep)).to be
+          expect { subject rescue nil }.not_to change { compiler.outdatedness_store.include?(rep) }
+        end
+      end
     end
   end
 
   describe '#compile_rep' do
-    subject { compiler.send(:compile_rep, rep, is_outdated: is_outdated) }
+    let(:stage) { compiler.send(:compile_reps_stage) }
+
+    subject { stage.send(:compile_rep, rep, is_outdated: is_outdated) }
 
     let(:is_outdated) { true }
 
@@ -145,10 +185,10 @@ describe Nanoc::Int::Compiler do
       it 'generates expected output' do
         expect(rep.snapshot_contents[:last].string).to eql(item.content.string)
 
-        expect { compiler.send(:compile_rep, rep, is_outdated: true) }
+        expect { stage.send(:compile_rep, rep, is_outdated: true) }
           .to raise_error(Nanoc::Int::Errors::UnmetDependency)
-        compiler.send(:compile_rep, other_rep, is_outdated: true)
-        compiler.send(:compile_rep, rep, is_outdated: true)
+        stage.send(:compile_rep, other_rep, is_outdated: true)
+        stage.send(:compile_rep, rep, is_outdated: true)
 
         expect(rep.snapshot_contents[:last].string).to eql('other=other content')
       end
@@ -171,10 +211,10 @@ describe Nanoc::Int::Compiler do
         expect(Nanoc::Int::NotificationCenter).to receive(:post).with(:filtering_ended, rep, :erb).ordered
         expect(Nanoc::Int::NotificationCenter).to receive(:post).with(:compilation_ended, rep).ordered
 
-        expect { compiler.send(:compile_rep, rep, is_outdated: true) }
+        expect { stage.send(:compile_rep, rep, is_outdated: true) }
           .to raise_error(Nanoc::Int::Errors::UnmetDependency)
-        compiler.send(:compile_rep, other_rep, is_outdated: true)
-        compiler.send(:compile_rep, rep, is_outdated: true)
+        stage.send(:compile_rep, other_rep, is_outdated: true)
+        stage.send(:compile_rep, rep, is_outdated: true)
       end
     end
   end

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

@@ -0,0 +1,100 @@
+describe Nanoc::Int::OutdatednessStore do
+  subject(:store) { described_class.new(site: site, reps: reps) }
+
+  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) }
+
+  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(:items) { [] }
+  let(:layouts) { [] }
+  let(:code_snippets) { [] }
+
+  describe '#include?, #add and #remove' do
+    subject { store.include?(rep) }
+
+    context 'nothing added' do
+      it { is_expected.not_to be }
+    end
+
+    context 'rep added' do
+      before { store.add(rep) }
+      it { is_expected.to be }
+    end
+
+    context 'rep added and removed' do
+      before do
+        store.add(rep)
+        store.remove(rep)
+      end
+
+      it { is_expected.not_to be }
+    end
+
+    context 'rep added, removed, and added again' do
+      before do
+        store.add(rep)
+        store.remove(rep)
+        store.add(rep)
+      end
+
+      it { is_expected.to be }
+    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
+      store.load
+      store.include?(rep)
+    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
+    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
+    end
+  end
+end

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

@@ -10,9 +10,22 @@ describe Nanoc::Int::OutdatednessChecker do
     )
   end
 
-  let(:site) { double(:site) }
   let(:checksum_store) { double(:checksum_store) }
-  let(:dependency_store) { double(:dependency_store) }
+
+  let(:dependency_store) do
+    Nanoc::Int::DependencyStore.new(objects)
+  end
+
+  let(:objects) { [item] }
+
+  let(:site) do
+    Nanoc::Int::Site.new(
+      config: config,
+      items: [],
+      layouts: [],
+      code_snippets: [],
+    )
+  end
 
   let(:rule_memory_store) do
     Nanoc::Int::RuleMemoryStore.new
@@ -102,10 +115,6 @@ describe Nanoc::Int::OutdatednessChecker do
   describe '#outdated_due_to_dependencies?' do
     subject { outdatedness_checker.send(:outdated_due_to_dependencies?, item) }
 
-    let(:dependency_store) do
-      Nanoc::Int::DependencyStore.new(objects)
-    end
-
     let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: objects) }
 
     let(:other_item) { Nanoc::Int::Item.new('other stuff', {}, '/other.md') }

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

@@ -18,11 +18,19 @@ describe Nanoc::Int::OutdatednessRules do
     let(:item_rep) { Nanoc::Int::ItemRep.new(item, :default) }
     let(:item) { Nanoc::Int::Item.new('stuff', {}, '/foo.md') }
 
-    let(:site) { double(:site) }
     let(:config) { Nanoc::Int::Configuration.new }
     let(:code_snippets) { [] }
     let(:objects) { [config] + code_snippets + [item] }
 
+    let(:site) do
+      Nanoc::Int::Site.new(
+        config: config,
+        items: [],
+        layouts: [],
+        code_snippets: code_snippets,
+      )
+    end
+
     let(:action_provider) { double(:action_provider) }
     let(:reps) { Nanoc::Int::ItemRepRepo.new }
     let(:dependency_store) { Nanoc::Int::DependencyStore.new(dependency_store_objects) }
@@ -67,15 +75,15 @@ describe Nanoc::Int::OutdatednessRules do
     context 'ConfigurationModified' do
       let(:rule_class) { Nanoc::Int::OutdatednessRules::ConfigurationModified }
 
-      context 'only non-outdated snippets' do
-        let(:config) { Nanoc::Int::CodeSnippet.new('asdf', 'lib/foo.md') }
+      context 'non-outdated' do
+        let(:config) { Nanoc::Int::Configuration.new }
 
         before { checksum_store.add(config) }
 
         it { is_expected.not_to be }
       end
 
-      context 'only non-outdated snippets' do
+      context 'outdated' do
         let(:config) { Nanoc::Int::Configuration.new }
         let(:config_old) { Nanoc::Int::Configuration.new(hash: { foo: 125 }) }
 

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

@@ -1,3 +1,5 @@
+require 'net/http'
+
 describe Nanoc::CLI::Commands::View, site: true, stdio: true do
   describe '#run' do
     def run_nanoc_cmd(cmd)

data/spec/nanoc/data_sources/filesystem_spec.rb

@@ -48,7 +48,19 @@ describe Nanoc::DataSources::Filesystem do
           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 eq("num: 1\n")
+        end
+
+        it 'has the right attributes checksum data' do
+          cs = YAML.load(subject[0].attributes_checksum_data)
+
+          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,
+          )
         end
       end
     end

data/spec/nanoc/extra/parallel_collection_spec.rb

@@ -13,7 +13,7 @@ describe Nanoc::Extra::ParallelCollection do
     let!(:out) { [] }
 
     it 'is fast' do
-      expect { subject }.to finish_in_under(0.2).seconds
+      expect { subject }.to finish_in_under(0.25).seconds
     end
 
     it 'is correct' do
@@ -66,7 +66,7 @@ describe Nanoc::Extra::ParallelCollection do
     end
 
     it 'is fast' do
-      expect { subject }.to finish_in_under(0.2).seconds
+      expect { subject }.to finish_in_under(0.25).seconds
     end
 
     it 'does not leave threads lingering' do

data/spec/nanoc/integration/outdatedness_integration_spec.rb

@@ -1,9 +1,14 @@
 describe 'Outdatedness integration', site: true, stdio: true do
   context 'only attribute dependency' do
+    let(:time) { Time.now }
+
     before do
       File.write('content/foo.md', "---\ntitle: hello\n---\n\nfoo")
       File.write('content/bar.md', '<%= @items["/foo.*"][:title] %>')
 
+      FileUtils.touch('content/foo.md', mtime: time)
+      FileUtils.touch('content/bar.md', mtime: time)
+
       File.write('Rules', <<EOS)
 compile '/foo.*' do
   write '/foo.html'
@@ -29,6 +34,7 @@ EOS
 
     it 'shows file as outdated after modification' do
       File.write('content/bar.md', 'JUST BAR!')
+      FileUtils.touch('content/bar.md', mtime: time)
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
         output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout,
@@ -40,6 +46,7 @@ EOS
 
     it 'shows file and dependencies as not outdated after content modification' do
       File.write('content/foo.md', "---\ntitle: hello\n---\n\nfoooOoooOOoooOooo")
+      FileUtils.touch('content/foo.md', mtime: time)
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
         output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
@@ -51,6 +58,7 @@ EOS
 
     it 'shows file and dependencies as outdated after title modification' do
       File.write('content/foo.md', "---\ntitle: bye\n---\n\nfoo")
+      FileUtils.touch('content/foo.md', mtime: time)
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
         output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,