nanoc 4.6.1 → 4.6.2

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

@@ -14,7 +14,7 @@ describe Nanoc::CLI::Commands::Compile::TimingRecorder, 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
 

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

@@ -11,11 +11,14 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     let(:command) { double(:command) }
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |ic|
-        ic << item_about
-        ic << item_dog
-        ic << item_other
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          item_about,
+          item_dog,
+          item_other,
+        ],
+      )
     end
 
     let(:item_about) { Nanoc::Int::Item.new('About Me', {}, '/about.md') }
@@ -33,8 +36,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     end
 
     let(:layouts) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |ic|
-      end
+      Nanoc::Int::IdentifiableCollection.new(config)
     end
 
     it 'prints a legend' do

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

@@ -24,11 +24,14 @@ describe Nanoc::CLI::Commands::ShowRules, stdio: true do
     end
 
     let(:items) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |ic|
-        ic << Nanoc::Int::Item.new('About Me', {}, '/about.md')
-        ic << Nanoc::Int::Item.new('About My Dog', {}, '/dog.md')
-        ic << Nanoc::Int::Item.new('Raw Data', {}, '/other.dat')
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          Nanoc::Int::Item.new('About Me', {}, '/about.md'),
+          Nanoc::Int::Item.new('About My Dog', {}, '/dog.md'),
+          Nanoc::Int::Item.new('Raw Data', {}, '/other.dat'),
+        ],
+      )
     end
 
     let(:reps) do
@@ -42,11 +45,14 @@ describe Nanoc::CLI::Commands::ShowRules, stdio: true do
     end
 
     let(:layouts) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |ic|
-        ic << Nanoc::Int::Layout.new('Default', {}, '/default.erb')
-        ic << Nanoc::Int::Layout.new('Article', {}, '/article.haml')
-        ic << Nanoc::Int::Layout.new('Other', {}, '/other.xyzzy')
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          Nanoc::Int::Layout.new('Default', {}, '/default.erb'),
+          Nanoc::Int::Layout.new('Article', {}, '/article.haml'),
+          Nanoc::Int::Layout.new('Other', {}, '/other.xyzzy'),
+        ],
+      )
     end
 
     let(:config) { Nanoc::Int::Configuration.new }

data/spec/nanoc/regressions/gh_1037a_spec.rb

@@ -0,0 +1,29 @@
+describe 'GH-1037', site: true, stdio: true do
+  before do
+    File.write('content/giraffe.md', 'I am a giraffe!')
+    File.write('content/donkey.erb', '[<%= @items["/giraffe.*"].compiled_content(snapshot: :last) %>]')
+
+    File.write('Rules', <<EOS)
+  compile '/donkey.erb' do
+    filter :erb
+    write '/donkey.txt'
+  end
+
+  compile '/giraffe.*' do
+    write '/giraffe.txt'
+    write '/giraffe.md'
+  end
+EOS
+  end
+
+  it 'writes two files' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/giraffe.txt')).to eql('I am a giraffe!')
+    expect(File.read('output/giraffe.md')).to eql('I am a giraffe!')
+  end
+
+  it 'has the right :last snapshot' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/donkey.txt')).to eql('[I am a giraffe!]')
+  end
+end

data/spec/nanoc/regressions/gh_1037b_spec.rb

@@ -0,0 +1,18 @@
+describe 'GH-1037', site: true, stdio: true do
+  before do
+    File.write('content/foo.png', 'stuff')
+
+    File.write('Rules', <<EOS)
+  compile '/*.png' do
+    write '/foo-s3cr3t.png'
+  end
+
+  passthrough '/*.png'
+EOS
+  end
+
+  it 'writes one file' do
+    Nanoc::CLI.run(%w(compile))
+    expect(Dir['output/*']).to eql(['output/foo-s3cr3t.png'])
+  end
+end

data/spec/nanoc/regressions/gh_1082a_spec.rb

@@ -0,0 +1,18 @@
+describe 'GH-1082', site: true, stdio: true do
+  before do
+    File.write('content/a.erb', '<%= @items["/b.*"].binary? %>')
+    File.write('content/b.erb', 'stuff')
+
+    File.write('Rules', <<EOS)
+  compile '/*' do
+    filter :erb
+    write item.identifier.without_ext + '.txt'
+  end
+EOS
+  end
+
+  it 'requires /b to be compiled first' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/a.txt')).to eql('false')
+  end
+end

data/spec/nanoc/regressions/gh_1082b_spec.rb

@@ -0,0 +1,20 @@
+describe 'GH-1082', site: true, stdio: true do
+  before do
+    File.write('content/a.erb', '<%= @items["/b.*"].binary? %>')
+    File.write('content/b.dat', 'stuff')
+
+    File.write('Rules', <<EOS)
+  compile '/a.*' do
+    filter :erb
+    write item.identifier.without_ext + '.txt'
+  end
+
+  passthrough '/b.*'
+EOS
+  end
+
+  it 'requires /b to be compiled first' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/a.txt')).to eql('true')
+  end
+end

data/spec/nanoc/regressions/gh_1082c_spec.rb

@@ -0,0 +1,19 @@
+describe 'GH-1082', site: true, stdio: true do
+  before do
+    File.write('content/a.erb', '<%= @items["/b.*"].reps[:default].binary? %>')
+    File.write('content/b.erb', '<%= @items["/a.*"].reps[:default].binary? %>')
+
+    File.write('Rules', <<EOS)
+  compile '/*' do
+    filter :erb
+    write item.identifier.without_ext + '.txt'
+  end
+EOS
+  end
+
+  it 'does not require any items to be compiled' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/a.txt')).to eql('false')
+    expect(File.read('output/b.txt')).to eql('false')
+  end
+end

data/spec/nanoc/regressions/gh_1082d_spec.rb

@@ -0,0 +1,17 @@
+describe 'GH-1082', site: true, stdio: true do
+  before do
+    File.write('content/a.erb', '<%= @item.reps[:default].binary? %>')
+
+    File.write('Rules', <<EOS)
+  compile '/*' do
+    filter :erb
+    write item.identifier.without_ext + '.txt'
+  end
+EOS
+  end
+
+  it 'does not require any items to be compiled' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/a.txt')).to eql('false')
+  end
+end

data/spec/nanoc/regressions/gh_1093_spec.rb

@@ -0,0 +1,49 @@
+describe 'GH-1093', site: true, stdio: true do
+  before do
+    File.write('content/index.html', '<%= @items["/z.dat"].reps.all? { |r| File.file?(r.raw_path) } %>')
+    File.write('content/z.dat', 'asdf')
+
+    File.write('Rules', <<EOS)
+  class TestFilter < Nanoc::Filter
+    identifier :gh_1093_test
+
+    def run(content, params = {})
+      depend_on(deps)
+      content
+    end
+
+    private
+
+    def deps
+      assigns[:items].find_all('/**/*.dat')
+    end
+  end
+
+  compile '/**/*.html' do
+    filter :gh_1093_test
+    filter :erb
+    write item.identifier.to_s
+  end
+
+  compile '/**/*.dat' do
+    write @item.identifier.to_s
+  end
+
+  compile '/**/*.dat', rep: :foo do
+    write @item.identifier.to_s + '.foo'
+  end
+
+  compile '/index.html' do
+    filter :erb
+    write item.identifier.without_ext + '.txt'
+  end
+
+  passthrough '/*.dat'
+EOS
+  end
+
+  it 'generates dependency on all reps' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/index.html')).to eql('true')
+  end
+end

data/spec/nanoc/regressions/gh_1097_spec.rb

@@ -0,0 +1,21 @@
+describe 'GH-1097', site: true, stdio: true do
+  before do
+    File.write('content/a.dat', 'foo')
+    File.write('content/index.html', '<%= @items.find_all("/*.dat").flat_map(&:reps).all? { |r| File.file?(r.raw_path) } %>')
+    File.write('content/z.dat', 'quux')
+
+    File.write('Rules', <<EOS)
+  compile '/**/*.html' do
+    filter :erb
+    write item.identifier.to_s
+  end
+
+  passthrough '/**/*.dat'
+EOS
+  end
+
+  it 'generates dependency on all reps' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/index.html')).to eql('true')
+  end
+end

data/spec/nanoc/regressions/gh_1100_spec.rb

@@ -0,0 +1,20 @@
+describe 'GH-1100', site: true, stdio: true do
+  before do
+    File.write('content/index.html', '<% @items["stuff"] %>')
+
+    File.write('Rules', <<EOS)
+  preprocess do
+    @items.delete_if { |i| false }
+  end
+
+  compile '/**/*.html' do
+    filter :erb
+    write item.identifier.to_s
+  end
+EOS
+  end
+
+  it 'should not crash' do
+    Nanoc::CLI.run(%w(compile))
+  end
+end

data/spec/nanoc/regressions/gh_1102_spec.rb

@@ -0,0 +1,26 @@
+describe 'GH-1102', site: true, stdio: true do
+  before do
+    File.write('content/index.html', '<%= "things" %>')
+
+    File.write('Rules', <<EOS)
+  compile '/**/*.html' do
+    filter :erb
+    write item.identifier.to_s
+  end
+EOS
+  end
+
+  before do
+    Nanoc::CLI.run(%w(compile))
+  end
+
+  it 'does not output filename more than once' do
+    regex = /skip.*index\.html.*skip.*index\.html/m
+    expect { Nanoc::CLI.run(%w(compile --verbose)) }.not_to output(regex).to_stdout
+  end
+
+  it 'outputs filename' do
+    regex = /skip.*index\.html/
+    expect { Nanoc::CLI.run(%w(compile --verbose)) }.to output(regex).to_stdout
+  end
+end

data/spec/nanoc/regressions/gh_776_spec.rb

@@ -3,13 +3,9 @@ describe 'GH-776', site: true do
     File.write('content/donkey.md', 'Donkey!')
 
     File.write('Rules', <<EOS)
-  route '/donkey.*', snapshot: :secret do
-    '/donkey-secret.html'
-  end
-
   compile '/donkey.*' do
     filter :erb
-    snapshot :secret
+    snapshot :secret, path: '/donkey-secret.html'
     write '/donkey.html'
   end
 

data/spec/nanoc/rule_dsl/recording_executor_spec.rb

@@ -31,8 +31,8 @@ describe Nanoc::RuleDSL::RecordingExecutor do
       expect(rule_memory.size).to eql(2)
 
       expect(rule_memory[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(rule_memory[0].snapshot_name).to eql(:pre)
-      expect(rule_memory[0].path).to be_nil
+      expect(rule_memory[0].snapshot_names).to eql([:pre])
+      expect(rule_memory[0].paths).to be_empty
 
       expect(rule_memory[1]).to be_a(Nanoc::Int::ProcessingActions::Layout)
       expect(rule_memory[1].layout_identifier).to eql('/default.*')
@@ -45,8 +45,8 @@ describe Nanoc::RuleDSL::RecordingExecutor do
       expect(rule_memory.size).to eql(2)
 
       expect(rule_memory[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(rule_memory[0].snapshot_name).to eql(:pre)
-      expect(rule_memory[0].path).to be_nil
+      expect(rule_memory[0].snapshot_names).to eql([:pre])
+      expect(rule_memory[0].paths).to be_empty
 
       expect(rule_memory[1]).to be_a(Nanoc::Int::ProcessingActions::Layout)
       expect(rule_memory[1].layout_identifier).to eql('/default.*')
@@ -77,8 +77,8 @@ describe Nanoc::RuleDSL::RecordingExecutor do
         subject
         expect(rule_memory.size).to eql(1)
         expect(rule_memory[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-        expect(rule_memory[0].snapshot_name).to eql(:foo)
-        expect(rule_memory[0].path).to be_nil
+        expect(rule_memory[0].snapshot_names).to eql([:foo])
+        expect(rule_memory[0].paths).to be_empty
       end
     end
 
@@ -92,8 +92,8 @@ describe Nanoc::RuleDSL::RecordingExecutor do
             subject
             expect(rule_memory.size).to eql(1)
             expect(rule_memory[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-            expect(rule_memory[0].snapshot_name).to eql(:foo)
-            expect(rule_memory[0].path).to be_nil
+            expect(rule_memory[0].snapshot_names).to eql([:foo])
+            expect(rule_memory[0].paths).to be_empty
           end
         end
 
@@ -104,8 +104,8 @@ describe Nanoc::RuleDSL::RecordingExecutor do
             subject
             expect(rule_memory.size).to eql(1)
             expect(rule_memory[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-            expect(rule_memory[0].snapshot_name).to eql(:foo)
-            expect(rule_memory[0].path).to eql('/routed-foo.html')
+            expect(rule_memory[0].snapshot_names).to eql([:foo])
+            expect(rule_memory[0].paths).to eql(['/routed-foo.html'])
           end
         end
 
@@ -116,8 +116,8 @@ describe Nanoc::RuleDSL::RecordingExecutor do
             subject
             expect(rule_memory.size).to eql(1)
             expect(rule_memory[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-            expect(rule_memory[0].snapshot_name).to eql(:foo)
-            expect(rule_memory[0].path).to eql('/routed-foo.html')
+            expect(rule_memory[0].snapshot_names).to eql([:foo])
+            expect(rule_memory[0].paths).to eql(['/routed-foo.html'])
           end
         end
       end
@@ -134,9 +134,9 @@ describe Nanoc::RuleDSL::RecordingExecutor do
 
       expect(rule_memory.size).to eql(2)
       expect(rule_memory[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(rule_memory[0].snapshot_name).to eql(:foo)
+      expect(rule_memory[0].snapshot_names).to eql([:foo])
       expect(rule_memory[1]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(rule_memory[1].snapshot_name).to eql(:bar)
+      expect(rule_memory[1].snapshot_names).to eql([:bar])
     end
   end
 end

data/spec/nanoc/rule_dsl/rule_context_spec.rb

@@ -56,10 +56,8 @@ describe(Nanoc::RuleDSL::RuleContext) do
       let(:child_identifier) { Nanoc::Identifier.new('/foo/bar/', type: :legacy) }
       let(:child) { Nanoc::Int::Item.new('child', {}, child_identifier) }
 
-      before do
-        items << item
-        items << parent
-        items << child
+      let(:items) do
+        Nanoc::Int::IdentifiableCollection.new(config, [item, parent, child])
       end
 
       it 'has a parent' do
@@ -97,10 +95,8 @@ describe(Nanoc::RuleDSL::RuleContext) do
     let(:child_identifier) { Nanoc::Identifier.new('/foo/bar/', type: :legacy) }
     let(:child) { Nanoc::Int::Item.new('child', {}, child_identifier) }
 
-    before do
-      items << item
-      items << parent
-      items << child
+    let(:items) do
+      Nanoc::Int::IdentifiableCollection.new(config, [item, parent, child])
     end
 
     it 'is a view without reps access' do
@@ -166,13 +162,26 @@ describe(Nanoc::RuleDSL::RuleContext) do
   end
 
   describe '#write' do
-    subject { rule_context.write(path) }
+    context 'calling once' do
+      subject { rule_context.write('/foo.html') }
 
-    let(:path) { '/foo.html' }
+      it 'makes a request to the executor' do
+        expect(executor).to receive(:snapshot).with(:_0, path: '/foo.html')
+        subject
+      end
+    end
 
-    it 'makes a request to the executor' do
-      expect(executor).to receive(:snapshot).with(:last, path: '/foo.html')
-      subject
+    context 'calling twice' do
+      subject do
+        rule_context.write('/foo.html')
+        rule_context.write('/bar.html')
+      end
+
+      it 'makes two requests to the executor with unique snapshot names' do
+        expect(executor).to receive(:snapshot).with(:_0, path: '/foo.html')
+        expect(executor).to receive(:snapshot).with(:_1, path: '/bar.html')
+        subject
+      end
     end
   end
 end