nanoc 4.7.12 → 4.7.13

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

@@ -12,3 +12,5 @@ require_relative 'outdatedness_rules/content_modified'
 require_relative 'outdatedness_rules/not_written'
 require_relative 'outdatedness_rules/rules_modified'
 require_relative 'outdatedness_rules/uses_always_outdated_filter'
+require_relative 'outdatedness_rules/item_collection_extended'
+require_relative 'outdatedness_rules/layout_collection_extended'

data/lib/nanoc/base/services/outdatedness_rules/item_collection_extended.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Nanoc::Int::OutdatednessRules
+  class ItemCollectionExtended < Nanoc::Int::OutdatednessRule
+    affects_props :raw_content
+
+    contract Nanoc::Int::ItemCollection, C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
+    def apply(_obj, outdatedness_checker)
+      new_items = outdatedness_checker.dependency_store.new_items
+
+      if new_items.any?
+        Nanoc::Int::OutdatednessReasons::ItemCollectionExtended.new(new_items)
+      end
+    end
+  end
+end

data/lib/nanoc/base/services/outdatedness_rules/layout_collection_extended.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Nanoc::Int::OutdatednessRules
+  class LayoutCollectionExtended < Nanoc::Int::OutdatednessRule
+    affects_props :raw_content
+
+    contract Nanoc::Int::LayoutCollection, C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
+    def apply(_obj, outdatedness_checker)
+      new_layouts = outdatedness_checker.dependency_store.new_layouts
+
+      if new_layouts.any?
+        Nanoc::Int::OutdatednessReasons::LayoutCollectionExtended.new(new_layouts)
+      end
+    end
+  end
+end

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

@@ -46,7 +46,19 @@ module Nanoc
     # @return [Boolean] true if the given file is excluded, false otherwise
     def filename_excluded?(filename)
       pathname = Pathname.new(filename)
-      @exclude.any? { |e| pathname.__nanoc_include_component?(e) }
+      @exclude.any? { |e| pathname_components(pathname).include?(e) }
+    end
+
+    def pathname_components(pathname)
+      components = []
+      tmp = pathname
+      loop do
+        old = tmp
+        components << File.basename(tmp)
+        tmp = File.dirname(tmp)
+        break if old == tmp
+      end
+      components.reverse
     end
 
     # @api private

data/lib/nanoc/base/views/identifiable_collection_view.rb

@@ -30,12 +30,14 @@ module Nanoc
     #
     # @return [self]
     def each
+      @context.dependency_tracker.bounce(unwrap, raw_content: true)
       @objects.each { |i| yield view_class.new(i, @context) }
       self
     end
 
     # @return [Integer]
     def size
+      @context.dependency_tracker.bounce(unwrap, raw_content: true)
       @objects.size
     end
 
@@ -45,6 +47,17 @@ module Nanoc
     #
     # @return [Enumerable]
     def find_all(arg)
+      prop_attribute =
+        case arg
+        when String, Nanoc::Identifier
+          [arg.to_s]
+        when Regexp
+          [arg]
+        else
+          true
+        end
+
+      @context.dependency_tracker.bounce(unwrap, raw_content: prop_attribute)
       @objects.find_all(arg).map { |i| view_class.new(i, @context) }
     end
 
@@ -71,6 +84,17 @@ module Nanoc
     #
     #   @return [#identifier] if an object was found
     def [](arg)
+      prop_attribute =
+        case arg
+        when String, Nanoc::Identifier
+          [arg.to_s]
+        when Regexp
+          [arg]
+        else
+          true
+        end
+
+      @context.dependency_tracker.bounce(unwrap, raw_content: prop_attribute)
       res = @objects[arg]
       res && view_class.new(res, @context)
     end

data/lib/nanoc/cli/commands/show-data.rb

@@ -99,6 +99,10 @@ module Nanoc::CLI::Commands
               'item'
             when Nanoc::Int::Configuration
               'config'
+            when Nanoc::Int::ItemCollection
+              'items'
+            when Nanoc::Int::LayoutCollection
+              'layouts'
             else
               raise Nanoc::Int::Errors::InternalInconsistency, "unexpected pred type #{pred}"
             end

data/lib/nanoc/spec.rb

@@ -17,8 +17,8 @@ module Nanoc
         @action_sequence = {}
         @config = Nanoc::Int::Configuration.new.with_defaults
         @reps = Nanoc::Int::ItemRepRepo.new
-        @items = Nanoc::Int::IdentifiableCollection.new(@config)
-        @layouts = Nanoc::Int::IdentifiableCollection.new(@config)
+        @items = Nanoc::Int::ItemCollection.new(@config)
+        @layouts = Nanoc::Int::LayoutCollection.new(@config)
         @dependency_tracker = Nanoc::Int::DependencyTracker.new(Object.new)
       end
 

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.7.12'
+  VERSION = '4.7.13'
 end

data/spec/nanoc/base/checksummer_spec.rb

@@ -301,7 +301,7 @@ describe Nanoc::Int::Checksummer do
     let(:config) { Nanoc::Int::Configuration.new(hash: { 'foo' => 'bar' }) }
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::ItemCollection.new(
         config,
         [
           Nanoc::Int::Item.new('foo', {}, '/foo.md'),
@@ -310,7 +310,7 @@ describe Nanoc::Int::Checksummer do
       )
     end
 
-    it { is_expected.to eql('Nanoc::ItemCollectionWithRepsView<Nanoc::Int::IdentifiableCollection<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<foo>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<bar>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,>>') }
+    it { is_expected.to eql('Nanoc::ItemCollectionWithRepsView<Nanoc::Int::ItemCollection<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<foo>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<bar>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,>>') }
   end
 
   context 'Nanoc::ItemCollectionWithoutRepsView' do
@@ -319,7 +319,7 @@ describe Nanoc::Int::Checksummer do
     let(:config) { Nanoc::Int::Configuration.new(hash: { 'foo' => 'bar' }) }
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::ItemCollection.new(
         config,
         [
           Nanoc::Int::Item.new('foo', {}, '/foo.md'),
@@ -328,7 +328,7 @@ describe Nanoc::Int::Checksummer do
       )
     end
 
-    it { is_expected.to eql('Nanoc::ItemCollectionWithoutRepsView<Nanoc::Int::IdentifiableCollection<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<foo>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<bar>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,>>') }
+    it { is_expected.to eql('Nanoc::ItemCollectionWithoutRepsView<Nanoc::Int::ItemCollection<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<foo>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<bar>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,>>') }
   end
 
   context 'Nanoc::RuleDSL::RuleContext' do

data/spec/nanoc/base/compiler_spec.rb

@@ -43,11 +43,11 @@ describe Nanoc::Int::Compiler do
   let(:code_snippets) { [] }
 
   let(:items) do
-    Nanoc::Int::IdentifiableCollection.new(config, [item, other_item])
+    Nanoc::Int::ItemCollection.new(config, [item, other_item])
   end
 
   let(:layouts) do
-    Nanoc::Int::IdentifiableCollection.new(config)
+    Nanoc::Int::LayoutCollection.new(config)
   end
 
   let(:memory) do

data/spec/nanoc/base/directed_graph_spec.rb

@@ -3,6 +3,48 @@
 describe Nanoc::Int::DirectedGraph do
   subject(:graph) { described_class.new([1, 2, 3]) }
 
+  describe '#inspect' do
+    subject { graph.inspect }
+
+    context 'empty graph' do
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph()') }
+    end
+
+    context 'one edge, no props' do
+      before do
+        graph.add_edge(1, 2)
+      end
+
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props=nil)') }
+    end
+
+    context 'two edges, no props' do
+      before do
+        graph.add_edge(1, 2)
+        graph.add_edge(2, 3)
+      end
+
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props=nil, 2 -> 3 props=nil)') }
+    end
+
+    context 'one edge, props' do
+      before do
+        graph.add_edge(1, 2, props: 'giraffe')
+      end
+
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props="giraffe")') }
+    end
+
+    context 'two edges, props' do
+      before do
+        graph.add_edge(1, 2, props: 'donkey')
+        graph.add_edge(2, 3, props: 'zebra')
+      end
+
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props="donkey", 2 -> 3 props="zebra")') }
+    end
+  end
+
   describe '#any_cycle' do
     subject { graph.any_cycle }
 

data/spec/nanoc/base/entities/identifiable_collection_spec.rb

@@ -1,133 +1,150 @@
 # frozen_string_literal: true
 
 describe Nanoc::Int::IdentifiableCollection do
-  subject(:identifiable_collection) { described_class.new(config, objects) }
+  shared_examples 'a generic identifiable collection' do
+    subject(:identifiable_collection) { described_class.new(config, objects) }
 
-  let(:config) { Nanoc::Int::Configuration.new }
-  let(:objects) { [] }
+    let(:config) { Nanoc::Int::Configuration.new }
+    let(:objects) { [] }
 
-  describe '#reject' do
-    subject { identifiable_collection.reject { |_| false } }
+    describe '#reject' do
+      subject { identifiable_collection.reject { |_| false } }
 
-    it { is_expected.to be_a(described_class) }
-  end
-
-  describe '#[]' do
-    let(:objects) do
-      [
-        Nanoc::Int::Item.new('asdf', {}, Nanoc::Identifier.new('/one')),
-        Nanoc::Int::Item.new('asdf', {}, Nanoc::Identifier.new('/two')),
-      ]
+      it { is_expected.to be_a(described_class) }
     end
 
-    context 'string pattern style is glob' do
-      let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+    describe '#[]' do
+      let(:objects) do
+        [
+          Nanoc::Int::Item.new('asdf', {}, Nanoc::Identifier.new('/one')),
+          Nanoc::Int::Item.new('asdf', {}, Nanoc::Identifier.new('/two')),
+        ]
+      end
+
+      context 'string pattern style is glob' do
+        let(:config) { Nanoc::Int::Configuration.new.with_defaults }
 
-      it 'handles glob' do
-        expect(identifiable_collection['/on*']).to equal(objects[0])
-        expect(identifiable_collection['/*wo']).to equal(objects[1])
+        it 'handles glob' do
+          expect(identifiable_collection['/on*']).to equal(objects[0])
+          expect(identifiable_collection['/*wo']).to equal(objects[1])
+        end
       end
-    end
 
-    context 'string pattern style is glob' do
-      let(:config) { Nanoc::Int::Configuration.new }
+      context 'string pattern style is glob' do
+        let(:config) { Nanoc::Int::Configuration.new }
 
-      it 'does not handle glob' do
-        expect(identifiable_collection['/on*']).to be_nil
-        expect(identifiable_collection['/*wo']).to be_nil
+        it 'does not handle glob' do
+          expect(identifiable_collection['/on*']).to be_nil
+          expect(identifiable_collection['/*wo']).to be_nil
+        end
       end
-    end
 
-    it 'handles identifier' do
-      expect(identifiable_collection['/one']).to equal(objects[0])
-      expect(identifiable_collection['/two']).to equal(objects[1])
-    end
+      it 'handles identifier' do
+        expect(identifiable_collection['/one']).to equal(objects[0])
+        expect(identifiable_collection['/two']).to equal(objects[1])
+      end
 
-    it 'handles malformed identifier' do
-      expect(identifiable_collection['one/']).to be_nil
-      expect(identifiable_collection['/one/']).to be_nil
-      expect(identifiable_collection['one']).to be_nil
-      expect(identifiable_collection['//one']).to be_nil
-      expect(identifiable_collection['/one//']).to be_nil
-    end
+      it 'handles malformed identifier' do
+        expect(identifiable_collection['one/']).to be_nil
+        expect(identifiable_collection['/one/']).to be_nil
+        expect(identifiable_collection['one']).to be_nil
+        expect(identifiable_collection['//one']).to be_nil
+        expect(identifiable_collection['/one//']).to be_nil
+      end
 
-    it 'handles regex' do
-      expect(identifiable_collection[/one/]).to equal(objects[0])
-      expect(identifiable_collection[/on/]).to equal(objects[0])
-      expect(identifiable_collection[/\/o/]).to equal(objects[0])
-      expect(identifiable_collection[/e$/]).to equal(objects[0])
-    end
+      it 'handles regex' do
+        expect(identifiable_collection[/one/]).to equal(objects[0])
+        expect(identifiable_collection[/on/]).to equal(objects[0])
+        expect(identifiable_collection[/\/o/]).to equal(objects[0])
+        expect(identifiable_collection[/e$/]).to equal(objects[0])
+      end
 
-    context 'frozen' do
-      before { identifiable_collection.freeze }
+      context 'frozen' do
+        before { identifiable_collection.freeze }
 
-      example do
-        expect(identifiable_collection['/one']).to equal(objects[0])
-        expect(identifiable_collection['/fifty']).to be_nil
+        example do
+          expect(identifiable_collection['/one']).to equal(objects[0])
+          expect(identifiable_collection['/fifty']).to be_nil
+        end
       end
     end
-  end
 
-  describe '#find_all' do
-    let(:objects) do
-      [
-        double(:identifiable, identifier: Nanoc::Identifier.new('/about.css')),
-        double(:identifiable, identifier: Nanoc::Identifier.new('/about.md')),
-        double(:identifiable, identifier: Nanoc::Identifier.new('/style.css')),
-      ]
-    end
+    describe '#find_all' do
+      let(:objects) do
+        [
+          double(:identifiable, identifier: Nanoc::Identifier.new('/about.css')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/about.md')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/style.css')),
+        ]
+      end
 
-    let(:arg) { raise 'override me' }
+      let(:arg) { raise 'override me' }
 
-    subject { identifiable_collection.find_all(arg) }
+      subject { identifiable_collection.find_all(arg) }
 
-    context 'with string' do
-      let(:arg) { '/*.css' }
+      context 'with string' do
+        let(:arg) { '/*.css' }
 
-      it 'contains objects' do
-        expect(subject.size).to eql(2)
-        expect(subject.find { |iv| iv.identifier == '/about.css' }).to eq(objects[0])
-        expect(subject.find { |iv| iv.identifier == '/style.css' }).to eq(objects[2])
+        it 'contains objects' do
+          expect(subject.size).to eql(2)
+          expect(subject.find { |iv| iv.identifier == '/about.css' }).to eq(objects[0])
+          expect(subject.find { |iv| iv.identifier == '/style.css' }).to eq(objects[2])
+        end
       end
-    end
 
-    context 'with regex' do
-      let(:arg) { %r{\.css\z} }
+      context 'with regex' do
+        let(:arg) { %r{\.css\z} }
 
-      it 'contains objects' do
-        expect(subject.size).to eql(2)
-        expect(subject.find { |iv| iv.identifier == '/about.css' }).to eq(objects[0])
-        expect(subject.find { |iv| iv.identifier == '/style.css' }).to eq(objects[2])
+        it 'contains objects' do
+          expect(subject.size).to eql(2)
+          expect(subject.find { |iv| iv.identifier == '/about.css' }).to eq(objects[0])
+          expect(subject.find { |iv| iv.identifier == '/style.css' }).to eq(objects[2])
+        end
       end
     end
-  end
 
-  describe '#object_with_identifier' do
-    let(:objects) do
-      [
-        Nanoc::Int::Item.new('stuff', {}, Nanoc::Identifier.new('/about.css')),
-        Nanoc::Int::Item.new('stuff', {}, Nanoc::Identifier.new('/about.md')),
-        Nanoc::Int::Item.new('stuff', {}, Nanoc::Identifier.new('/style.css')),
-      ]
-    end
+    describe '#object_with_identifier' do
+      let(:objects) do
+        [
+          Nanoc::Int::Item.new('stuff', {}, Nanoc::Identifier.new('/about.css')),
+          Nanoc::Int::Item.new('stuff', {}, Nanoc::Identifier.new('/about.md')),
+          Nanoc::Int::Item.new('stuff', {}, Nanoc::Identifier.new('/style.css')),
+        ]
+      end
 
-    let(:arg) { raise 'override me' }
+      let(:arg) { raise 'override me' }
 
-    subject { identifiable_collection.object_with_identifier(arg) }
+      subject { identifiable_collection.object_with_identifier(arg) }
 
-    context 'with string' do
-      let(:arg) { '/about.css' }
-      it { is_expected.to eq(objects[0]) }
-    end
+      context 'with string' do
+        let(:arg) { '/about.css' }
+        it { is_expected.to eq(objects[0]) }
+      end
 
-    context 'with identifier' do
-      let(:arg) { Nanoc::Identifier.new('/about.css') }
-      it { is_expected.to eq(objects[0]) }
+      context 'with identifier' do
+        let(:arg) { Nanoc::Identifier.new('/about.css') }
+        it { is_expected.to eq(objects[0]) }
+      end
+
+      context 'with glob string' do
+        let(:arg) { '/about.*' }
+        it { is_expected.to be_nil }
+      end
     end
 
-    context 'with glob string' do
-      let(:arg) { '/about.*' }
-      it { is_expected.to be_nil }
+    describe '#reference' do
+      subject { identifiable_collection.reference }
+      it { is_expected.to eql(expected_reference) }
     end
   end
+
+  describe Nanoc::Int::ItemCollection do
+    let(:expected_reference) { :items }
+    it_behaves_like 'a generic identifiable collection'
+  end
+
+  describe Nanoc::Int::LayoutCollection do
+    let(:expected_reference) { :layouts }
+    it_behaves_like 'a generic identifiable collection'
+  end
 end