nanoc 4.7.12 → 4.7.13

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

@@ -31,7 +31,41 @@ describe Nanoc::Int::Props do
   end
 
   describe '#raw_content?' do
-    # …
+    subject { props.raw_content? }
+
+    context 'nothing active' do
+      it { is_expected.not_to be }
+    end
+
+    context 'raw_content active' do
+      let(:props) { described_class.new(raw_content: true) }
+      it { is_expected.to be }
+    end
+
+    context 'raw_content and compiled_content active' do
+      let(:props) { described_class.new(raw_content: true, compiled_content: true) }
+      it { is_expected.to be }
+    end
+
+    context 'compiled_content active' do
+      let(:props) { described_class.new(compiled_content: true) }
+      it { is_expected.not_to be }
+    end
+
+    context 'all active' do
+      let(:props) { described_class.new(raw_content: true, attributes: true, compiled_content: true, path: true) }
+      it { is_expected.to be }
+    end
+
+    context 'raw_content is empty list' do
+      let(:props) { described_class.new(raw_content: []) }
+      it { is_expected.not_to be }
+    end
+
+    context 'raw_content is non-empty list' do
+      let(:props) { described_class.new(raw_content: ['/asdf.*']) }
+      it { is_expected.to be }
+    end
   end
 
   describe '#attributes?' do
@@ -233,6 +267,92 @@ describe Nanoc::Int::Props do
     end
   end
 
+  describe '#merge_raw_content' do
+    let(:props_raw_content_true) do
+      described_class.new(raw_content: true)
+    end
+
+    let(:props_raw_content_false) do
+      described_class.new(raw_content: false)
+    end
+
+    let(:props_raw_content_list_a) do
+      described_class.new(raw_content: %w[donkey giraffe])
+    end
+
+    let(:props_raw_content_list_b) do
+      described_class.new(raw_content: %w[giraffe zebra])
+    end
+
+    subject { props.merge(other_props).raw_content }
+
+    context 'false + false' do
+      let(:props) { props_raw_content_false }
+      let(:other_props) { props_raw_content_false }
+
+      it { is_expected.to be(false) }
+    end
+
+    context 'false + true' do
+      let(:props) { props_raw_content_false }
+      let(:other_props) { props_raw_content_true }
+
+      it { is_expected.to be(true) }
+    end
+
+    context 'false + list' do
+      let(:props) { props_raw_content_false }
+      let(:other_props) { props_raw_content_list_a }
+
+      it { is_expected.to be_a(Set) }
+      it { is_expected.to match_array(%w[donkey giraffe]) }
+    end
+
+    context 'true + false' do
+      let(:props) { props_raw_content_true }
+      let(:other_props) { props_raw_content_false }
+
+      it { is_expected.to be(true) }
+    end
+
+    context 'true + true' do
+      let(:props) { props_raw_content_true }
+      let(:other_props) { props_raw_content_true }
+
+      it { is_expected.to be(true) }
+    end
+
+    context 'true + list' do
+      let(:props) { props_raw_content_true }
+      let(:other_props) { props_raw_content_list_a }
+
+      it { is_expected.to be(true) }
+    end
+
+    context 'list + false' do
+      let(:props) { props_raw_content_list_a }
+      let(:other_props) { props_raw_content_false }
+
+      it { is_expected.to be_a(Set) }
+      it { is_expected.to match_array(%w[donkey giraffe]) }
+    end
+
+    context 'list + true' do
+      let(:props) { props_raw_content_list_a }
+      let(:other_props) { props_raw_content_true }
+
+      it { is_expected.to be(true) }
+    end
+
+    context 'list + list' do
+      let(:props) { props_raw_content_list_a }
+      let(:other_props) { props_raw_content_list_b }
+
+      it { is_expected.to be_a(Set) }
+      it { is_expected.to match_array(%w[donkey giraffe zebra]) }
+    end
+  end
+
   describe '#active' do
     subject { props.active }
 

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

@@ -22,7 +22,7 @@ describe Nanoc::Int::Site do
     end
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::ItemCollection.new(
         config,
         [
           Nanoc::Int::Item.new('foo', {}, '/foo.md'),
@@ -32,7 +32,7 @@ describe Nanoc::Int::Site do
     end
 
     let(:layouts) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::LayoutCollection.new(
         config,
         [
           Nanoc::Int::Layout.new('foo', {}, '/foo.md'),

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

@@ -10,8 +10,8 @@ describe Nanoc::Int::DependencyStore do
   let(:layout_a) { Nanoc::Int::Layout.new('la', {}, '/la.md') }
   let(:layout_b) { Nanoc::Int::Layout.new('lb', {}, '/lb.md') }
 
-  let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item_a, item_b, item_c]) }
-  let(:layouts) { Nanoc::Int::IdentifiableCollection.new(config, [layout_a, layout_b]) }
+  let(:items) { Nanoc::Int::ItemCollection.new(config, [item_a, item_b, item_c]) }
+  let(:layouts) { Nanoc::Int::LayoutCollection.new(config, [layout_a, layout_b]) }
   let(:config) { Nanoc::Int::Configuration.new }
 
   describe '#dependencies_causing_outdatedness_of' do
@@ -91,6 +91,25 @@ describe Nanoc::Int::DependencyStore do
         end
       end
 
+      context 'dependency on items, generic prop' do
+        before do
+          store.record_dependency(item_a, items)
+        end
+
+        it 'creates one dependency' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps.size).to eql(1)
+        end
+
+        it 'returns true for all props' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps[0].props.raw_content?).to be
+          expect(deps[0].props.compiled_content?).to be
+          expect(deps[0].props.path?).to be
+          expect(deps[0].props.attributes?).to be
+        end
+      end
+
       context 'no props' do
         before do
           store.record_dependency(item_a, item_b)
@@ -222,41 +241,16 @@ describe Nanoc::Int::DependencyStore do
 
     context 'one new item' do
       let(:items_after) do
-        Nanoc::Int::IdentifiableCollection.new(config, [item_a, item_b, item_c, item_d])
+        Nanoc::Int::ItemCollection.new(config, [item_a, item_b, item_c, item_d])
       end
 
       let(:item_d) { Nanoc::Int::Item.new('d', {}, '/d.md') }
 
-      it 'marks existing items as outdated' do
-        expect(store.objects_causing_outdatedness_of(item_a)).to eq([item_d])
-        expect(store.objects_causing_outdatedness_of(item_b)).to eq([item_d])
-        expect(store.objects_causing_outdatedness_of(item_c)).to eq([item_d])
-      end
-
-      it 'marks new items as outdated' do
-        expect(store.objects_causing_outdatedness_of(item_d)).to eq([item_d])
-      end
-    end
-
-    context 'two new items' do
-      let(:items_after) do
-        Nanoc::Int::IdentifiableCollection.new(config, [item_a, item_b, item_c, item_d, item_e])
-      end
-
-      let(:item_d) { Nanoc::Int::Item.new('d', {}, '/d.md') }
-      let(:item_e) { Nanoc::Int::Item.new('e', {}, '/e.md') }
-
-      it 'marks existing items as outdated' do
-        # Only one of obj D or E needed!
-        expect(store.objects_causing_outdatedness_of(item_a)).to eq([item_d]).or eq([item_e])
-        expect(store.objects_causing_outdatedness_of(item_b)).to eq([item_d]).or eq([item_e])
-        expect(store.objects_causing_outdatedness_of(item_c)).to eq([item_d]).or eq([item_e])
-      end
-
-      it 'marks new items as outdated' do
-        # Only one of obj D or E needed!
-        expect(store.objects_causing_outdatedness_of(item_d)).to eq([item_d]).or eq([item_e])
-        expect(store.objects_causing_outdatedness_of(item_e)).to eq([item_d]).or eq([item_e])
+      it 'does not mark items as outdated' do
+        expect(store.objects_causing_outdatedness_of(item_a)).not_to include(item_d)
+        expect(store.objects_causing_outdatedness_of(item_b)).not_to include(item_d)
+        expect(store.objects_causing_outdatedness_of(item_c)).not_to include(item_d)
+        expect(store.objects_causing_outdatedness_of(item_d)).not_to include(item_d)
       end
     end
   end
@@ -307,7 +301,7 @@ describe Nanoc::Int::DependencyStore do
 
       it 'ignores all other objects' do
         subject
-        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+        expect(other_items).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
       end
     end
 
@@ -331,7 +325,7 @@ describe Nanoc::Int::DependencyStore do
 
       it 'ignores all other objects' do
         subject
-        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+        expect(other_items).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
       end
     end
 
@@ -356,7 +350,7 @@ describe Nanoc::Int::DependencyStore do
 
       it 'ignores all other objects' do
         subject
-        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+        expect(other_items).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
       end
     end
 
@@ -381,7 +375,7 @@ describe Nanoc::Int::DependencyStore do
 
       it 'ignores all other objects' do
         subject
-        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+        expect(other_items).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
       end
     end
   end
@@ -390,7 +384,7 @@ describe Nanoc::Int::DependencyStore do
     context 'item on item' do
       let(:source_obj) { item_a }
       let(:target_obj) { item_b }
-      let(:other_objs) { [config, item_c, layout_a, layout_b] }
+      let(:other_items) { [item_c] }
 
       include_examples 'records dependencies'
     end
@@ -398,7 +392,7 @@ describe Nanoc::Int::DependencyStore do
     context 'item on layout' do
       let(:source_obj) { item_a }
       let(:target_obj) { layout_a }
-      let(:other_objs) { [config, item_b, item_c, layout_b] }
+      let(:other_items) { [item_b, item_c] }
 
       include_examples 'records dependencies'
     end
@@ -406,7 +400,7 @@ describe Nanoc::Int::DependencyStore do
     context 'item on config' do
       let(:source_obj) { item_a }
       let(:target_obj) { config }
-      let(:other_objs) { [item_b, item_c, layout_a, layout_b] }
+      let(:other_items) { [item_b, item_c] }
 
       include_examples 'records dependencies'
     end

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

@@ -14,11 +14,11 @@ describe Nanoc::Int::Compiler::Stages::CalculateChecksums do
   end
 
   let(:items) do
-    Nanoc::Int::IdentifiableCollection.new(config, [item])
+    Nanoc::Int::ItemCollection.new(config, [item])
   end
 
   let(:layouts) do
-    Nanoc::Int::IdentifiableCollection.new(config, [layout])
+    Nanoc::Int::LayoutCollection.new(config, [layout])
   end
 
   let(:code_snippet) do

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

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

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

@@ -3,15 +3,14 @@
 describe Nanoc::Int::DependencyTracker do
   let(:tracker) { described_class.new(store) }
 
-  let(:store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
+  let(:store) { Nanoc::Int::DependencyStore.new(empty_items, empty_layouts, config) }
 
   let(:item_a) { Nanoc::Int::Item.new('a', {}, '/a.md') }
   let(:item_b) { Nanoc::Int::Item.new('b', {}, '/b.md') }
   let(:item_c) { Nanoc::Int::Item.new('c', {}, '/c.md') }
 
-  let(:empty_identifiable_collection) do
-    Nanoc::Int::IdentifiableCollection.new(config)
-  end
+  let(:empty_items) { Nanoc::Int::ItemCollection.new(config) }
+  let(:empty_layouts) { Nanoc::Int::LayoutCollection.new(config) }
 
   let(:config) { Nanoc::Int::Configuration.new.with_defaults }
 

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

@@ -28,8 +28,8 @@ describe Nanoc::Int::OutdatednessChecker do
     Nanoc::Int::DependencyStore.new(items, layouts, config)
   end
 
-  let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item]) }
-  let(:layouts) { Nanoc::Int::IdentifiableCollection.new(config) }
+  let(:items) { Nanoc::Int::ItemCollection.new(config, [item]) }
+  let(:layouts) { Nanoc::Int::LayoutCollection.new(config) }
 
   let(:code_snippets) { [] }
 
@@ -122,6 +122,56 @@ describe Nanoc::Int::OutdatednessChecker do
     context 'with layout' do
       # …
     end
+
+    context 'with item collection' do
+      let(:obj) { items }
+
+      context 'no new items' do
+        it { is_expected.to be_nil }
+      end
+
+      context 'new items' do
+        before do
+          dependency_store.store
+
+          new_item = Nanoc::Int::Item.new('stuff', {}, '/newblahz.md')
+          dependency_store.items = Nanoc::Int::ItemCollection.new(config, [item, new_item])
+
+          dependency_store.load
+        end
+
+        it { is_expected.to be_a(Nanoc::Int::OutdatednessReasons::ItemCollectionExtended) }
+
+        it 'includes proper raw_content props' do
+          expect(subject.objects.map(&:identifier).map(&:to_s)).to eq(['/newblahz.md'])
+        end
+      end
+    end
+
+    context 'with layout collection' do
+      let(:obj) { layouts }
+
+      context 'no new layouts' do
+        it { is_expected.to be_nil }
+      end
+
+      context 'new layouts' do
+        before do
+          dependency_store.store
+
+          new_layout = Nanoc::Int::Layout.new('stuff', {}, '/newblahz.md')
+          dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, layouts.to_a + [new_layout])
+
+          dependency_store.load
+        end
+
+        it { is_expected.to be_a(Nanoc::Int::OutdatednessReasons::LayoutCollectionExtended) }
+
+        it 'includes proper raw_content props' do
+          expect(subject.objects.map(&:identifier).map(&:to_s)).to eq(['/newblahz.md'])
+        end
+      end
+    end
   end
 
   describe '#outdated_due_to_dependencies?' do
@@ -134,7 +184,7 @@ describe Nanoc::Int::OutdatednessChecker do
 
     let(:config) { Nanoc::Int::Configuration.new }
 
-    let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item, other_item]) }
+    let(:items) { Nanoc::Int::ItemCollection.new(config, [item, other_item]) }
 
     let(:old_action_sequence_for_other_item_rep) do
       Nanoc::Int::ActionSequence.build(other_item_rep) do |b|
@@ -167,7 +217,7 @@ describe Nanoc::Int::OutdatednessChecker do
       let(:distant_item_rep) { Nanoc::Int::ItemRep.new(distant_item, :default) }
 
       let(:items) do
-        Nanoc::Int::IdentifiableCollection.new(config, [item, other_item, distant_item])
+        Nanoc::Int::ItemCollection.new(config, [item, other_item, distant_item])
       end
 
       let(:action_sequences) do
@@ -488,5 +538,241 @@ describe Nanoc::Int::OutdatednessChecker do
         it { is_expected.not_to be }
       end
     end
+
+    context 'only item collection dependency' do
+      context 'dependency on any new item' do
+        before do
+          dependency_tracker = Nanoc::Int::DependencyTracker.new(dependency_store)
+          dependency_tracker.enter(item)
+          dependency_tracker.bounce(items, raw_content: true)
+          dependency_store.store
+        end
+
+        context 'nothing changed' do
+          it { is_expected.not_to be }
+        end
+
+        context 'item added' do
+          before do
+            new_item = Nanoc::Int::Item.new('stuff', {}, '/newblahz.md')
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, items.to_a + [new_item])
+            dependency_store.load
+          end
+
+          it { is_expected.to be }
+        end
+
+        context 'item removed' do
+          before do
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, [])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+      end
+
+      context 'dependency on specific new items (string)' do
+        before do
+          dependency_tracker = Nanoc::Int::DependencyTracker.new(dependency_store)
+          dependency_tracker.enter(item)
+          dependency_tracker.bounce(items, raw_content: ['/new*'])
+          dependency_store.store
+        end
+
+        context 'nothing changed' do
+          it { is_expected.not_to be }
+        end
+
+        context 'matching item added' do
+          before do
+            new_item = Nanoc::Int::Item.new('stuff', {}, '/newblahz.md')
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, items.to_a + [new_item])
+            dependency_store.load
+          end
+
+          it { is_expected.to be }
+        end
+
+        context 'non-matching item added' do
+          before do
+            new_item = Nanoc::Int::Item.new('stuff', {}, '/nublahz.md')
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, items.to_a + [new_item])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+
+        context 'item removed' do
+          before do
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, [])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+      end
+
+      context 'dependency on specific new items (regex)' do
+        before do
+          dependency_tracker = Nanoc::Int::DependencyTracker.new(dependency_store)
+          dependency_tracker.enter(item)
+          dependency_tracker.bounce(items, raw_content: [%r{^/new.*}])
+          dependency_store.store
+        end
+
+        context 'nothing changed' do
+          it { is_expected.not_to be }
+        end
+
+        context 'matching item added' do
+          before do
+            new_item = Nanoc::Int::Item.new('stuff', {}, '/newblahz.md')
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, items.to_a + [new_item])
+            dependency_store.load
+          end
+
+          it { is_expected.to be }
+        end
+
+        context 'non-matching item added' do
+          before do
+            new_item = Nanoc::Int::Item.new('stuff', {}, '/nublahz.md')
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, items.to_a + [new_item])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+
+        context 'item removed' do
+          before do
+            dependency_store.items = Nanoc::Int::ItemCollection.new(config, [])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+      end
+    end
+
+    context 'only layout collection dependency' do
+      context 'dependency on any new layout' do
+        before do
+          dependency_tracker = Nanoc::Int::DependencyTracker.new(dependency_store)
+          dependency_tracker.enter(item)
+          dependency_tracker.bounce(layouts, raw_content: true)
+          dependency_store.store
+        end
+
+        context 'nothing changed' do
+          it { is_expected.not_to be }
+        end
+
+        context 'layout added' do
+          before do
+            new_layout = Nanoc::Int::Layout.new('stuff', {}, '/newblahz.md')
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, layouts.to_a + [new_layout])
+            dependency_store.load
+          end
+
+          it { is_expected.to be }
+        end
+
+        context 'layout removed' do
+          before do
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, [])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+      end
+
+      context 'dependency on specific new layouts (string)' do
+        before do
+          dependency_tracker = Nanoc::Int::DependencyTracker.new(dependency_store)
+          dependency_tracker.enter(item)
+          dependency_tracker.bounce(layouts, raw_content: ['/new*'])
+          dependency_store.store
+        end
+
+        context 'nothing changed' do
+          it { is_expected.not_to be }
+        end
+
+        context 'matching layout added' do
+          before do
+            new_layout = Nanoc::Int::Layout.new('stuff', {}, '/newblahz.md')
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, layouts.to_a + [new_layout])
+            dependency_store.load
+          end
+
+          it { is_expected.to be }
+        end
+
+        context 'non-matching layout added' do
+          before do
+            new_layout = Nanoc::Int::Layout.new('stuff', {}, '/nublahz.md')
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, layouts.to_a + [new_layout])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+
+        context 'layout removed' do
+          before do
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, [])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+      end
+
+      context 'dependency on specific new layouts (regex)' do
+        before do
+          dependency_tracker = Nanoc::Int::DependencyTracker.new(dependency_store)
+          dependency_tracker.enter(item)
+          dependency_tracker.bounce(layouts, raw_content: [%r{^/new.*}])
+          dependency_store.store
+        end
+
+        context 'nothing changed' do
+          it { is_expected.not_to be }
+        end
+
+        context 'matching layout added' do
+          before do
+            new_layout = Nanoc::Int::Layout.new('stuff', {}, '/newblahz.md')
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, layouts.to_a + [new_layout])
+            dependency_store.load
+          end
+
+          it { is_expected.to be }
+        end
+
+        context 'non-matching layout added' do
+          before do
+            new_layout = Nanoc::Int::Layout.new('stuff', {}, '/nublahz.md')
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, layouts.to_a + [new_layout])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+
+        context 'layout removed' do
+          before do
+            dependency_store.layouts = Nanoc::Int::LayoutCollection.new(config, [])
+            dependency_store.load
+          end
+
+          it { is_expected.not_to be }
+        end
+      end
+    end
   end
 end