nanoc 4.4.6 → 4.4.7

data/spec/nanoc/integration/partial_recompilation_spec.rb

@@ -0,0 +1,48 @@
+describe 'Partial recompilation', site: true, stdio: true do
+  before do
+    File.write('content/foo.md', "---\ntitle: hello\n---\n\nfoo")
+    File.write('content/bar.md', '<%= @items["/foo.*"].compiled_content %><% raise "boom" %>')
+
+    File.write('Rules', <<EOS)
+compile '/foo.*' do
+  write '/foo.html'
+end
+
+compile '/bar.*' do
+  filter :erb
+  write '/bar.html'
+end
+EOS
+  end
+
+  example do
+    expect(File.file?('output/foo.html')).not_to be
+    expect(File.file?('output/bar.html')).not_to be
+
+    expect { Nanoc::CLI.run(%w(show-data --no-color)) }
+      .to(output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout)
+    expect { Nanoc::CLI.run(%w(show-data --no-color)) }
+      .to(output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout)
+
+    expect { Nanoc::CLI.run(%w(compile --verbose)) rescue nil }
+      .to output(/create.*output\/foo\.html/).to_stdout
+
+    expect { Nanoc::CLI.run(%w(show-data --no-color)) }
+      .to(output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout)
+    expect { Nanoc::CLI.run(%w(show-data --no-color)) }
+      .to(output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout)
+
+    expect(File.file?('output/foo.html')).to be
+    expect(File.file?('output/bar.html')).not_to be
+
+    File.write('content/bar.md', '<% raise "boom" %>')
+
+    expect { Nanoc::CLI.run(%w(compile --verbose --debug)) rescue nil }
+      .to output(/skip.*output\/foo\.html/).to_stdout
+
+    expect { Nanoc::CLI.run(%w(show-data --no-color)) }
+      .to(output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout)
+    expect { Nanoc::CLI.run(%w(show-data --no-color)) }
+      .to(output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout)
+  end
+end

data/spec/nanoc/regressions/gh_1045_spec.rb

@@ -0,0 +1,48 @@
+describe 'GH-1045', site: true, stdio: true do
+  before do
+    File.write('content/foo.txt', 'foo')
+    FileUtils.touch('content/foo.txt', mtime: Time.parse('2015-03-02 10:00:00Z'))
+
+    File.write('content/sitemap.erb', '<%= xml_sitemap(items: items.select { |i| i.path.end_with?(\'/\') }) %>')
+
+    File.write('nanoc.yaml', <<EOS)
+base_url: 'http://example.com'
+EOS
+
+    File.write('lib/default.rb', <<EOS)
+include Nanoc::Helpers::XMLSitemap
+EOS
+
+    File.write('Rules', <<EOS)
+compile '/*.txt' do
+  write item.identifier.without_ext + '/index.html'
+end
+
+compile '/sitemap.erb' do
+  filter :erb
+  write item.identifier.without_ext + '.xml'
+end
+EOS
+  end
+
+  it 'creates the sitemap' do
+    Nanoc::CLI.run(%w(compile))
+
+    expect(File.file?('output/sitemap.xml')).to be
+    contents = File.read('output/sitemap.xml')
+    expect(contents).to match(%r{<loc>http://example.com/foo/</loc>})
+    expect(contents).to match(%r{<lastmod>2015-03-02</lastmod>})
+  end
+
+  it 'updates the sitemap' do
+    Nanoc::CLI.run(%w(compile))
+    File.write('content/foo.txt', 'foo 2')
+    FileUtils.touch('content/foo.txt', mtime: Time.parse('2016-04-03 10:00:00Z'))
+    Nanoc::CLI.run(%w(compile))
+
+    expect(File.file?('output/sitemap.xml')).to be
+    contents = File.read('output/sitemap.xml')
+    expect(contents).to match(%r{<loc>http://example.com/foo/</loc>})
+    expect(contents).to match(%r{<lastmod>2016-04-03</lastmod>})
+  end
+end

data/spec/nanoc/regressions/gh_1047_spec.rb

@@ -0,0 +1,28 @@
+describe 'GH-1047', site: true, stdio: true do
+  before do
+    File.write('Rules', <<EOS)
+  compile '/*' do
+    filter :erb
+    write item.identifier
+  end
+EOS
+  end
+
+  it 'does not reuse old content' do
+    File.write('content/foo.md', 'I am old foo!')
+    File.write('content/bar.md', 'I am old bar!')
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/foo.md')).to eql('I am old foo!')
+    expect(File.read('output/bar.md')).to eql('I am old bar!')
+
+    File.write('content/foo.md', 'I am foo!')
+    File.write('content/bar.md', '<%= @items["/foo.*"].compiled_content %><%= raise "boom" %>')
+    expect { Nanoc::CLI.run(%w(compile)) }.to raise_error(Nanoc::Int::Errors::CompilationError)
+    expect(File.read('output/foo.md')).to eql('I am foo!')
+
+    File.write('content/bar.md', '[<%= @items["/foo.*"].compiled_content %>]')
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/foo.md')).to eql('I am foo!')
+    expect(File.read('output/bar.md')).to eql('[I am foo!]')
+  end
+end

data/test/base/test_compiler.rb

@@ -24,6 +24,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       ),
       action_provider: action_provider,
       reps: reps,
+      outdatedness_store: Nanoc::Int::OutdatednessStore.new(site: site, reps: reps),
     }
 
     params[:outdatedness_checker] =

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.4.6
+  version: 4.4.7
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -154,6 +154,7 @@ files:
 - lib/nanoc/base/repos/data_source.rb
 - lib/nanoc/base/repos/dependency_store.rb
 - lib/nanoc/base/repos/item_rep_repo.rb
+- lib/nanoc/base/repos/outdatedness_store.rb
 - lib/nanoc/base/repos/rule_memory_store.rb
 - lib/nanoc/base/repos/site_loader.rb
 - lib/nanoc/base/repos/store.rb
@@ -333,6 +334,7 @@ files:
 - spec/nanoc/base/repos/compiled_content_cache_spec.rb
 - spec/nanoc/base/repos/config_loader_spec.rb
 - spec/nanoc/base/repos/dependency_store_spec.rb
+- spec/nanoc/base/repos/outdatedness_store_spec.rb
 - spec/nanoc/base/repos/site_loader_spec.rb
 - spec/nanoc/base/services/dependency_tracker_spec.rb
 - spec/nanoc/base/services/executor_spec.rb
@@ -386,10 +388,13 @@ files:
 - spec/nanoc/helpers/tagging_spec.rb
 - spec/nanoc/helpers/text_spec.rb
 - spec/nanoc/integration/outdatedness_integration_spec.rb
+- spec/nanoc/integration/partial_recompilation_spec.rb
 - spec/nanoc/regressions/gh_1015_spec.rb
 - spec/nanoc/regressions/gh_1031_spec.rb
 - spec/nanoc/regressions/gh_1035_spec.rb
 - spec/nanoc/regressions/gh_1040_spec.rb
+- spec/nanoc/regressions/gh_1045_spec.rb
+- spec/nanoc/regressions/gh_1047_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb