Use rule memory for compiling reps

nanoc · Dec 5, 2015 · 69802c4 · 69802c4
1 parent 754fcef
commit 69802c4
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 19 deletions.
diff --git a/lib/nanoc/base/compilation/compiler.rb b/lib/nanoc/base/compilation/compiler.rb
@@ -264,12 +264,18 @@ def can_reuse_content_for_rep?(rep)
     def recalculate_content_for_rep(rep)
       executor = Nanoc::Int::Executor.new(self)
 
-      executor.snapshot(rep, :raw)
-      executor.snapshot(rep, :pre, final: false)
-      rules_collection.compilation_rule_for(rep)
-        .apply_to(rep, executor: executor, site: @site, view_context: create_view_context)
-      executor.snapshot(rep, :post) if rep.has_snapshot?(:post)
-      executor.snapshot(rep, :last)
+      rule_memory_calculator[rep].each do |action|
+        case action
+        when Nanoc::Int::RuleMemoryActions::Filter
+          executor.filter(rep, action.filter_name, action.params)
+        when Nanoc::Int::RuleMemoryActions::Layout
+          executor.layout(rep, action.layout_identifier, action.params)
+        when Nanoc::Int::RuleMemoryActions::Snapshot
+          executor.snapshot(rep, action.snapshot_name, final: action.final?, path: action.path)
+        else
+          raise "Internal inconsistency: unknown action #{action.inspect}"
+        end
+      end
     end
 
     # Clears the list of dependencies for items that will be recompiled.

diff --git a/lib/nanoc/base/entities/rule_memory.rb b/lib/nanoc/base/entities/rule_memory.rb
@@ -32,6 +32,10 @@ def snapshot_actions
       @actions.select { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Snapshot) }
     end
 
+    def any_layouts?
+      @actions.any? { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Layout) }
+    end
+
     def serialize
       map(&:serialize)
     end

diff --git a/lib/nanoc/base/services/rule_memory_calculator.rb b/lib/nanoc/base/services/rule_memory_calculator.rb
@@ -54,19 +54,21 @@ def snapshots_defs_for(rep)
     #
     # @return [Nanoc::Int::RuleMemory]
     def new_rule_memory_for_rep(rep)
-      # FIXME: This is more-or-less duplicated from Compiler#recalculate_content_for_rep.
-      # Letting the compiler use the rule memory would fix this.
-
       # FIXME: What if #compilation_rule_for returns nil?
 
       executor = Nanoc::Int::RecordingExecutor.new(rep, @rules_collection, @site)
+      rule = @rules_collection.compilation_rule_for(rep)
+
       executor.snapshot(rep, :raw)
       executor.snapshot(rep, :pre, final: false)
-      @rules_collection
-        .compilation_rule_for(rep)
-        .apply_to(rep, executor: executor, site: @site, view_context: nil)
-      executor.snapshot(rep, :post) if rep.has_snapshot?(:post)
-      executor.snapshot(rep, :last) unless executor.rule_memory.snapshot_actions.any? { |sa| sa.snapshot_name == :last }
+      rule.apply_to(rep, executor: executor, site: @site, view_context: nil)
+      if executor.rule_memory.any_layouts?
+        executor.snapshot(rep, :post)
+      end
+      unless executor.rule_memory.snapshot_actions.any? { |sa| sa.snapshot_name == :last }
+        executor.snapshot(rep, :last)
+      end
+
       executor.rule_memory
     end
 

diff --git a/spec/nanoc/base/services/rule_memory_calculator_spec.rb b/spec/nanoc/base/services/rule_memory_calculator_spec.rb
@@ -31,7 +31,7 @@
       example do
         subject
 
-        expect(subject.size).to eql(6)
+        expect(subject.size).to eql(7)
 
         expect(subject[0]).to be_a(Nanoc::Int::RuleMemoryActions::Snapshot)
         expect(subject[0].snapshot_name).to eql(:raw)
@@ -56,9 +56,14 @@
         expect(subject[4].params).to eql({})
 
         expect(subject[5]).to be_a(Nanoc::Int::RuleMemoryActions::Snapshot)
-        expect(subject[5].snapshot_name).to eql(:last)
+        expect(subject[5].snapshot_name).to eql(:post)
         expect(subject[5]).to be_final
         expect(subject[5].path).to be_nil
+
+        expect(subject[6]).to be_a(Nanoc::Int::RuleMemoryActions::Snapshot)
+        expect(subject[6].snapshot_name).to eql(:last)
+        expect(subject[6]).to be_final
+        expect(subject[6].path).to be_nil
       end
     end
 
@@ -115,7 +120,7 @@
     end
 
     example do
-      expect(subject.size).to eql(3)
+      expect(subject.size).to eql(4)
 
       expect(subject[0]).to be_a(Nanoc::Int::SnapshotDef)
       expect(subject[0].name).to eql(:raw)
@@ -126,8 +131,12 @@
       expect(subject[1]).not_to be_final
 
       expect(subject[2]).to be_a(Nanoc::Int::SnapshotDef)
-      expect(subject[2].name).to eql(:last)
+      expect(subject[2].name).to eql(:post)
       expect(subject[2]).to be_final
+
+      expect(subject[3]).to be_a(Nanoc::Int::SnapshotDef)
+      expect(subject[3].name).to eql(:last)
+      expect(subject[3]).to be_final
     end
   end
 end
diff --git a/test/base/test_compiler.rb b/test/base/test_compiler.rb
@@ -164,7 +164,7 @@ def test_compile_rep_should_write_proper_snapshots
 
     # Create compiler
     compiler = new_compiler(site)
-    compiler.rules_collection.expects(:compilation_rule_for).times(2).with(rep).returns(rule)
+    compiler.rules_collection.stubs(:compilation_rule_for).with(rep).returns(rule)
     compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/blah/$})] = [:erb, {}]
     site.stubs(:compiler).returns(compiler)