nanoc 4.8.2 → 4.8.3

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

@@ -53,15 +53,15 @@ describe Nanoc::ItemWithRepsView do
     subject { view.parent }
 
     context 'with parent' do
-      let(:parent_item) do
-        Nanoc::Int::Item.new('parent', {}, '/parent/')
-      end
-
       context 'full identifier' do
         let(:identifier) do
           Nanoc::Identifier.new('/parent/me.md')
         end
 
+        let(:parent_item) do
+          Nanoc::Int::Item.new('parent', {}, '/parent.md')
+        end
+
         it 'raises' do
           expect { subject }.to raise_error(Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem)
         end
@@ -72,6 +72,10 @@ describe Nanoc::ItemWithRepsView do
           Nanoc::Identifier.new('/parent/me/', type: :legacy)
         end
 
+        let(:parent_item) do
+          Nanoc::Int::Item.new('parent', {}, Nanoc::Identifier.new('/parent/', type: :legacy))
+        end
+
         it 'returns a view for the parent' do
           expect(subject.class).to eql(Nanoc::ItemWithRepsView)
           expect(subject.unwrap).to eql(parent_item)
@@ -91,8 +95,9 @@ describe Nanoc::ItemWithRepsView do
         end
 
         context 'with root parent' do
-          let(:parent_item) { Nanoc::Int::Item.new('parent', {}, '/') }
+          let(:parent_item) { Nanoc::Int::Item.new('parent', {}, parent_identifier) }
           let(:identifier) { Nanoc::Identifier.new('/me/', type: :legacy) }
+          let(:parent_identifier) { Nanoc::Identifier.new('/', type: :legacy) }
 
           it 'returns a view for the parent' do
             expect(subject.class).to eql(Nanoc::ItemWithRepsView)
@@ -133,10 +138,6 @@ describe Nanoc::ItemWithRepsView do
       Nanoc::Int::Item.new('me', {}, identifier)
     end
 
-    let(:children) do
-      [Nanoc::Int::Item.new('child', {}, '/me/child/')]
-    end
-
     let(:view) { described_class.new(item, view_context) }
 
     let(:items) do
@@ -156,6 +157,10 @@ describe Nanoc::ItemWithRepsView do
         Nanoc::Identifier.new('/me.md')
       end
 
+      let(:children) do
+        [Nanoc::Int::Item.new('child', {}, '/me/child.md')]
+      end
+
       it 'raises' do
         expect { subject }.to raise_error(Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem)
       end
@@ -166,6 +171,10 @@ describe Nanoc::ItemWithRepsView do
         Nanoc::Identifier.new('/me/', type: :legacy)
       end
 
+      let(:children) do
+        [Nanoc::Int::Item.new('child', {}, Nanoc::Identifier.new('/me/child/', type: :legacy))]
+      end
+
       it 'returns views for the children' do
         expect(subject.size).to eql(1)
         expect(subject[0].class).to eql(Nanoc::ItemWithRepsView)
@@ -208,7 +217,7 @@ describe Nanoc::ItemWithRepsView do
     let(:view) { described_class.new(item, view_context) }
 
     let(:item) do
-      Nanoc::Int::Item.new('content', {}, '/asdf/')
+      Nanoc::Int::Item.new('content', {}, '/asdf')
     end
 
     let(:reps) do
@@ -355,11 +364,11 @@ describe Nanoc::ItemWithRepsView do
   end
 
   describe '#inspect' do
-    let(:item) { Nanoc::Int::Item.new('content', {}, '/asdf/') }
+    let(:item) { Nanoc::Int::Item.new('content', {}, '/asdf') }
     let(:view) { described_class.new(item, nil) }
 
     subject { view.inspect }
 
-    it { is_expected.to eql('<Nanoc::ItemWithRepsView identifier=/asdf/>') }
+    it { is_expected.to eql('<Nanoc::ItemWithRepsView identifier=/asdf>') }
   end
 end

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

@@ -6,11 +6,11 @@ describe Nanoc::LayoutView do
   it_behaves_like 'a document view'
 
   describe '#inspect' do
-    let(:item) { Nanoc::Int::Layout.new('content', {}, '/asdf/') }
+    let(:item) { Nanoc::Int::Layout.new('content', {}, '/asdf') }
     let(:view) { described_class.new(item, nil) }
 
     subject { view.inspect }
 
-    it { is_expected.to eql('<Nanoc::LayoutView identifier=/asdf/>') }
+    it { is_expected.to eql('<Nanoc::LayoutView identifier=/asdf>') }
   end
 end

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

@@ -17,7 +17,7 @@ shared_examples 'a mutable document view' do
   let(:snapshot_repo) { double(:snapshot_repo) }
 
   describe '#raw_content=' do
-    let(:document) { entity_class.new('content', {}, '/asdf/') }
+    let(:document) { entity_class.new('content', {}, '/asdf') }
 
     it 'sets raw content' do
       expect { view.raw_content = 'donkey' }
@@ -28,7 +28,7 @@ shared_examples 'a mutable document view' do
   end
 
   describe '#[]=' do
-    let(:document) { entity_class.new('content', {}, '/asdf/') }
+    let(:document) { entity_class.new('content', {}, '/asdf') }
 
     it 'sets attributes' do
       view[:title] = 'Donkey'
@@ -89,7 +89,7 @@ shared_examples 'a mutable document view' do
   end
 
   describe '#update_attributes' do
-    let(:document) { entity_class.new('content', {}, '/asdf/') }
+    let(:document) { entity_class.new('content', {}, '/asdf') }
 
     let(:update) { { friend: 'Giraffe' } }
 

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

@@ -13,22 +13,22 @@ shared_examples 'a mutable identifiable collection' do
     let(:wrapped) do
       collection_class.new(
         config,
-        [double(:identifiable, identifier: Nanoc::Identifier.new('/asdf/'))],
+        [double(:identifiable, identifier: Nanoc::Identifier.new('/asdf'))],
       )
     end
 
     it 'deletes matching' do
-      view.delete_if { |i| i.identifier == '/asdf/' }
+      view.delete_if { |i| i.identifier == '/asdf' }
       expect(view.unwrap).to be_empty
     end
 
     it 'does not mutate' do
-      view.delete_if { |i| i.identifier == '/asdf/' }
+      view.delete_if { |i| i.identifier == '/asdf' }
       expect(wrapped).not_to be_empty
     end
 
     it 'deletes no non-matching' do
-      view.delete_if { |i| i.identifier == '/blah/' }
+      view.delete_if { |i| i.identifier == '/blah' }
       expect(wrapped).not_to be_empty
     end
 

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

@@ -12,7 +12,7 @@ describe Nanoc::MutableItemCollectionView do
 
   describe '#create' do
     let(:item) do
-      Nanoc::Int::Layout.new('content', {}, '/asdf/')
+      Nanoc::Int::Layout.new('content', {}, '/asdf')
     end
 
     let(:wrapped) do
@@ -22,21 +22,21 @@ describe Nanoc::MutableItemCollectionView do
     let(:view) { described_class.new(wrapped, nil) }
 
     it 'creates an object' do
-      view.create('new content', { title: 'New Page' }, '/new/')
+      view.create('new content', { title: 'New Page' }, '/new')
 
       expect(view.unwrap.size).to eq(2)
-      expect(view.unwrap['/new/'].content.string).to eq('new content')
+      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/')
+      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
-      ret = view.create('new content', { title: 'New Page' }, '/new/')
+      ret = view.create('new content', { title: 'New Page' }, '/new')
       expect(ret).to equal(view)
     end
   end

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

@@ -4,7 +4,7 @@ describe Nanoc::MutableItemView do
   let(:entity_class) { Nanoc::Int::Item }
   it_behaves_like 'a mutable document view'
 
-  let(:item) { entity_class.new('content', {}, '/asdf/') }
+  let(:item) { entity_class.new('content', {}, '/asdf') }
   let(:view) { described_class.new(item, nil) }
 
   it 'does have rep access' do
@@ -14,11 +14,11 @@ describe Nanoc::MutableItemView do
   end
 
   describe '#inspect' do
-    let(:item) { Nanoc::Int::Item.new('content', {}, '/asdf/') }
+    let(:item) { Nanoc::Int::Item.new('content', {}, '/asdf') }
     let(:view) { described_class.new(item, nil) }
 
     subject { view.inspect }
 
-    it { is_expected.to eql('<Nanoc::MutableItemView identifier=/asdf/>') }
+    it { is_expected.to eql('<Nanoc::MutableItemView identifier=/asdf>') }
   end
 end

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

@@ -12,7 +12,7 @@ describe Nanoc::MutableLayoutCollectionView do
 
   describe '#create' do
     let(:layout) do
-      Nanoc::Int::Layout.new('content', {}, '/asdf/')
+      Nanoc::Int::Layout.new('content', {}, '/asdf')
     end
 
     let(:wrapped) do
@@ -22,21 +22,21 @@ describe Nanoc::MutableLayoutCollectionView do
     let(:view) { described_class.new(wrapped, nil) }
 
     it 'creates an object' do
-      view.create('new content', { title: 'New Page' }, '/new/')
+      view.create('new content', { title: 'New Page' }, '/new')
 
       expect(view.unwrap.size).to eq(2)
-      expect(view.unwrap['/new/'].content.string).to eq('new content')
+      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/')
+      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
-      ret = view.create('new content', { title: 'New Page' }, '/new/')
+      ret = view.create('new content', { title: 'New Page' }, '/new')
       expect(ret).to equal(view)
     end
   end

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

@@ -5,11 +5,11 @@ describe Nanoc::MutableLayoutView do
   it_behaves_like 'a mutable document view'
 
   describe '#inspect' do
-    let(:item) { Nanoc::Int::Item.new('content', {}, '/asdf/') }
+    let(:item) { Nanoc::Int::Item.new('content', {}, '/asdf') }
     let(:view) { described_class.new(item, nil) }
 
     subject { view.inspect }
 
-    it { is_expected.to eql('<Nanoc::MutableLayoutView identifier=/asdf/>') }
+    it { is_expected.to eql('<Nanoc::MutableLayoutView identifier=/asdf>') }
   end
 end

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

@@ -2,7 +2,7 @@
 
 describe Nanoc::PostCompileItemRepView do
   let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
-  let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+  let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo') }
   let(:view) { described_class.new(item_rep, view_context) }
 
   let(:view_context) do

data/spec/nanoc/cli/command_runner_spec.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+describe Nanoc::CLI::CommandRunner, stdio: true do
+  describe '.find_site_dir' do
+    subject { described_class.find_site_dir }
+
+    context 'config file in current dir' do
+      before { File.write('nanoc.yaml', 'hi') }
+
+      it 'returns the current dir' do
+        expect(subject).to eq(File.expand_path(Dir.getwd))
+      end
+    end
+
+    context 'config file in parent dir' do
+      around do |ex|
+        FileUtils.mkdir_p('root/sub')
+        File.write('root/nanoc.yaml', 'hi')
+        chdir('root/sub') { ex.run }
+      end
+
+      it 'returns the parent dir' do
+        expect(subject).to match(/root$/)
+      end
+    end
+
+    context 'config file in grandparent dir' do
+      around do |ex|
+        FileUtils.mkdir_p('root/sub1/sub2')
+        File.write('root/nanoc.yaml', 'hi')
+        chdir('root/sub1/sub2') { ex.run }
+      end
+
+      it 'returns the parent dir' do
+        expect(subject).to match(/root$/)
+      end
+    end
+
+    context 'no config file in ancestral paths' do
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+  end
+
+  describe '.enter_site_dir' do
+    subject do
+      described_class.enter_site_dir
+      Dir.getwd
+    end
+
+    context 'config file in current dir' do
+      before { File.write('nanoc.yaml', 'hi') }
+
+      it 'returns the current dir' do
+        expect(subject).to eq(File.expand_path(Dir.getwd))
+      end
+    end
+
+    context 'config file in parent dir' do
+      around do |ex|
+        FileUtils.mkdir_p('root/sub')
+        File.write('root/nanoc.yaml', 'hi')
+        chdir('root/sub') { ex.run }
+      end
+
+      it 'returns the parent dir' do
+        expect(subject).to match(/root$/)
+      end
+    end
+
+    context 'config file in grandparent dir' do
+      around do |ex|
+        FileUtils.mkdir_p('root/sub1/sub2')
+        File.write('root/nanoc.yaml', 'hi')
+        chdir('root/sub1/sub2') { ex.run }
+      end
+
+      it 'enters the parent dir' do
+        expect(subject).to match(/root$/)
+      end
+    end
+
+    context 'no config file in ancestral paths' do
+      it 'raises' do
+        expect { subject }.to raise_error(::Nanoc::Int::Errors::GenericTrivial, 'The current working directory, nor any of its parents, seems to be a Nanoc site.')
+      end
+    end
+  end
+end

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

@@ -107,6 +107,7 @@ describe Nanoc::CLI::Commands::ShowRules, stdio: true do
 
     before do
       expect(compiler).to receive(:build_reps).once
+      expect(Nanoc::CLI::CommandRunner).to receive(:find_site_dir).and_return(Dir.getwd)
     end
 
     it 'writes item and layout rules to stdout' do

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

@@ -58,5 +58,18 @@ describe Nanoc::CLI::Commands::View, site: true, stdio: true do
         expect(Net::HTTP.get('127.0.0.1', '/', 50_385)).to eql("File not found: /\n")
       end
     end
+
+    it 'does not listen on non-local interfaces' do
+      addresses = Socket.getifaddrs.map(&:addr).select(&:ipv4?).map(&:ip_address)
+      non_local_addresses = addresses - ['127.0.0.1']
+
+      if non_local_addresses.empty?
+        skip 'Need non-local network interfaces for this spec'
+      end
+
+      run_nanoc_cmd(['view', '--port', '50385']) do
+        expect { Net::HTTP.get(non_local_addresses[0], '/', 50_385) }.to raise_error(Errno::ECONNREFUSED)
+      end
+    end
   end
 end

data/spec/nanoc/cli_spec.rb

@@ -6,7 +6,7 @@ describe Nanoc::CLI do
   end
 
   let(:exceptions) do
-    # FIXME: Get rid of these exceptions by Nanoc 5.0
+    # FIXME: [Nanoc 5] Get rid of these exceptions
     [
       ['deploy', ['C']],
       ['help', ['v']],

data/spec/nanoc/data_sources/filesystem_spec.rb

@@ -47,7 +47,7 @@ describe Nanoc::DataSources::Filesystem do
 
           expect(subject[0].content.string).to eq('test 1')
           expect(subject[0].attributes).to eq(expected_attributes)
-          expect(subject[0].identifier).to eq(Nanoc::Identifier.new('/bar/'))
+          expect(subject[0].identifier).to eq(Nanoc::Identifier.new('/bar/', type: :legacy))
           expect(subject[0].checksum_data).to be_nil
           expect(subject[0].attributes_checksum_data).to be_a(String)
           expect(subject[0].attributes_checksum_data.size).to eq(20)

data/spec/nanoc/helpers/blogging_spec.rb

@@ -10,13 +10,13 @@ describe Nanoc::Helpers::Blogging, helper: true do
     subject { helper.articles }
 
     before do
-      ctx.create_item('blah', { kind: 'item' }, '/0/')
-      ctx.create_item('blah blah', { kind: 'article' }, '/1/')
-      ctx.create_item('blah blah blah', { kind: 'article' }, '/2/')
+      ctx.create_item('blah', { kind: 'item' }, '/0')
+      ctx.create_item('blah blah', { kind: 'article' }, '/1')
+      ctx.create_item('blah blah blah', { kind: 'article' }, '/2')
     end
 
     it 'returns the two articles' do
-      expect(subject.map(&:identifier)).to match_array(['/1/', '/2/'])
+      expect(subject.map(&:identifier)).to match_array(['/1', '/2'])
     end
   end
 
@@ -25,28 +25,28 @@ describe Nanoc::Helpers::Blogging, helper: true do
 
     before do
       attrs = { kind: 'item' }
-      ctx.create_item('blah', attrs, '/0/')
+      ctx.create_item('blah', attrs, '/0')
 
       attrs = { kind: 'article', created_at: (Date.today - 1).to_s }
-      ctx.create_item('blah blah', attrs, '/1/')
+      ctx.create_item('blah blah', attrs, '/1')
 
       attrs = { kind: 'article', created_at: (Time.now - 500).to_s }
-      ctx.create_item('blah blah blah', attrs, '/2/')
+      ctx.create_item('blah blah blah', attrs, '/2')
     end
 
     it 'returns the two articles in descending order' do
-      expect(subject.map(&:identifier)).to eq(['/2/', '/1/'])
+      expect(subject.map(&:identifier)).to eq(['/2', '/1'])
     end
   end
 
   describe '#url_for' do
-    subject { helper.url_for(ctx.items['/stuff/']) }
+    subject { helper.url_for(ctx.items['/stuff']) }
 
     let(:item_attributes) { {} }
 
     before do
-      ctx.create_item('Stuff', item_attributes, '/stuff/')
-      ctx.create_rep(ctx.items['/stuff/'], '/rep/path/stuff.html')
+      ctx.create_item('Stuff', item_attributes, '/stuff')
+      ctx.create_rep(ctx.items['/stuff'], '/rep/path/stuff.html')
 
       ctx.config[:base_url] = base_url
     end
@@ -98,10 +98,10 @@ describe Nanoc::Helpers::Blogging, helper: true do
     let(:item_attributes) { {} }
 
     before do
-      ctx.create_item('Feed', item_attributes, '/feed/')
-      ctx.create_rep(ctx.items['/feed/'], '/feed.xml')
+      ctx.create_item('Feed', item_attributes, '/feed')
+      ctx.create_rep(ctx.items['/feed'], '/feed.xml')
 
-      ctx.item = ctx.items['/feed/']
+      ctx.item = ctx.items['/feed']
       ctx.config[:base_url] = base_url
     end
 
@@ -166,15 +166,15 @@ describe Nanoc::Helpers::Blogging, helper: true do
   end
 
   describe '#atom_tag_for' do
-    subject { helper.atom_tag_for(ctx.items['/stuff/']) }
+    subject { helper.atom_tag_for(ctx.items['/stuff']) }
 
     let(:item_attributes) { { created_at: '2015-05-19 12:34:56' } }
     let(:item_rep_path) { '/stuff.xml' }
     let(:base_url) { 'http://url.base' }
 
     before do
-      ctx.create_item('Stuff', item_attributes, '/stuff/')
-      ctx.create_rep(ctx.items['/stuff/'], item_rep_path)
+      ctx.create_item('Stuff', item_attributes, '/stuff')
+      ctx.create_rep(ctx.items['/stuff'], item_rep_path)
 
       ctx.config[:base_url] = base_url
     end
@@ -186,7 +186,7 @@ describe Nanoc::Helpers::Blogging, helper: true do
 
     context 'item without path' do
       let(:item_rep_path) { nil }
-      it { is_expected.to eql('tag:url.base,2015-05-19:/stuff/') }
+      it { is_expected.to eql('tag:url.base,2015-05-19:/stuff') }
     end
 
     context 'bare URL without subdir' do