nanoc 4.7.12 → 4.7.13

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

@@ -48,8 +48,8 @@ describe Nanoc::Int::OutdatednessRules do
       ).run
     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) }
 
     before do
       allow(site).to receive(:code_snippets).and_return(code_snippets)
@@ -339,7 +339,7 @@ describe Nanoc::Int::OutdatednessRules do
       let(:stored_obj) { raise 'override me' }
       let(:new_obj)    { raise 'override me' }
 
-      let(:items) { [new_obj] }
+      let(:items) { Nanoc::Int::ItemCollection.new(config, [new_obj]) }
 
       shared_examples 'a document' do
         let(:stored_obj) { klass.new('a', {}, '/foo.md') }

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

@@ -25,6 +25,15 @@ describe Nanoc::Pruner do
     expect(Nanoc::Extra::Pruner).to equal(Nanoc::Pruner)
   end
 
+  describe '#pathname_components' do
+    subject { pruner.pathname_components(pathname) }
+
+    context 'regular path' do
+      let(:pathname) { Pathname.new('/a/bb/ccc/dd/e') }
+      it { is_expected.to eql(%w[/ a bb ccc dd e]) }
+    end
+  end
+
   describe '#files_and_dirs_in' do
     subject { pruner.files_and_dirs_in('output/') }
 

data/spec/nanoc/base/views/document_view_spec.rb

@@ -14,12 +14,11 @@ shared_examples 'a document view' do
   end
 
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_items, empty_layouts, config) }
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.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/views/identifiable_collection_view_spec.rb

@@ -4,7 +4,19 @@
 shared_examples 'an identifiable collection' do
   let(:view) { described_class.new(wrapped, view_context) }
 
-  let(:view_context) { double(:view_context) }
+  let(:view_context) do
+    Nanoc::ViewContext.new(
+      reps:                double(:__reps),
+      items:               double(:__items),
+      dependency_tracker:  dependency_tracker,
+      compilation_context: double(:__compilation_context),
+      snapshot_repo:       double(:__snapshot_repo),
+    )
+  end
+
+  let(:dependency_tracker) do
+    Nanoc::Int::DependencyTracker::Null.new
+  end
 
   let(:config) do
     { string_pattern_type: 'glob' }
@@ -12,7 +24,7 @@ shared_examples 'an identifiable collection' do
 
   describe '#frozen?' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      collection_class.new(
         config,
         [
           double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
@@ -39,7 +51,7 @@ shared_examples 'an identifiable collection' do
 
   describe '#unwrap' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      collection_class.new(
         config,
         [
           double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
@@ -52,11 +64,16 @@ shared_examples 'an identifiable collection' do
     subject { view.unwrap }
 
     it { should equal(wrapped) }
+
+    it 'does not create dependency' do
+      expect(dependency_tracker).not_to receive(:bounce)
+      subject
+    end
   end
 
   describe '#each' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      collection_class.new(
         config,
         [
           double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
@@ -66,6 +83,11 @@ shared_examples 'an identifiable collection' do
       )
     end
 
+    it 'creates dependency' do
+      expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: true)
+      view.each { |_i| }
+    end
+
     it 'returns self' do
       expect(view.each { |_i| }).to equal(view)
     end
@@ -77,7 +99,7 @@ shared_examples 'an identifiable collection' do
 
   describe '#size' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      collection_class.new(
         config,
         [
           double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
@@ -89,6 +111,11 @@ shared_examples 'an identifiable collection' do
 
     subject { view.size }
 
+    it 'creates dependency' do
+      expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: true)
+      subject
+    end
+
     it { should == 3 }
   end
 
@@ -102,7 +129,7 @@ shared_examples 'an identifiable collection' do
     end
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      collection_class.new(
         config,
         [
           page_object,
@@ -116,11 +143,21 @@ shared_examples 'an identifiable collection' do
     context 'no objects found' do
       let(:arg) { '/donkey.*' }
       it { is_expected.to equal(nil) }
+
+      it 'creates dependency' do
+        expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: ['/donkey.*'])
+        subject
+      end
     end
 
     context 'string' do
       let(:arg) { '/home.erb' }
 
+      it 'creates dependency' do
+        expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: ['/home.erb'])
+        subject
+      end
+
       it 'returns wrapped object' do
         expect(subject.class).to equal(view_class)
         expect(subject.unwrap).to equal(home_object)
@@ -134,6 +171,11 @@ shared_examples 'an identifiable collection' do
     context 'identifier' do
       let(:arg) { Nanoc::Identifier.new('/home.erb') }
 
+      it 'creates dependency' do
+        expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: ['/home.erb'])
+        subject
+      end
+
       it 'returns wrapped object' do
         expect(subject.class).to equal(view_class)
         expect(subject.unwrap).to equal(home_object)
@@ -146,12 +188,22 @@ shared_examples 'an identifiable collection' do
       context 'globs not enabled' do
         let(:config) { { string_pattern_type: 'legacy' } }
 
+        it 'creates dependency' do
+          expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: ['/home.*'])
+          subject
+        end
+
         it 'returns nil' do
           expect(subject).to be_nil
         end
       end
 
       context 'globs enabled' do
+        it 'creates dependency' do
+          expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: ['/home.*'])
+          subject
+        end
+
         it 'returns wrapped object' do
           expect(subject.class).to equal(view_class)
           expect(subject.unwrap).to equal(home_object)
@@ -162,6 +214,11 @@ shared_examples 'an identifiable collection' do
     context 'regex' do
       let(:arg) { %r{\A/home} }
 
+      it 'creates dependency' do
+        expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: [%r{\A/home}])
+        subject
+      end
+
       it 'returns wrapped object' do
         expect(subject.class).to equal(view_class)
         expect(subject.unwrap).to equal(home_object)
@@ -171,7 +228,7 @@ shared_examples 'an identifiable collection' do
 
   describe '#find_all' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      collection_class.new(
         config,
         [
           double(:identifiable, identifier: Nanoc::Identifier.new('/about.css')),
@@ -186,6 +243,11 @@ shared_examples 'an identifiable collection' do
     context 'with string' do
       let(:arg) { '/*.css' }
 
+      it 'creates dependency' do
+        expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: ['/*.css'])
+        subject
+      end
+
       it 'contains views' do
         expect(subject.size).to eql(2)
         about_css = subject.find { |iv| iv.identifier == '/about.css' }
@@ -198,6 +260,11 @@ shared_examples 'an identifiable collection' do
     context 'with regex' do
       let(:arg) { %r{\.css\z} }
 
+      it 'creates dependency' do
+        expect(dependency_tracker).to receive(:bounce).with(wrapped, raw_content: [%r{\.css\z}])
+        subject
+      end
+
       it 'contains views' do
         expect(subject.size).to eql(2)
         about_css = subject.find { |iv| iv.identifier == '/about.css' }

data/spec/nanoc/base/views/item_collection_with_reps_view_spec.rb

@@ -2,11 +2,12 @@
 
 describe Nanoc::ItemCollectionWithRepsView do
   let(:view_class) { Nanoc::ItemWithRepsView }
+  let(:collection_class) { Nanoc::Int::ItemCollection }
   it_behaves_like 'an identifiable collection'
 
   describe '#inspect' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config)
+      Nanoc::Int::ItemCollection.new(config)
     end
 
     let(:view) { described_class.new(wrapped, view_context) }

data/spec/nanoc/base/views/item_collection_without_reps_view_spec.rb

@@ -2,11 +2,12 @@
 
 describe Nanoc::ItemCollectionWithoutRepsView do
   let(:view_class) { Nanoc::ItemWithoutRepsView }
+  let(:collection_class) { Nanoc::Int::ItemCollection }
   it_behaves_like 'an identifiable collection'
 
   describe '#inspect' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config)
+      Nanoc::Int::ItemCollection.new(config)
     end
 
     let(:view) { described_class.new(wrapped, view_context) }

data/spec/nanoc/base/views/item_rep_view_spec.rb

@@ -17,12 +17,11 @@ describe Nanoc::ItemRepView do
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_items, empty_layouts, config) }
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.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/views/item_view_spec.rb

@@ -18,15 +18,14 @@ describe Nanoc::ItemWithRepsView do
   let(:reps) { [] }
   let(:items) { [] }
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_items, empty_layouts, config) }
   let(:compilation_context) { double(:compilation_context) }
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.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 }
 
@@ -42,7 +41,7 @@ describe Nanoc::ItemWithRepsView do
     let(:view) { described_class.new(item, view_context) }
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::ItemCollection.new(
         {},
         [
           item,
@@ -141,7 +140,7 @@ describe Nanoc::ItemWithRepsView do
     let(:view) { described_class.new(item, view_context) }
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::ItemCollection.new(
         {},
         [
           item,

data/spec/nanoc/base/views/layout_collection_view_spec.rb

@@ -2,11 +2,12 @@
 
 describe Nanoc::LayoutCollectionView do
   let(:view_class) { Nanoc::LayoutView }
+  let(:collection_class) { Nanoc::Int::LayoutCollection }
   it_behaves_like 'an identifiable collection'
 
   describe '#inspect' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config)
+      Nanoc::Int::LayoutCollection.new(config)
     end
 
     let(:view) { described_class.new(wrapped, view_context) }

data/spec/nanoc/base/views/mutable_identifiable_collection_view_spec.rb

@@ -11,7 +11,7 @@ shared_examples 'a mutable identifiable collection' do
 
   describe '#delete_if' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(
+      collection_class.new(
         config,
         [double(:identifiable, identifier: Nanoc::Identifier.new('/asdf/'))],
       )

data/spec/nanoc/base/views/mutable_item_collection_view_spec.rb

@@ -2,6 +2,7 @@
 
 describe Nanoc::MutableItemCollectionView do
   let(:view_class) { Nanoc::MutableItemView }
+  let(:collection_class) { Nanoc::Int::ItemCollection }
   it_behaves_like 'an identifiable collection'
   it_behaves_like 'a mutable identifiable collection'
 
@@ -15,7 +16,7 @@ describe Nanoc::MutableItemCollectionView do
     end
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config, [item])
+      Nanoc::Int::ItemCollection.new(config, [item])
     end
 
     let(:view) { described_class.new(wrapped, nil) }
@@ -42,7 +43,7 @@ describe Nanoc::MutableItemCollectionView do
 
   describe '#inspect' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config)
+      Nanoc::Int::ItemCollection.new(config)
     end
 
     let(:view) { described_class.new(wrapped, view_context) }

data/spec/nanoc/base/views/mutable_layout_collection_view_spec.rb

@@ -2,6 +2,7 @@
 
 describe Nanoc::MutableLayoutCollectionView do
   let(:view_class) { Nanoc::MutableLayoutView }
+  let(:collection_class) { Nanoc::Int::LayoutCollection }
   it_behaves_like 'an identifiable collection'
   it_behaves_like 'a mutable identifiable collection'
 
@@ -15,7 +16,7 @@ describe Nanoc::MutableLayoutCollectionView do
     end
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config, [layout])
+      Nanoc::Int::LayoutCollection.new(config, [layout])
     end
 
     let(:view) { described_class.new(wrapped, nil) }
@@ -42,7 +43,7 @@ describe Nanoc::MutableLayoutCollectionView do
 
   describe '#inspect' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config)
+      Nanoc::Int::LayoutCollection.new(config)
     end
 
     let(:view) { described_class.new(wrapped, view_context) }

data/spec/nanoc/base/views/post_compile_item_rep_view_spec.rb

@@ -16,7 +16,7 @@ describe Nanoc::PostCompileItemRepView do
   end
 
   let(:reps) { double(:reps) }
-  let(:items) { Nanoc::Int::IdentifiableCollection.new(config) }
+  let(:items) { Nanoc::Int::ItemCollection.new(config) }
   let(:config) { Nanoc::Int::Configuration.new }
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(double(:dependency_store)) }
   let(:compilation_context) { double(:compilation_context, compiled_content_cache: compiled_content_cache) }

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

@@ -13,7 +13,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     let(:command) { double(:command) }
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::ItemCollection.new(
         config,
         [
           item_about,
@@ -34,7 +34,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     end
 
     let(:layouts) do
-      Nanoc::Int::IdentifiableCollection.new(config)
+      Nanoc::Int::LayoutCollection.new(config)
     end
 
     it 'prints a legend' do
@@ -166,7 +166,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     let(:config) { Nanoc::Int::Configuration.new }
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new(
+      Nanoc::Int::ItemCollection.new(
         config,
         [
           item_about,
@@ -257,7 +257,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     let(:config) { Nanoc::Int::Configuration.new }
 
     let(:layouts) do
-      Nanoc::Int::IdentifiableCollection.new(config, [layout])
+      Nanoc::Int::LayoutCollection.new(config, [layout])
     end
 
     let(:layout) { Nanoc::Int::Layout.new('stuff', {}, '/default.erb') }