nanoc 4.6.3 → 4.6.4

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.6.3'.freeze
+  VERSION = '4.6.4'.freeze
 end

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

@@ -27,7 +27,7 @@ describe Nanoc::CLI::Commands::Compile::TimingRecorder, stdio: true do
     Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :erb)
 
     expect { listener.stop }
-      .to output(/^erb \|     1   1\.00s   1\.00s   1\.00s   1\.00s$/).to_stdout
+      .to output(/^erb │     1   1\.00s   1\.00s   1\.00s   1\.00s$/).to_stdout
   end
 
   it 'records multiple from filtering_started to filtering_ended' do
@@ -43,7 +43,39 @@ describe Nanoc::CLI::Commands::Compile::TimingRecorder, stdio: true do
     Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :erb)
 
     expect { listener.stop }
-      .to output(/^erb \|     2   1\.00s   1\.50s   2\.00s   3\.00s$/).to_stdout
+      .to output(/^erb │     2   1\.00s   1\.50s   2\.00s   3\.00s$/).to_stdout
+  end
+
+  it 'records inner filters in nested filtering_started/filtering_ended' do
+    listener.start
+
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 0))
+    Nanoc::Int::NotificationCenter.post(:filtering_started, rep, :outer)
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 1))
+    Nanoc::Int::NotificationCenter.post(:filtering_started, rep, :inner)
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 3))
+    Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :inner)
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 6))
+    Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :outer)
+
+    expect { listener.stop }
+      .to output(/^inner │     1   2\.00s   2\.00s   2\.00s   2\.00s$/).to_stdout
+  end
+
+  it 'records outer filters in nested filtering_started/filtering_ended' do
+    listener.start
+
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 0))
+    Nanoc::Int::NotificationCenter.post(:filtering_started, rep, :outer)
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 1))
+    Nanoc::Int::NotificationCenter.post(:filtering_started, rep, :inner)
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 3))
+    Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :inner)
+    Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 6))
+    Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :outer)
+
+    expect { listener.stop }
+      .to output(/^outer │     1   6\.00s   6\.00s   6\.00s   6\.00s$/).to_stdout
   end
 
   it 'records single from filtering_started over compilation_{suspended,started} to filtering_ended' do
@@ -59,8 +91,7 @@ describe Nanoc::CLI::Commands::Compile::TimingRecorder, stdio: true do
     Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 7))
     Nanoc::Int::NotificationCenter.post(:filtering_ended, rep, :erb)
 
-    # FIXME: wrong count (should be 1, not 2)
     expect { listener.stop }
-      .to output(/^erb \|     2   1\.00s   2\.50s   4\.00s   5\.00s$/).to_stdout
+      .to output(/^erb │     1   5\.00s   5\.00s   5\.00s   5\.00s$/).to_stdout
   end
 end

data/spec/nanoc/cli/stream_cleaners/utf8_spec.rb

@@ -0,0 +1,7 @@
+describe Nanoc::CLI::StreamCleaners::UTF8 do
+  subject { described_class.new }
+
+  it 'handles all cases' do
+    expect(subject.clean('┼─ “© Denis” ‘and others…’ ─┼')).to eq('+- "(c) Denis" \'and others...\' -+')
+  end
+end

data/spec/nanoc/helpers/blogging_spec.rb

@@ -43,8 +43,8 @@ describe Nanoc::Helpers::Blogging, helper: true do
     let(:item_attributes) { {} }
 
     before do
-      item = ctx.create_item('Stuff', item_attributes, '/stuff/')
-      ctx.create_rep(item, '/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
@@ -96,9 +96,10 @@ describe Nanoc::Helpers::Blogging, helper: true do
     let(:item_attributes) { {} }
 
     before do
-      ctx.item = ctx.create_item('Feed', item_attributes, '/feed/')
-      ctx.create_rep(ctx.item, '/feed.xml')
+      ctx.create_item('Feed', item_attributes, '/feed/')
+      ctx.create_rep(ctx.items['/feed/'], '/feed.xml')
 
+      ctx.item = ctx.items['/feed/']
       ctx.config[:base_url] = base_url
     end
 
@@ -170,8 +171,8 @@ describe Nanoc::Helpers::Blogging, helper: true do
     let(:base_url) { 'http://url.base' }
 
     before do
-      item = ctx.create_item('Stuff', item_attributes, '/stuff/')
-      ctx.create_rep(item, 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

data/spec/nanoc/helpers/capturing_spec.rb

@@ -1,8 +1,9 @@
 describe Nanoc::Helpers::Capturing, helper: true do
   describe '#content_for' do
     before do
-      ctx.item = ctx.create_item('some content', {}, '/about.md')
-      ctx.create_rep(ctx.item, '/about.html')
+      ctx.create_item('some content', {}, '/about.md')
+      ctx.create_rep(ctx.items['/about.md'], '/about.html')
+      ctx.item = ctx.items['/about.md']
     end
 
     describe 'setting content' do
@@ -148,8 +149,8 @@ describe Nanoc::Helpers::Capturing, helper: true do
         let(:item) { ctx.items['/other.md'] }
 
         before do
-          item = ctx.create_item('other content', {}, '/other.md')
-          ctx.create_rep(item, '/other.html')
+          ctx.create_item('other content', {}, '/other.md')
+          ctx.create_rep(ctx.items['/other.md'], '/other.html')
         end
 
         context 'other item is not yet compiled' do

data/spec/nanoc/helpers/child_parent_spec.rb

@@ -2,49 +2,35 @@ describe Nanoc::Helpers::ChildParent, helper: true do
   describe '#children_of' do
     subject { helper.children_of(item) }
 
-    let(:item) { ctx.create_item('some content', {}, identifier) }
+    before { ctx.create_item('some content', {}, identifier) }
+    let(:item) { ctx.items[identifier] }
 
     context 'legacy identifier' do
       let(:identifier) { Nanoc::Identifier.new('/foo/', type: :legacy) }
 
-      let!(:child_item) do
+      before do
         ctx.create_item('abc', {}, Nanoc::Identifier.new('/foo/a/', type: :legacy))
-      end
-
-      let!(:grandchild_item) do
         ctx.create_item('def', {}, Nanoc::Identifier.new('/foo/a/b/', type: :legacy))
-      end
-
-      let!(:sibling_item) do
         ctx.create_item('xyz', {}, Nanoc::Identifier.new('/bar/', type: :legacy))
       end
 
       it 'returns only direct children' do
-        expect(subject).to eql([child_item])
+        expect(subject).to eql([ctx.items['/foo/a/']])
       end
     end
 
     context 'full identifier' do
       let(:identifier) { Nanoc::Identifier.new('/foo.md', type: :full) }
 
-      let!(:child_item) do
+      before do
         ctx.create_item('abc', {}, Nanoc::Identifier.new('/foo/a.md', type: :full))
-      end
-
-      let!(:grandchild_item) do
         ctx.create_item('def', {}, Nanoc::Identifier.new('/foo/a/b.md', type: :full))
-      end
-
-      let!(:sibling_item) do
         ctx.create_item('xyz', {}, Nanoc::Identifier.new('/bar.md', type: :full))
-      end
-
-      let!(:index_child_item) do
         ctx.create_item('xyz', {}, Nanoc::Identifier.new('/foo/a/index.md', type: :full))
       end
 
       it 'returns only direct children' do
-        expect(subject).to eql([child_item])
+        expect(subject).to eql([ctx.items['/foo/a.md']])
       end
     end
   end
@@ -52,53 +38,36 @@ describe Nanoc::Helpers::ChildParent, helper: true do
   describe '#parent_of' do
     subject { helper.parent_of(item) }
 
-    let(:item) { ctx.create_item('some content', {}, identifier) }
+    before { ctx.create_item('some content', {}, identifier) }
+    let(:item) { ctx.items[identifier] }
 
     context 'legacy identifier' do
       let(:identifier) { Nanoc::Identifier.new('/foo/bar/', type: :legacy) }
 
-      let!(:parent_item) do
+      before do
         ctx.create_item('abc', {}, Nanoc::Identifier.new('/foo/', type: :legacy))
-      end
-
-      let!(:sibling_item) do
         ctx.create_item('def', {}, Nanoc::Identifier.new('/foo/qux/', type: :legacy))
-      end
-
-      let!(:child_item) do
         ctx.create_item('xyz', {}, Nanoc::Identifier.new('/foo/bar/asdf/', type: :legacy))
-      end
-
-      let!(:grandparent_item) do
         ctx.create_item('opq', {}, Nanoc::Identifier.new('/', type: :legacy))
       end
 
       it 'returns parent' do
-        expect(subject).to eql(parent_item)
+        expect(subject).to eql(ctx.items['/foo/'])
       end
     end
 
     context 'full identifier' do
       let(:identifier) { Nanoc::Identifier.new('/foo/bar.md', type: :full) }
 
-      let!(:parent_item) do
+      before do
         ctx.create_item('abc', {}, Nanoc::Identifier.new('/foo.md', type: :full))
-      end
-
-      let!(:sibling_item) do
         ctx.create_item('def', {}, Nanoc::Identifier.new('/foo/qux.md', type: :full))
-      end
-
-      let!(:child_item) do
         ctx.create_item('xyz', {}, Nanoc::Identifier.new('/foo/bar/asdf.md', type: :full))
-      end
-
-      let!(:grandparent_item) do
         ctx.create_item('opq', {}, Nanoc::Identifier.new('/index.md', type: :full))
       end
 
       it 'returns parent' do
-        expect(subject).to eql(parent_item)
+        expect(subject).to eql(ctx.items['/foo.md'])
       end
     end
   end

data/spec/nanoc/helpers/filtering_spec.rb

@@ -1,8 +1,11 @@
 describe Nanoc::Helpers::Filtering, helper: true do
   describe '#filter' do
     before do
-      ctx.item = ctx.create_item('some content', { title: 'Hello!' }, '/about.md')
-      ctx.item_rep = ctx.create_rep(ctx.item, '/about.html')
+      ctx.create_item('some content', { title: 'Hello!' }, '/about.md')
+      ctx.create_rep(ctx.items['/about.md'], '/about.html')
+
+      ctx.item = ctx.items['/about.md']
+      ctx.item_rep = ctx.item.reps[:default]
     end
 
     let(:content) do

data/spec/nanoc/helpers/link_to_spec.rb

@@ -33,14 +33,22 @@ describe Nanoc::Helpers::LinkTo, helper: true do
     end
 
     context 'with rep' do
-      let(:item) { ctx.create_item('content', {}, '/target/') }
-      let(:target) { ctx.create_rep(item, '/target.html') }
+      before do
+        ctx.create_item('content', {}, '/target/')
+        ctx.create_rep(ctx.items['/target/'], '/target.html')
+      end
+
+      let(:target) { ctx.items['/target/'].reps[:default] }
 
       it { is_expected.to eql('<a href="/target.html">Text</a>') }
     end
 
     context 'with item' do
-      let(:target) { ctx.create_item('content', {}, '/target/') }
+      before do
+        ctx.create_item('content', {}, '/target/')
+      end
+
+      let(:target) { ctx.items['/target/'] }
 
       before do
         ctx.create_rep(target, '/target.html')
@@ -66,8 +74,12 @@ describe Nanoc::Helpers::LinkTo, helper: true do
     end
 
     context 'with nil path' do
-      let(:item) { ctx.create_item('content', {}, '/target/') }
-      let(:target) { ctx.create_rep(item, nil) }
+      before do
+        ctx.create_item('content', {}, '/target/')
+        ctx.create_rep(ctx.items['/target/'], nil)
+      end
+
+      let(:target) { ctx.items['/target/'].reps[:default] }
 
       it 'raises' do
         expect { subject }.to raise_error(RuntimeError)
@@ -87,8 +99,11 @@ describe Nanoc::Helpers::LinkTo, helper: true do
 
       context 'current' do
         before do
-          ctx.item = ctx.create_item('content', {}, '/target.md')
-          ctx.item_rep = ctx.create_rep(ctx.item, '/target.html')
+          ctx.create_item('content', {}, '/target.md')
+          ctx.create_rep(ctx.items['/target.md'], '/target.html')
+
+          ctx.item = ctx.items['/target.md']
+          ctx.item_rep = ctx.item.reps[:default]
         end
 
         it { is_expected.to eql('<span class="active">Text</span>') }
@@ -100,8 +115,11 @@ describe Nanoc::Helpers::LinkTo, helper: true do
 
       context 'item rep present, but not current' do
         before do
-          ctx.item = ctx.create_item('content', {}, '/other.md')
-          ctx.item_rep = ctx.create_rep(ctx.item, '/other.html')
+          ctx.create_item('content', {}, '/other.md')
+          ctx.create_rep(ctx.items['/other.md'], '/other.html')
+
+          ctx.item = ctx.items['/other.md']
+          ctx.item_rep = ctx.item.reps[:default]
         end
 
         it { is_expected.to eql('<a href="/target.html">Text</a>') }
@@ -110,12 +128,18 @@ describe Nanoc::Helpers::LinkTo, helper: true do
 
     context 'with rep' do
       before do
-        ctx.item = ctx.create_item('content', {}, '/target.md')
-        ctx.item_rep = ctx.create_rep(ctx.item, '/target.html')
+        ctx.create_item('content', {}, '/target.md')
+        ctx.create_rep(ctx.items['/target.md'], '/target.html')
+
+        ctx.create_item('content', {}, '/other.md')
+        ctx.create_rep(ctx.items['/other.md'], '/other.html')
+
+        ctx.item = ctx.items['/target.md']
+        ctx.item_rep = ctx.item.reps[:default]
       end
 
-      let(:some_item) { ctx.create_item('content', {}, '/other.md') }
-      let(:some_item_rep) { ctx.create_rep(some_item, '/other.html') }
+      let(:some_item) { ctx.items['/other.md'] }
+      let(:some_item_rep) { some_item.reps[:default] }
 
       context 'current' do
         let(:target) { ctx.item_rep }
@@ -141,12 +165,18 @@ describe Nanoc::Helpers::LinkTo, helper: true do
 
     context 'with item' do
       before do
-        ctx.item = ctx.create_item('content', {}, '/target.md')
-        ctx.item_rep = ctx.create_rep(ctx.item, '/target.html')
+        ctx.create_item('content', {}, '/target.md')
+        ctx.create_rep(ctx.items['/target.md'], '/target.html')
+
+        ctx.create_item('content', {}, '/other.md')
+        ctx.create_rep(ctx.items['/other.md'], '/other.html')
+
+        ctx.item = ctx.items['/target.md']
+        ctx.item_rep = ctx.item.reps[:default]
       end
 
-      let!(:some_item) { ctx.create_item('content', {}, '/other.md') }
-      let!(:some_item_rep) { ctx.create_rep(some_item, '/other.html') }
+      let(:some_item) { ctx.items['/other.md'] }
+      let(:some_item_rep) { some_item.reps[:default] }
 
       context 'current' do
         let(:target) { ctx.item }
@@ -175,8 +205,11 @@ describe Nanoc::Helpers::LinkTo, helper: true do
     subject { helper.relative_path_to(target) }
 
     before do
-      ctx.item = ctx.create_item('content', {}, '/foo/self.md')
-      ctx.item_rep = ctx.create_rep(ctx.item, self_path)
+      ctx.create_item('content', {}, '/foo/self.md')
+      ctx.create_rep(ctx.items['/foo/self.md'], self_path)
+
+      ctx.item = ctx.items['/foo/self.md']
+      ctx.item_rep = ctx.item.reps[:default]
     end
 
     context 'current item rep has non-nil path' do
@@ -214,7 +247,12 @@ describe Nanoc::Helpers::LinkTo, helper: true do
       end
 
       context 'to rep' do
-        let(:target) { ctx.create_rep(ctx.item, '/bar/target.html') }
+        before do
+          ctx.create_rep(ctx.item, '/bar/target.html', :special)
+        end
+
+        let(:target) { ctx.item.reps[:special] }
+
         it { is_expected.to eql('../bar/target.html') }
 
         context 'to self' do
@@ -232,10 +270,11 @@ describe Nanoc::Helpers::LinkTo, helper: true do
       end
 
       context 'to item' do
-        let(:target) { ctx.create_item('content', {}, '/bar/target.md') }
+        let(:target) { ctx.items['/bar/target.md'] }
 
         before do
-          ctx.create_rep(target, '/bar/target.html')
+          ctx.create_item('content', {}, '/bar/target.md')
+          ctx.create_rep(ctx.items['/bar/target.md'], '/bar/target.html')
         end
 
         it { is_expected.to eql('../bar/target.html') }
@@ -255,7 +294,11 @@ describe Nanoc::Helpers::LinkTo, helper: true do
       end
 
       context 'to nil path' do
-        let(:target) { ctx.create_rep(ctx.item, nil) }
+        let(:target) { ctx.item.reps[:special] }
+
+        before do
+          ctx.create_rep(ctx.item, nil, :special)
+        end
 
         it 'raises' do
           expect { subject }.to raise_error(RuntimeError)

data/spec/nanoc/helpers/rendering_spec.rb

@@ -6,15 +6,11 @@ describe Nanoc::Helpers::Rendering, helper: true do
       [Nanoc::Int::ProcessingActions::Filter.new(:erb, {})]
     end
 
-    let(:layout_view) do
-      ctx.create_layout(layout_content, {}, layout_identifier)
-    end
-
-    let(:layout) do
-      layout_view.unwrap
-    end
+    let(:layout_view) { ctx.layouts[layout_identifier] }
+    let(:layout) { layout_view.unwrap }
 
     before do
+      ctx.create_layout(layout_content, {}, layout_identifier)
       ctx.update_rule_memory(layout, rule_memory_for_layout)
     end
 

data/spec/nanoc/spec_spec.rb

@@ -0,0 +1,68 @@
+describe Nanoc::Spec::HelperContext do
+  let(:helper) do
+    Module.new {}
+  end
+
+  subject(:ctx) { described_class.new(helper) }
+
+  it 'has no items by default' do
+    # TODO: Add #empty? to item collection view
+    expect(subject.items.size).to eq(0)
+  end
+
+  it 'has no layouts by default' do
+    # TODO: Add #empty? to item collection view
+    expect(subject.layouts.size).to eq(0)
+  end
+
+  describe '#create_item' do
+    subject { ctx.create_item('foo', {}, '/foo.md') }
+
+    it 'creates item' do
+      expect { subject }
+        .to change { ctx.items.size }
+        .from(0).to(1)
+    end
+
+    it 'creates item without reps' do
+      subject
+      expect(ctx.items['/foo.md'].reps.size).to eq(0)
+    end
+
+    it 'returns self' do
+      expect(subject).to eq(ctx)
+    end
+  end
+
+  describe '#create_layout' do
+    subject { ctx.create_layout('foo', {}, '/foo.md') }
+
+    it 'creates layout' do
+      expect { subject }
+        .to change { ctx.layouts.size }
+        .from(0).to(1)
+    end
+
+    it 'returns self' do
+      expect(subject).to eq(ctx)
+    end
+  end
+
+  describe '#create_rep' do
+    before do
+      ctx.create_item('foo', {}, '/foo.md')
+    end
+
+    subject { ctx.create_rep(ctx.items['/foo.md'], '/foo.html') }
+
+    it 'creates rep' do
+      expect { subject }
+        .to change { ctx.items['/foo.md'].reps.size }
+        .from(0).to(1)
+    end
+
+    it 'returns self' do
+      expect(subject).to eq(ctx)
+    end
+  end
+end