nanoc 4.6.1 → 4.6.2

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

@@ -21,9 +21,8 @@ describe Nanoc::Int::OutdatednessChecker do
   let(:site) do
     Nanoc::Int::Site.new(
       config: config,
-      items: [],
-      layouts: [],
       code_snippets: [],
+      data_source: Nanoc::Int::InMemDataSource.new([], []),
     )
   end
 

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

@@ -25,9 +25,8 @@ describe Nanoc::Int::OutdatednessRules do
     let(:site) do
       Nanoc::Int::Site.new(
         config: config,
-        items: [],
-        layouts: [],
         code_snippets: code_snippets,
+        data_source: Nanoc::Int::InMemDataSource.new([], []),
       )
     end
 
@@ -105,7 +104,7 @@ describe Nanoc::Int::OutdatednessRules do
       context 'path' do
         let(:path) { 'foo.txt' }
 
-        before { item_rep.raw_paths = { last: path } }
+        before { item_rep.raw_paths = { last: [path] } }
 
         context 'not written' do
           it { is_expected.to be }

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

@@ -8,11 +8,11 @@ describe Nanoc::Pruner do
   let(:reps) do
     Nanoc::Int::ItemRepRepo.new.tap do |reps|
       reps << Nanoc::Int::ItemRep.new(item, :default).tap do |rep|
-        rep.raw_paths = { last: 'output/asdf.html' }
+        rep.raw_paths = { last: ['output/asdf.html'] }
       end
 
       reps << Nanoc::Int::ItemRep.new(item, :text).tap do |rep|
-        rep.raw_paths = { last: 'output/asdf.txt' }
+        rep.raw_paths = { last: ['output/asdf.txt'] }
       end
     end
   end

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

@@ -10,10 +10,13 @@ shared_examples 'an identifiable collection' do
 
   describe '#frozen?' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/foo'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/bar'))
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/bar')),
+        ],
+      )
     end
 
     subject { view.frozen? }
@@ -34,11 +37,14 @@ shared_examples 'an identifiable collection' do
 
   describe '#unwrap' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/foo'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/bar'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/baz'))
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/bar')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/baz')),
+        ],
+      )
     end
 
     subject { view.unwrap }
@@ -48,11 +54,14 @@ shared_examples 'an identifiable collection' do
 
   describe '#each' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/foo'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/bar'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/baz'))
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/bar')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/baz')),
+        ],
+      )
     end
 
     it 'returns self' do
@@ -66,11 +75,14 @@ shared_examples 'an identifiable collection' do
 
   describe '#size' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/foo'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/bar'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/baz'))
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          double(:identifiable, identifier: Nanoc::Identifier.new('/foo')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/bar')),
+          double(:identifiable, identifier: Nanoc::Identifier.new('/baz')),
+        ],
+      )
     end
 
     subject { view.size }
@@ -88,10 +100,13 @@ shared_examples 'an identifiable collection' do
     end
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << page_object
-        arr << home_object
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          page_object,
+          home_object,
+        ],
+      )
     end
 
     subject { view[arg] }
@@ -154,11 +169,14 @@ shared_examples 'an identifiable collection' do
 
   describe '#find_all' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/about.css'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/about.md'))
-        arr << double(:identifiable, identifier: Nanoc::Identifier.new('/style.css'))
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          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
 
     subject { view.find_all(arg) }

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

@@ -146,7 +146,7 @@ describe Nanoc::ItemRepView do
       Nanoc::Int::ItemRep.new(item, :default).tap do |ir|
         ir.compiled = true
         ir.snapshot_defs = [
-          Nanoc::Int::SnapshotDef.new(:last),
+          Nanoc::Int::SnapshotDef.new(:last, binary: false),
         ]
       end
     end
@@ -213,7 +213,7 @@ describe Nanoc::ItemRepView do
       Nanoc::Int::ItemRep.new(item, :default).tap do |ir|
         ir.compiled = true
         ir.snapshot_defs = [
-          Nanoc::Int::SnapshotDef.new(:last),
+          Nanoc::Int::SnapshotDef.new(:last, binary: false),
         ]
       end
     end
@@ -255,7 +255,7 @@ describe Nanoc::ItemRepView do
     let(:rep) do
       Nanoc::Int::ItemRep.new(item, :default).tap do |ir|
         ir.paths = {
-          last: '/about/',
+          last: ['/about/'],
         }
       end
     end
@@ -283,14 +283,14 @@ describe Nanoc::ItemRepView do
   end
 
   describe '#raw_path' do
-    subject { view.raw_path }
+    subject { Fiber.new { view.raw_path }.resume }
 
     let(:view) { described_class.new(rep, view_context) }
 
     let(:rep) do
       Nanoc::Int::ItemRep.new(item, :default).tap do |ir|
         ir.raw_paths = {
-          last: 'output/about/index.html',
+          last: ['output/about/index.html'],
         }
       end
     end
@@ -299,22 +299,79 @@ describe Nanoc::ItemRepView do
       Nanoc::Int::Item.new('content', {}, '/asdf.md')
     end
 
-    it 'creates a dependency' do
-      expect { subject }.to change { dependency_store.objects_causing_outdatedness_of(base_item) }.from([]).to([item])
+    context 'rep is not compiled' do
+      it 'creates a dependency' do
+        expect { subject }.to change { dependency_store.objects_causing_outdatedness_of(base_item) }.from([]).to([item])
+      end
+
+      it 'creates a dependency with the right props' do
+        subject
+        dep = dependency_store.dependencies_causing_outdatedness_of(base_item)[0]
+
+        expect(dep.props.compiled_content?).to eq(true)
+
+        expect(dep.props.raw_content?).to eq(false)
+        expect(dep.props.attributes?).to eq(false)
+        expect(dep.props.path?).to eq(false)
+      end
+
+      it { should be_a(Nanoc::Int::Errors::UnmetDependency) }
     end
 
-    it 'creates a dependency with the right props' do
-      subject
-      dep = dependency_store.dependencies_causing_outdatedness_of(base_item)[0]
+    context 'rep is compiled' do
+      before { rep.compiled = true }
 
-      expect(dep.props.path?).to eq(true)
+      it 'creates a dependency' do
+        expect { subject }.to change { dependency_store.objects_causing_outdatedness_of(base_item) }.from([]).to([item])
+      end
 
-      expect(dep.props.raw_content?).to eq(false)
-      expect(dep.props.attributes?).to eq(false)
-      expect(dep.props.compiled_content?).to eq(false)
+      it 'creates a dependency with the right props' do
+        subject
+        dep = dependency_store.dependencies_causing_outdatedness_of(base_item)[0]
+
+        expect(dep.props.compiled_content?).to eq(true)
+
+        expect(dep.props.raw_content?).to eq(false)
+        expect(dep.props.attributes?).to eq(false)
+        expect(dep.props.path?).to eq(false)
+      end
+
+      it { should eq('output/about/index.html') }
     end
+  end
+
+  describe '#binary?' do
+    let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+    let(:view) { described_class.new(item_rep, view_context) }
+
+    subject { view.binary? }
 
-    it { should eq('output/about/index.html') }
+    context 'no :last snapshot' do
+      before do
+        item_rep.snapshot_defs = []
+      end
+
+      it 'raises' do
+        expect { subject }.to raise_error(Nanoc::Int::Errors::NoSuchSnapshot)
+      end
+    end
+
+    context ':last snapshot is textual' do
+      before do
+        item_rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(:last, binary: false)]
+      end
+
+      it { is_expected.not_to be }
+    end
+
+    context ':last snapshot is binary' do
+      before do
+        item_rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(:last, binary: true)]
+      end
+
+      it { is_expected.to be }
+    end
   end
 
   describe '#item' do

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

@@ -34,10 +34,13 @@ describe Nanoc::ItemWithRepsView do
     let(:view) { described_class.new(item, view_context) }
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new({}).tap do |arr|
-        arr << item
-        arr << parent_item if parent_item
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        {},
+        [
+          item,
+          parent_item,
+        ].compact,
+      )
     end
 
     subject { view.parent }
@@ -130,10 +133,13 @@ describe Nanoc::ItemWithRepsView do
     let(:view) { described_class.new(item, view_context) }
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new({}).tap do |arr|
-        arr << item
-        children.each { |child| arr << child }
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        {},
+        [
+          item,
+          *children,
+        ],
+      )
     end
 
     subject { view.children }
@@ -208,10 +214,10 @@ describe Nanoc::ItemWithRepsView do
       Nanoc::Int::ItemRep.new(item, :default).tap do |ir|
         ir.compiled = true
         ir.snapshot_defs = [
-          Nanoc::Int::SnapshotDef.new(:last),
-          Nanoc::Int::SnapshotDef.new(:pre),
-          Nanoc::Int::SnapshotDef.new(:post),
-          Nanoc::Int::SnapshotDef.new(:specific),
+          Nanoc::Int::SnapshotDef.new(:last, binary: false),
+          Nanoc::Int::SnapshotDef.new(:pre, binary: false),
+          Nanoc::Int::SnapshotDef.new(:post, binary: false),
+          Nanoc::Int::SnapshotDef.new(:specific, binary: false),
         ]
       end
     end
@@ -286,8 +292,8 @@ describe Nanoc::ItemWithRepsView do
     let(:rep) do
       Nanoc::Int::ItemRep.new(item, :default).tap do |ir|
         ir.paths = {
-          last: '/about/',
-          specific: '/about.txt',
+          last: ['/about/'],
+          specific: ['/about.txt'],
         }
       end
     end

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

@@ -9,14 +9,20 @@ shared_examples 'a mutable identifiable collection' do
 
   describe '#delete_if' do
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |coll|
-        coll << double(:identifiable, identifier: Nanoc::Identifier.new('/asdf/'))
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [double(:identifiable, identifier: Nanoc::Identifier.new('/asdf/'))],
+      )
     end
 
     it 'deletes matching' do
       view.delete_if { |i| i.identifier == '/asdf/' }
-      expect(wrapped).to be_empty
+      expect(view.unwrap).to be_empty
+    end
+
+    it 'does not mutate' do
+      view.delete_if { |i| i.identifier == '/asdf/' }
+      expect(wrapped).not_to be_empty
     end
 
     it 'deletes no non-matching' do

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

@@ -13,9 +13,7 @@ describe Nanoc::MutableItemCollectionView do
     end
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |coll|
-        coll << item
-      end
+      Nanoc::Int::IdentifiableCollection.new(config, [item])
     end
 
     let(:view) { described_class.new(wrapped, nil) }
@@ -23,8 +21,15 @@ describe Nanoc::MutableItemCollectionView do
     it 'creates an object' do
       view.create('new content', { title: 'New Page' }, '/new/')
 
-      expect(wrapped.size).to eq(2)
-      expect(wrapped['/new/'].content.string).to eq('new content')
+      expect(view.unwrap.size).to eq(2)
+      expect(view.unwrap['/new/'].content.string).to eq('new content')
+    end
+
+    it 'does not update wrapped' do
+      view.create('new content', { title: 'New Page' }, '/new/')
+
+      expect(wrapped.size).to eq(1)
+      expect(wrapped['/new']).to be_nil
     end
 
     it 'returns self' do

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

@@ -13,9 +13,7 @@ describe Nanoc::MutableLayoutCollectionView do
     end
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |coll|
-        coll << layout
-      end
+      Nanoc::Int::IdentifiableCollection.new(config, [layout])
     end
 
     let(:view) { described_class.new(wrapped, nil) }
@@ -23,8 +21,15 @@ describe Nanoc::MutableLayoutCollectionView do
     it 'creates an object' do
       view.create('new content', { title: 'New Page' }, '/new/')
 
-      expect(wrapped.size).to eq(2)
-      expect(wrapped['/new/'].content.string).to eq('new content')
+      expect(view.unwrap.size).to eq(2)
+      expect(view.unwrap['/new/'].content.string).to eq('new content')
+    end
+
+    it 'does not update wrapped' do
+      view.create('new content', { title: 'New Page' }, '/new/')
+
+      expect(wrapped.size).to eq(1)
+      expect(wrapped['/new']).to be_nil
     end
 
     it 'returns self' do

data/spec/nanoc/cli/commands/compile/file_action_printer_spec.rb

@@ -14,7 +14,7 @@ describe Nanoc::CLI::Commands::Compile::FileActionPrinter, stdio: true do
 
   let(:rep) do
     Nanoc::Int::ItemRep.new(item, :default).tap do |rep|
-      rep.raw_paths = { default: '/hi.html' }
+      rep.raw_paths = { default: ['/hi.html'] }
     end
   end