lib/nanoc/base/compilation/compiler.rb in nanoc-4.3.8 vs lib/nanoc/base/compilation/compiler.rb in nanoc-4.4.0
- old
+ new
@@ -116,13 +116,11 @@
end
# Calculate checksums
objects_to_checksum =
site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
- objects_to_checksum.each do |obj|
- checksum_store[obj] = Nanoc::Int::Checksummer.calc(obj)
- end
+ objects_to_checksum.each { |obj| checksum_store.add(obj) }
# Store
stores.each(&:store)
end
@@ -170,11 +168,11 @@
end
# @api private
def filter_name_and_args_for_layout(layout)
mem = action_provider.memory_for(layout)
- if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::RuleMemoryActions::Filter)
+ if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::ProcessingActions::Filter)
# FIXME: Provide a nicer error message
raise Nanoc::Int::Errors::Generic, "No rule memory found for #{layout.identifier}"
end
[mem[0].filter_name, mem[0].params]
end
@@ -244,11 +242,11 @@
rep.compiled = true
compiled_content_cache[rep] = rep.snapshot_contents
@fibers.delete(rep)
ensure
- dependency_tracker.exit(rep.item)
+ dependency_tracker.exit
end
end
fiber = @fibers[rep]
while fiber.alive?
@@ -276,14 +274,14 @@
def recalculate_content_for_rep(rep, dependency_tracker)
executor = Nanoc::Int::Executor.new(self, dependency_tracker)
action_provider.memory_for(rep).each do |action|
case action
- when Nanoc::Int::RuleMemoryActions::Filter
+ when Nanoc::Int::ProcessingActions::Filter
executor.filter(rep, action.filter_name, action.params)
- when Nanoc::Int::RuleMemoryActions::Layout
+ when Nanoc::Int::ProcessingActions::Layout
executor.layout(rep, action.layout_identifier, action.params)
- when Nanoc::Int::RuleMemoryActions::Snapshot
+ when Nanoc::Int::ProcessingActions::Snapshot
executor.snapshot(rep, action.snapshot_name, final: action.final?, path: action.path)
else
raise "Internal inconsistency: unknown action #{action.inspect}"
end
end