Merge pull request #931 from nanoc/gh-927-layout-view-dep-tracker

Fix checking outdatedness of LayoutView
nanoc · Aug 22, 2016 · 4fb4eec · 4fb4eec
2 parents e62384d + d603d06
commit 4fb4eec
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/lib/nanoc/base/compilation/dependency_tracker.rb b/lib/nanoc/base/compilation/dependency_tracker.rb
@@ -12,11 +12,14 @@ def bounce(_obj)
       end
     end
 
+    include Nanoc::Int::ContractsSupport
+
     def initialize(dependency_store)
       @dependency_store = dependency_store
       @stack = []
     end
 
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
     def enter(obj)
       unless @stack.empty?
         Nanoc::Int::NotificationCenter.post(:dependency_created, @stack.last, obj)
@@ -26,10 +29,12 @@ def enter(obj)
       @stack.push(obj)
     end
 
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
     def exit(_obj)
       @stack.pop
     end
 
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
     def bounce(obj)
       enter(obj)
       exit(obj)

diff --git a/lib/nanoc/helpers/rendering.rb b/lib/nanoc/helpers/rendering.rb
@@ -13,9 +13,10 @@ module Rendering
     # @return [String, nil]
     def render(identifier, other_assigns = {}, &block)
       # Find layout
-      layout = @layouts[identifier]
-      layout ||= @layouts[identifier.__nanoc_cleaned_identifier]
-      raise Nanoc::Int::Errors::UnknownLayout.new(identifier) if layout.nil?
+      layout_view = @layouts[identifier]
+      layout_view ||= @layouts[identifier.__nanoc_cleaned_identifier]
+      raise Nanoc::Int::Errors::UnknownLayout.new(identifier) if layout_view.nil?
+      layout = layout_view.unwrap
 
       # Visit
       dependency_tracker = @config._context.dependency_tracker
@@ -30,7 +31,7 @@ def render(identifier, other_assigns = {}, &block)
         item: @item,
         item_rep: @item_rep,
         items: @items,
-        layout: layout,
+        layout: layout_view,
         layouts: @layouts,
         config: @config,
       }.merge(other_assigns)
@@ -51,7 +52,7 @@ def render(identifier, other_assigns = {}, &block)
         Nanoc::Int::NotificationCenter.post(:processing_started, layout)
 
         # Layout
-        content = layout.unwrap.content
+        content = layout.content
         arg = content.binary? ? content.filename : content.string
         result = filter.setup_and_run(arg, filter_args)
 

diff --git a/spec/nanoc/helpers/rendering_spec.rb b/spec/nanoc/helpers/rendering_spec.rb
@@ -2,15 +2,22 @@
   describe '#render' do
     subject { helper.instance_eval { render('/partial.erb') } }
 
-    before do
-      layout = ctx.create_layout(layout_content, {}, layout_identifier)
-      ctx.update_rule_memory(layout, rule_memory_for_layout)
-    end
-
     let(:rule_memory_for_layout) do
       [Nanoc::Int::RuleMemoryActions::Filter.new(:erb, {})]
     end
 
+    let(:layout_view) do
+      ctx.create_layout(layout_content, {}, layout_identifier)
+    end
+
+    let(:layout) do
+      layout_view.unwrap
+    end
+
+    before do
+      ctx.update_rule_memory(layout, rule_memory_for_layout)
+    end
+
     context 'legacy identifier' do
       let(:layout_identifier) { Nanoc::Identifier.new('/partial/', type: :legacy) }
 
@@ -19,7 +26,13 @@
 
         context 'layout without instructions' do
           let(:layout_content) { 'blah' }
+
           it { is_expected.to eql('blah') }
+
+          it 'tracks proper dependencies' do
+            expect(ctx.dependency_tracker).to receive(:enter).with(layout)
+            subject
+          end
         end
 
         context 'layout with instructions' do

diff --git a/test/base/test_dependency_tracker.rb b/test/base/test_dependency_tracker.rb
@@ -87,7 +87,10 @@ def test_objects_outdated_due_to
   end
 
   def test_enter_and_exit
-    items = [mock, mock]
+    items = [
+      Nanoc::Int::Item.new('Foo', {}, '/foo.md'),
+      Nanoc::Int::Item.new('Bar', {}, '/bar.md'),
+    ]
 
     store = Nanoc::Int::DependencyStore.new(items)
     tracker = Nanoc::Int::DependencyTracker.new(store)