nanoc 4.5.2 → 4.5.3

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

@@ -3,12 +3,22 @@ describe Nanoc::ItemWithRepsView do
   let(:other_view_class) { Nanoc::LayoutView }
   it_behaves_like 'a document view'
 
-  let(:view_context) { Nanoc::ViewContext.new(reps: reps, items: items, dependency_tracker: dependency_tracker, compilation_context: compilation_context) }
+  let(:view_context) do
+    Nanoc::ViewContext.new(
+      reps: reps,
+      items: items,
+      dependency_tracker: dependency_tracker,
+      compilation_context: compilation_context,
+      snapshot_repo: snapshot_repo,
+    )
+  end
+
   let(:reps) { [] }
   let(:items) { [] }
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
   let(:dependency_store) { Nanoc::Int::DependencyStore.new([]) }
   let(:compilation_context) { double(:compilation_context) }
+  let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.md') }
 
@@ -203,15 +213,16 @@ describe Nanoc::ItemWithRepsView do
           Nanoc::Int::SnapshotDef.new(:post),
           Nanoc::Int::SnapshotDef.new(:specific),
         ]
-        ir.snapshot_contents = {
-          last: Nanoc::Int::TextualContent.new('Last Hallo'),
-          pre: Nanoc::Int::TextualContent.new('Pre Hallo'),
-          post: Nanoc::Int::TextualContent.new('Post Hallo'),
-          specific: Nanoc::Int::TextualContent.new('Specific Hallo'),
-        }
       end
     end
 
+    before do
+      snapshot_repo.set(rep, :last, Nanoc::Int::TextualContent.new('Last Hallo'))
+      snapshot_repo.set(rep, :pre, Nanoc::Int::TextualContent.new('Pre Hallo'))
+      snapshot_repo.set(rep, :post, Nanoc::Int::TextualContent.new('Post Hallo'))
+      snapshot_repo.set(rep, :specific, Nanoc::Int::TextualContent.new('Specific Hallo'))
+    end
+
     context 'requesting implicit default rep' do
       let(:params) { {} }
 

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

@@ -1,5 +1,5 @@
 shared_examples 'a mutable document view' do
-  let(:view) { described_class.new(item, view_context) }
+  let(:view) { described_class.new(document, view_context) }
 
   let(:view_context) do
     Nanoc::ViewContext.new(
@@ -7,14 +7,15 @@ shared_examples 'a mutable document view' do
       items: double(:items),
       dependency_tracker: dependency_tracker,
       compilation_context: double(:compilation_context),
+      snapshot_repo: snapshot_repo,
     )
   end
 
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(double(:dependency_store)) }
+  let(:snapshot_repo) { double(:snapshot_repo) }
 
   describe '#[]=' do
-    # FIXME: rename :item to :document
-    let(:item) { entity_class.new('content', {}, '/asdf/') }
+    let(:document) { entity_class.new('content', {}, '/asdf/') }
 
     it 'sets attributes' do
       view[:title] = 'Donkey'
@@ -43,7 +44,7 @@ shared_examples 'a mutable document view' do
   end
 
   describe '#identifier=' do
-    let(:item) { entity_class.new('content', {}, '/about.md') }
+    let(:document) { entity_class.new('content', {}, '/about.md') }
 
     subject { view.identifier = arg }
 
@@ -75,7 +76,7 @@ shared_examples 'a mutable document view' do
   end
 
   describe '#update_attributes' do
-    let(:item) { entity_class.new('content', {}, '/asdf/') }
+    let(:document) { entity_class.new('content', {}, '/asdf/') }
 
     let(:update) { { friend: 'Giraffe' } }
 

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

@@ -9,6 +9,7 @@ describe Nanoc::PostCompileItemRepView do
       items: items,
       dependency_tracker: dependency_tracker,
       compilation_context: compilation_context,
+      snapshot_repo: snapshot_repo,
     )
   end
 
@@ -17,6 +18,7 @@ describe Nanoc::PostCompileItemRepView do
   let(:config) { Nanoc::Int::Configuration.new }
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(double(:dependency_store)) }
   let(:compilation_context) { double(:compilation_context, compiled_content_cache: compiled_content_cache) }
+  let(:snapshot_repo) { double(:snapshot_repo) }
 
   let(:snapshot_contents) do
     {
@@ -36,9 +38,12 @@ describe Nanoc::PostCompileItemRepView do
     subject { view.compiled_content }
 
     context 'binary' do
-      let(:item) do
-        content = Nanoc::Int::Content.create('/foo.dat', binary: true)
-        Nanoc::Int::Item.new(content, {}, '/foo.dat')
+      let(:snapshot_contents) do
+        {
+          last: Nanoc::Int::TextualContent.new('content-last'),
+          pre: Nanoc::Int::BinaryContent.new('/content/pre'),
+          donkey: Nanoc::Int::TextualContent.new('content-donkey'),
+        }
       end
 
       it 'raises error' do

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

@@ -25,7 +25,7 @@ describe Nanoc::CLI::Commands::Compile::FileActionPrinter, stdio: true do
     Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
     Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 1))
 
-    expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, '/foo.html', true, true) }
+    expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, '/foo.html', true, true) }
       .to output(/create.*\[1\.00s\]/).to_stdout
   end
 
@@ -35,7 +35,7 @@ describe Nanoc::CLI::Commands::Compile::FileActionPrinter, stdio: true do
 
     Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
 
-    expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, '/foo.html', true, true) }
+    expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, '/foo.html', true, true) }
       .not_to output(/create/).to_stdout
   end
 
@@ -50,7 +50,7 @@ describe Nanoc::CLI::Commands::Compile::FileActionPrinter, stdio: true do
     Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
     Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 6))
 
-    expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, '/foo.html', true, true) }
+    expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, '/foo.html', true, true) }
       .to output(/create.*\[4\.00s\]/).to_stdout
   end
 

data/spec/nanoc/helpers/capturing_spec.rb

@@ -13,7 +13,7 @@ describe Nanoc::Helpers::Capturing, helper: true do
 
         it 'stores snapshot content' do
           subject
-          expect(ctx.item.reps[:default].unwrap.snapshot_contents[:__capture_foo].string).to eql('foo')
+          expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('foo')
         end
       end
 
@@ -36,7 +36,7 @@ describe Nanoc::Helpers::Capturing, helper: true do
           it 'overwrites' do
             helper.content_for(:foo, params) { _erbout << 'foo' }
             helper.content_for(:foo, params) { _erbout << 'bar' }
-            expect(ctx.item.reps[:default].unwrap.snapshot_contents[:__capture_foo].string).to eql('bar')
+            expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('bar')
           end
         end
 
@@ -46,7 +46,7 @@ describe Nanoc::Helpers::Capturing, helper: true do
           it 'appends' do
             helper.content_for(:foo, params) { _erbout << 'foo' }
             helper.content_for(:foo, params) { _erbout << 'bar' }
-            expect(ctx.item.reps[:default].unwrap.snapshot_contents[:__capture_foo].string).to eql('foobar')
+            expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('foobar')
           end
         end
 
@@ -108,8 +108,11 @@ describe Nanoc::Helpers::Capturing, helper: true do
         context 'other item is compiled' do
           before do
             item.reps[:default].unwrap.compiled = true
-            item.reps[:default].unwrap.snapshot_contents[:__capture_foo] =
-              Nanoc::Int::TextualContent.new('other captured foo')
+            ctx.snapshot_repo.set(
+              item.reps[:default].unwrap,
+              :__capture_foo,
+              Nanoc::Int::TextualContent.new('other captured foo'),
+            )
           end
 
           it 'returns the captured content' do

data/spec/nanoc/regressions/gh_1064_spec.rb

@@ -0,0 +1,18 @@
+describe 'GH-1064', site: true, stdio: true do
+  before do
+    File.write('content/foo.erb', '*<%= @items["/bar.*"].compiled_content(snapshot: :pre) %>*')
+    File.write('content/bar.erb', 'Bar!')
+
+    File.write('Rules', <<EOS)
+  compile '/*' do
+    filter :erb
+    write item.identifier
+  end
+EOS
+  end
+
+  it 'does not reuse old content' do
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/foo.erb')).to eql('*Bar!*')
+  end
+end

data/spec/nanoc/rule_dsl/rule_context_spec.rb

@@ -14,8 +14,9 @@ describe(Nanoc::RuleDSL::RuleContext) do
   let(:executor) { double(:executor) }
   let(:reps) { double(:reps) }
   let(:compilation_context) { double(:compilation_context) }
-  let(:view_context) { Nanoc::ViewContext.new(reps: reps, items: items, dependency_tracker: dependency_tracker, compilation_context: compilation_context) }
+  let(:view_context) { Nanoc::ViewContext.new(reps: reps, items: items, dependency_tracker: dependency_tracker, compilation_context: compilation_context, snapshot_repo: snapshot_repo) }
   let(:dependency_tracker) { double(:dependency_tracker) }
+  let(:snapshot_repo) { double(:snapshot_repo) }
 
   describe '#initialize' do
     it 'wraps objects in view classes' do

data/spec/nanoc/rule_dsl/rule_memory_calculator_spec.rb

@@ -96,7 +96,11 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           expect(subject[1].snapshot_name).to eql(:last)
           expect(subject[1].path).to be_nil
 
-          expect(subject.size).to eql(2)
+          expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
+          expect(subject[2].snapshot_name).to eql(:pre)
+          expect(subject[2].path).to be_nil
+
+          expect(subject.size).to eql(3)
         end
       end
 
@@ -122,7 +126,11 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           expect(subject[1].snapshot_name).to eql(:last)
           expect(subject[1].path).to eq('/foo.md')
 
-          expect(subject.size).to eql(2)
+          expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
+          expect(subject[2].snapshot_name).to eql(:pre)
+          expect(subject[2].path).to be_nil
+
+          expect(subject.size).to eql(3)
         end
       end
 
@@ -148,7 +156,11 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           expect(subject[1].snapshot_name).to eql(:last)
           expect(subject[1].path).to be_nil
 
-          expect(subject.size).to eql(2)
+          expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
+          expect(subject[2].snapshot_name).to eql(:pre)
+          expect(subject[2].path).to be_nil
+
+          expect(subject.size).to eql(3)
         end
       end
     end

data/spec/spec_helper.rb

@@ -173,3 +173,46 @@ RSpec::Matchers.define :yield_from_fiber do |expected|
     "expected that proc would not yield #{expected.inspect} from fiber, but was #{@res.inspect}"
   end
 end
+
+RSpec::Matchers.define :be_some_textual_content do |expected|
+  include RSpec::Matchers::Composable
+
+  match do |actual|
+    actual.is_a?(Nanoc::Int::TextualContent) && values_match?(expected, actual.string)
+  end
+
+  description do
+    "textual content matching #{expected.inspect}"
+  end
+
+  failure_message do |actual|
+    "expected #{actual.inspect} to be textual content matching #{expected.inspect}"
+  end
+
+  failure_message_when_negated do |actual|
+    "expected #{actual.inspect} not to be textual content matching #{expected.inspect}"
+  end
+end
+
+RSpec::Matchers.define :be_some_binary_content do |expected|
+  include RSpec::Matchers::Composable
+
+  match do |actual|
+    actual.is_a?(Nanoc::Int::BinaryContent) && values_match?(expected, File.read(actual.filename))
+  end
+
+  description do
+    "binary content matching #{expected.inspect}"
+  end
+
+  failure_message do |actual|
+    "expected #{actual.inspect} to be binary content matching #{expected.inspect}"
+  end
+
+  failure_message_when_negated do |actual|
+    "expected #{actual.inspect} not to be binary content matching #{expected.inspect}"
+  end
+end
+
+RSpec::Matchers.alias_matcher :some_textual_content, :be_some_textual_content
+RSpec::Matchers.alias_matcher :some_binary_content, :be_some_binary_content

data/test/cli/commands/test_compile.rb

@@ -173,7 +173,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
     listener = new_file_action_printer([rep])
     listener.start
     Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
-    Nanoc::Int::NotificationCenter.post(:rep_written, rep, rep.raw_path, false, true)
+    Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, rep.raw_path, false, true)
     listener.stop
 
     # Check

data/test/filters/test_xsl.rb

@@ -100,6 +100,7 @@ EOS
       items: :__irrelevat_items,
       dependency_tracker: @dependency_tracker,
       compilation_context: :__irrelevat_compiler,
+      snapshot_repo: :__irrelevant_snapshot_repo,
     )
   end
 

data/test/helpers/test_capturing.rb

@@ -15,9 +15,14 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
       items: :__irrelevant__,
       dependency_tracker: :__irrelevant__,
       compilation_context: :__irrelevant__,
+      snapshot_repo: snapshot_repo,
     )
   end
 
+  def snapshot_repo
+    @_snapshot_repo ||= Nanoc::Int::SnapshotRepo.new
+  end
+
   def before
     super
     Nanoc::CLI::ErrorHandler.enable
@@ -74,7 +79,9 @@ foot
 EOS
 
     item = Nanoc::Int::Item.new('content', {}, '/')
+    view_context = view_context_for(item)
     @item = Nanoc::ItemWithRepsView.new(item, view_context_for(item))
+    @config = Nanoc::ConfigView.new(Nanoc::Int::Configuration.new, view_context)
 
     result = ::ERB.new(content).result(binding)
 
@@ -155,7 +162,7 @@ EOS
 
       # Compile once
       File.open('content/includer.erb', 'w') do |io|
-        io.write 'Old-<%= content_for(@items.find { |i| i.identifier == \'/includee/\' }, :blah) %>'
+        io.write 'Old-<%= content_for(@items["/includee/"], :blah) %>'
       end
       Nanoc::CLI.run(%w(compile))
       assert_equal '{}', File.read('output/includee/index.html')
@@ -163,7 +170,7 @@ EOS
 
       # Compile again
       File.open('content/includer.erb', 'w') do |io|
-        io.write 'New-<%= content_for(@items.find { |i| i.identifier == \'/includee/\' }, :blah) %>'
+        io.write 'New-<%= content_for(@items["/includee/"], :blah) %>'
       end
       Nanoc::CLI.run(%w(compile))
       assert_equal '{}', File.read('output/includee/index.html')

data/test/helpers/test_xml_sitemap.rb

@@ -8,7 +8,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
 
     @reps = Nanoc::Int::ItemRepRepo.new
     dependency_tracker = Nanoc::Int::DependencyTracker.new(nil)
-    @view_context = Nanoc::ViewContext.new(reps: @reps, items: nil, dependency_tracker: dependency_tracker, compilation_context: :__irrelevant__)
+    @view_context = Nanoc::ViewContext.new(reps: @reps, items: nil, dependency_tracker: dependency_tracker, compilation_context: :__irrelevant__, snapshot_repo: :__irrelevant_snapshot_repo)
 
     @items = nil
     @item = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.5.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -170,6 +170,7 @@ files:
 - 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/snapshot_repo.rb
 - lib/nanoc/base/repos/store.rb
 - lib/nanoc/base/services.rb
 - lib/nanoc/base/services/action_provider.rb
@@ -349,6 +350,8 @@ files:
 - 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/repos/snapshot_repo_spec.rb
+- spec/nanoc/base/services/compiler/phases/cache_spec.rb
 - spec/nanoc/base/services/dependency_tracker_spec.rb
 - spec/nanoc/base/services/executor_spec.rb
 - spec/nanoc/base/services/item_rep_router_spec.rb
@@ -411,6 +414,7 @@ files:
 - 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_1064_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb