nanoc 4.7.10 → 4.7.11

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

@@ -12,6 +12,62 @@ describe Nanoc::Int::IdentifiableCollection do
     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')),
+      ]
+    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])
+      end
+    end
+
+    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
+      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 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
+
+    context 'frozen' do
+      before { identifiable_collection.freeze }
+
+      example do
+        expect(identifiable_collection['/one']).to equal(objects[0])
+        expect(identifiable_collection['/fifty']).to be_nil
+      end
+    end
+  end
+
   describe '#find_all' do
     let(:objects) do
       [

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

@@ -2,4 +2,12 @@
 
 describe Nanoc::Int::Item do
   it_behaves_like 'a document'
+
+  describe '#reference' do
+    let(:item) { described_class.new('hi', {}, '/foo.md') }
+
+    it 'has the proper reference' do
+      expect(item.reference).to eql([:item, '/foo.md'])
+    end
+  end
 end

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

@@ -2,4 +2,12 @@
 
 describe Nanoc::Int::Layout do
   it_behaves_like 'a document'
+
+  describe '#reference' do
+    let(:layout) { described_class.new('hi', {}, '/foo.md') }
+
+    it 'has the proper reference' do
+      expect(layout.reference).to eql([:layout, '/foo.md'])
+    end
+  end
 end

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

@@ -7,8 +7,11 @@ describe Nanoc::Int::DependencyStore do
   let(:item_b) { Nanoc::Int::Item.new('b', {}, '/b.md') }
   let(:item_c) { Nanoc::Int::Item.new('c', {}, '/c.md') }
 
+  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) }
+  let(:layouts) { Nanoc::Int::IdentifiableCollection.new(config, [layout_a, layout_b]) }
   let(:config) { Nanoc::Int::Configuration.new }
 
   describe '#dependencies_causing_outdatedness_of' do
@@ -21,9 +24,75 @@ describe Nanoc::Int::DependencyStore do
     end
 
     context 'one dependency' do
+      context 'dependency on config, no props' do
+        before do
+          store.record_dependency(item_a, config)
+        end
+
+        it 'returns one dependency' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps.size).to eql(1)
+        end
+
+        it 'returns dependency from a onto config' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps[0].from).to eql(config)
+          expect(deps[0].to).to eql(item_a)
+        end
+
+        it 'returns true for all props by default' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps[0].props.raw_content?).to eq(true)
+          expect(deps[0].props.attributes?).to eq(true)
+          expect(deps[0].props.compiled_content?).to eq(true)
+          expect(deps[0].props.path?).to eq(true)
+        end
+
+        it 'returns nothing for the others' do
+          expect(store.dependencies_causing_outdatedness_of(item_b)).to be_empty
+          expect(store.dependencies_causing_outdatedness_of(item_c)).to be_empty
+        end
+      end
+
+      context 'dependency on config, generic attributes prop' do
+        before do
+          store.record_dependency(item_a, config, attributes: true)
+        end
+
+        it 'returns false for all unspecified props' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps[0].props.raw_content?).to eq(false)
+          expect(deps[0].props.compiled_content?).to eq(false)
+          expect(deps[0].props.path?).to eq(false)
+        end
+
+        it 'returns the specified props' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps[0].props.attributes?).to eq(true)
+        end
+      end
+
+      context 'dependency on config, specific attributes prop' do
+        before do
+          store.record_dependency(item_a, config, attributes: [:donkey])
+        end
+
+        it 'returns false for all unspecified props' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps[0].props.raw_content?).to eq(false)
+          expect(deps[0].props.compiled_content?).to eq(false)
+          expect(deps[0].props.path?).to eq(false)
+        end
+
+        it 'returns the specified props' do
+          deps = store.dependencies_causing_outdatedness_of(item_a)
+          expect(deps[0].props.attributes?).to eq(true)
+          expect(deps[0].props.attributes).to contain_exactly(:donkey)
+        end
+      end
+
       context 'no props' do
         before do
-          # FIXME: weird argument order (item_b depends on item_a, not th other way around)
           store.record_dependency(item_a, item_b)
         end
 
@@ -54,7 +123,6 @@ describe Nanoc::Int::DependencyStore do
 
       context 'one prop' do
         before do
-          # FIXME: weird argument order (item_b depends on item_a, not th other way around)
           store.record_dependency(item_a, item_b, compiled_content: true)
         end
 
@@ -73,7 +141,6 @@ describe Nanoc::Int::DependencyStore do
 
       context 'two props' do
         before do
-          # FIXME: weird argument order (item_b depends on item_a, not th other way around)
           store.record_dependency(item_a, item_b, compiled_content: true)
           store.record_dependency(item_a, item_b, attributes: true)
         end
@@ -94,7 +161,6 @@ describe Nanoc::Int::DependencyStore do
 
     context 'two dependency in a chain' do
       before do
-        # FIXME: weird argument order (item_b depends on item_a, not th other way around)
         store.record_dependency(item_a, item_b)
         store.record_dependency(item_b, item_c)
       end
@@ -117,7 +183,7 @@ describe Nanoc::Int::DependencyStore do
     end
   end
 
-  describe 'reloading' do
+  describe 'reloading - item a -> b' do
     before do
       store.record_dependency(item_a, item_b, compiled_content: true)
       store.record_dependency(item_a, item_b, attributes: true)
@@ -195,75 +261,154 @@ describe Nanoc::Int::DependencyStore do
     end
   end
 
-  describe '#record_dependency' do
+  describe 'reloading - item a -> config' do
+    before do
+      store.record_dependency(item_a, config, attributes: [:donkey])
+
+      store.store
+      store.load
+    end
+
+    it 'has the right dependencies for item A' do
+      deps = store.dependencies_causing_outdatedness_of(item_a)
+      expect(deps.size).to eql(1)
+
+      expect(deps[0].from).to eql(config)
+      expect(deps[0].to).to eql(item_a)
+
+      expect(deps[0].props.raw_content?).to eq(false)
+      expect(deps[0].props.attributes?).to eq(true)
+      expect(deps[0].props.attributes).to contain_exactly(:donkey)
+      expect(deps[0].props.compiled_content?).to eq(false)
+      expect(deps[0].props.path?).to eq(false)
+    end
+
+    it 'has the right dependencies for item B' do
+      deps = store.dependencies_causing_outdatedness_of(item_b)
+      expect(deps).to be_empty
+    end
+
+    it 'has the right dependencies for item C' do
+      deps = store.dependencies_causing_outdatedness_of(item_c)
+      expect(deps).to be_empty
+    end
+  end
+
+  shared_examples 'records dependencies' do
     context 'no props' do
-      subject { store.record_dependency(item_a, item_b) }
+      subject { store.record_dependency(source_obj, item_b) }
 
       it 'records a dependency' do
         expect { subject }
-          .to change { store.objects_causing_outdatedness_of(item_a) }
+          .to change { store.objects_causing_outdatedness_of(source_obj) }
           .from([])
           .to([item_b])
       end
+
+      it 'ignores all other objects' do
+        subject
+        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+      end
     end
 
     context 'compiled content prop' do
-      subject { store.record_dependency(item_a, item_b, compiled_content: true) }
+      subject { store.record_dependency(source_obj, target_obj, compiled_content: true) }
 
       it 'records a dependency' do
         expect { subject }
-          .to change { store.objects_causing_outdatedness_of(item_a) }
+          .to change { store.objects_causing_outdatedness_of(source_obj) }
           .from([])
-          .to([item_b])
+          .to([target_obj])
       end
 
       it 'records a dependency with the right props' do
         subject
-        deps = store.dependencies_causing_outdatedness_of(item_a)
+        deps = store.dependencies_causing_outdatedness_of(source_obj)
 
         expect(deps.first.props.attributes?).not_to be
         expect(deps.first.props.compiled_content?).to be
       end
+
+      it 'ignores all other objects' do
+        subject
+        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+      end
     end
 
     context 'attribute prop (true)' do
-      subject { store.record_dependency(item_a, item_b, attributes: true) }
+      subject { store.record_dependency(source_obj, target_obj, attributes: true) }
 
       it 'records a dependency' do
         expect { subject }
-          .to change { store.objects_causing_outdatedness_of(item_a) }
+          .to change { store.objects_causing_outdatedness_of(source_obj) }
           .from([])
-          .to([item_b])
+          .to([target_obj])
       end
 
       it 'records a dependency with the right props' do
         subject
-        deps = store.dependencies_causing_outdatedness_of(item_a)
+        deps = store.dependencies_causing_outdatedness_of(source_obj)
 
         expect(deps.first.props.attributes?).to be
         expect(deps.first.props.attributes).to be
         expect(deps.first.props.compiled_content?).not_to be
       end
+
+      it 'ignores all other objects' do
+        subject
+        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+      end
     end
 
     context 'attribute prop (true)' do
-      subject { store.record_dependency(item_a, item_b, attributes: [:giraffe]) }
+      subject { store.record_dependency(source_obj, target_obj, attributes: [:giraffe]) }
 
       it 'records a dependency' do
         expect { subject }
-          .to change { store.objects_causing_outdatedness_of(item_a) }
+          .to change { store.objects_causing_outdatedness_of(source_obj) }
           .from([])
-          .to([item_b])
+          .to([target_obj])
       end
 
       it 'records a dependency with the right props' do
         subject
-        deps = store.dependencies_causing_outdatedness_of(item_a)
+        deps = store.dependencies_causing_outdatedness_of(source_obj)
 
         expect(deps.first.props.attributes?).to be
         expect(deps.first.props.attributes).to match_array([:giraffe])
         expect(deps.first.props.compiled_content?).not_to be
       end
+
+      it 'ignores all other objects' do
+        subject
+        expect(other_objs).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
+      end
+    end
+  end
+
+  describe '#record_dependency' 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] }
+
+      include_examples 'records dependencies'
+    end
+
+    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] }
+
+      include_examples 'records dependencies'
+    end
+
+    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] }
+
+      include_examples 'records dependencies'
     end
   end
 end

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

@@ -7,7 +7,19 @@ describe Nanoc::ConfigView do
 
   let(:hash) { { amount: 9000, animal: 'donkey' } }
 
-  let(:view) { described_class.new(config, nil) }
+  let(:view) { described_class.new(config, 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) { double(:dependency_tracker) }
 
   describe '#frozen?' do
     subject { view.frozen? }
@@ -25,6 +37,10 @@ describe Nanoc::ConfigView do
   describe '#[]' do
     subject { view[key] }
 
+    before do
+      expect(dependency_tracker).to receive(:bounce).with(config, attributes: [key])
+    end
+
     context 'with existant key' do
       let(:key) { :animal }
       it { is_expected.to eql('donkey') }
@@ -37,6 +53,10 @@ describe Nanoc::ConfigView do
   end
 
   describe '#fetch' do
+    before do
+      expect(dependency_tracker).to receive(:bounce).with(config, attributes: [key])
+    end
+
     context 'with existant key' do
       let(:key) { :animal }
 
@@ -71,6 +91,10 @@ describe Nanoc::ConfigView do
   describe '#key?' do
     subject { view.key?(key) }
 
+    before do
+      expect(dependency_tracker).to receive(:bounce).with(config, attributes: [key])
+    end
+
     context 'with existant key' do
       let(:key) { :animal }
       it { is_expected.to eql(true) }
@@ -83,6 +107,10 @@ describe Nanoc::ConfigView do
   end
 
   describe '#each' do
+    before do
+      expect(dependency_tracker).to receive(:bounce).with(config, attributes: true)
+    end
+
     example do
       res = []
       view.each { |k, v| res << [k, v] }

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

@@ -5,20 +5,35 @@ describe Nanoc::CLI::Commands::Shell, site: true, stdio: true do
     before do
       # Prevent double-loading
       expect(Nanoc::CLI).to receive(:setup)
+
+      File.write('content/hello.md', 'Hello!')
+
+      File.write('Rules', <<~EOS)
+        preprocess do
+          @items['/hello.*'].raw_content = 'Better hello!'
+        end
+
+        compile '/**/*' do
+        end
+      EOS
     end
 
     it 'can be invoked' do
-      rules_collection = Nanoc::RuleDSL::RulesCollection.new
-      config = Nanoc::Int::Configuration.new.with_defaults
+      expect_any_instance_of(Nanoc::Int::Context).to receive(:pry) do |ctx|
+        expect(ctx.items.size).to eq(1)
+        expect(ctx.items.to_a[0].unwrap.content.string).to eq('Hello!')
+      end
 
-      dsl = Nanoc::RuleDSL::CompilerDSL.new(rules_collection, config)
-      allow(Nanoc::RuleDSL::CompilerDSL).to receive(:new).and_return(dsl)
+      Nanoc::CLI.run(['shell'])
+    end
 
-      context = Object.new
-      allow(Nanoc::Int::Context).to receive(:new).with(anything).and_return(context)
-      expect(context).to receive(:pry)
+    it 'will preprocess if requested' do
+      expect_any_instance_of(Nanoc::Int::Context).to receive(:pry) do |ctx|
+        expect(ctx.items.size).to eq(1)
+        expect(ctx.items.to_a[0].unwrap.content.string).to eq('Better hello!')
+      end
 
-      Nanoc::CLI.run(['shell'])
+      Nanoc::CLI.run(['shell', '--preprocess'])
     end
   end