nanoc-core 4.14.5 → 4.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45123be2f12a6729311b411b3ac4aee4d5e5326da001971ab9000d4cec0b1cc
-  data.tar.gz: 7ec1358ef49333f3a51225d32d2203a0a4fed0ce6139bbf52f87e8563db69214
+  metadata.gz: c8175e70512a2b971b62c60b31c650458e8fcef2aeb7318ccb6dbd9e76d3a25d
+  data.tar.gz: '03478e1061f3b8324435731239def3183d77054e3bbc5b3ac3f6d5e2ab9786a7'
 SHA512:
-  metadata.gz: 02bf0b41f7b16a06422bc2dd1daa314261f65a50196f5eb27016e4dfac64fd52f736bb7a1353e4f60a85030537a796d82b167326d6f72927829c1fdcda2d015e
-  data.tar.gz: d9f1ffa2f03358196807de06660ae0a27e209b7a295d9e83251405669e30481fa82ee0e82490ee9be4cf53fb8d6c667a949c3de868be2bf441d00ed2c4fe1e31
+  metadata.gz: 557b852833a1f73919076424047436280d3f7f1d3bd8e319bed4485e0828ffed2ab134afa8300b30f289e940edabc64b2dc1f8bb24077e0420d7408c2c2acfb7
+  data.tar.gz: d5bfd697e976849b4cc5760817c257f3b032bd68b196dc3ac4d1b74ad9c57a6c80cfb262ac8f53fb86ad036e943b7c65435e5e548e70eb5d23979690732528e9

data/lib/nanoc/core/compilation_context.rb

@@ -27,7 +27,8 @@ module Nanoc
       attr_reader :site
       attr_reader :reps
       attr_reader :compiled_content_cache
-      attr_reader :compiled_content_store
+      attr_reader :compiled_content_repo
+      attr_reader :outdatedness_store
 
       C_COMPILED_CONTENT_CACHE =
         C::Or[
@@ -41,14 +42,23 @@ module Nanoc
         reps: Nanoc::Core::ItemRepRepo,
         site: Nanoc::Core::Site,
         compiled_content_cache: C_COMPILED_CONTENT_CACHE,
-        compiled_content_store: Nanoc::Core::CompiledContentStore,
+        compiled_content_repo: Nanoc::Core::CompiledContentRepo,
+        outdatedness_store: Nanoc::Core::OutdatednessStore,
       ] => C::Any
-      def initialize(action_provider:, reps:, site:, compiled_content_cache:, compiled_content_store:)
+      def initialize(
+        action_provider:,
+        reps:,
+        site:,
+        compiled_content_cache:,
+        compiled_content_repo:,
+        outdatedness_store:
+      )
         @action_provider = action_provider
         @reps = reps
         @site = site
         @compiled_content_cache = compiled_content_cache
-        @compiled_content_store = compiled_content_store
+        @compiled_content_repo = compiled_content_repo
+        @outdatedness_store = outdatedness_store
       end
 
       contract Nanoc::Core::Layout => FilterNameAndArgs

data/lib/nanoc/core/compilation_phases/cache.rb

@@ -3,45 +3,25 @@
 module Nanoc
   module Core
     module CompilationPhases
-      # Provides functionality for (re)calculating the content of an item rep, with caching or
-      # outdatedness checking. Delegates to s::Recalculate if outdated or no cache available.
+      # Stores the compiled content in the cache once available.
       class Cache < Abstract
         include Nanoc::Core::ContractsSupport
 
-        def initialize(wrapped:, compiled_content_cache:, compiled_content_store:)
+        def initialize(wrapped:, compiled_content_cache:, compiled_content_repo:)
           super(wrapped:)
 
           @compiled_content_cache = compiled_content_cache
-          @compiled_content_store = compiled_content_store
+          @compiled_content_repo = compiled_content_repo
         end
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
-        def run(rep, is_outdated:)
-          if can_reuse_content_for_rep?(rep, is_outdated:)
-            # If cached content can be used for this item rep, do so, and skip
-            # recalculation of the item rep compiled content.
-            Nanoc::Core::NotificationCenter.post(:cached_content_used, rep)
-            @compiled_content_store.set_all(rep, @compiled_content_cache[rep])
-          else
-            # Cached content couldn’t be used for this rep. Continue as usual with
-            # recalculation of the item rep compiled content.
-            yield
-
-            # Update compiled content cache, now that the item rep is compiled.
-            @compiled_content_cache[rep] = @compiled_content_store.get_all(rep)
-          end
+        def run(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
+          return if rep.compiled?
 
+          yield
+          @compiled_content_cache[rep] = @compiled_content_repo.get_all(rep)
           rep.compiled = true
         end
-
-        contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Bool
-        def can_reuse_content_for_rep?(rep, is_outdated:)
-          if is_outdated
-            false
-          else
-            @compiled_content_cache.full_cache_available?(rep)
-          end
-        end
       end
     end
   end

data/lib/nanoc/core/compilation_phases/recalculate.rb

@@ -18,15 +18,14 @@ module Nanoc
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
         def run(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
-          dependency_tracker = Nanoc::Core::DependencyTracker.new(@dependency_store)
-          dependency_tracker.enter(rep.item)
+          dependency_tracker = Nanoc::Core::DependencyTracker.new(@dependency_store, root: rep.item)
 
           executor = Nanoc::Core::Executor.new(rep, @compilation_context, dependency_tracker)
 
           # Set initial content, if not already present
-          compiled_content_store = @compilation_context.compiled_content_store
-          unless compiled_content_store.get_current(rep)
-            compiled_content_store.set_current(rep, rep.item.content)
+          compiled_content_repo = @compilation_context.compiled_content_repo
+          unless compiled_content_repo.get_current(rep)
+            compiled_content_repo.set_current(rep, rep.item.content)
           end
 
           actions = pending_action_sequence_for(rep:)
@@ -48,8 +47,6 @@ module Nanoc
 
             actions.shift
           end
-        ensure
-          dependency_tracker.exit
         end
 
         def pending_action_sequence_for(rep:)

data/lib/nanoc/core/compilation_phases/write.rb

@@ -6,25 +6,14 @@ module Nanoc
       class Write < Abstract
         include Nanoc::Core::ContractsSupport
 
-        WORKER_POOL_SIZE = 5
-
-        def initialize(compiled_content_store:, wrapped:)
+        def initialize(compiled_content_repo:, wrapped:)
           super(wrapped:)
 
-          @compiled_content_store = compiled_content_store
-
-          @pool = Concurrent::FixedThreadPool.new(WORKER_POOL_SIZE)
+          @compiled_content_repo = compiled_content_repo
 
           @writer = Nanoc::Core::ItemRepWriter.new
         end
 
-        def stop
-          @pool.shutdown
-          @pool.wait_for_termination
-
-          super
-        end
-
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
         def run(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
           yield
@@ -34,9 +23,7 @@ module Nanoc
           # notification happens before the :rep_write_enqueued one.
           Nanoc::Core::NotificationCenter.post(:rep_write_enqueued, rep)
 
-          @pool.post do
-            @writer.write_all(rep, @compiled_content_store)
-          end
+          @writer.write_all(rep, @compiled_content_repo)
         end
       end
     end

data/lib/nanoc/core/compilation_stages/compile_reps.rb

@@ -88,12 +88,12 @@ module Nanoc
 
           cache_phase = Nanoc::Core::CompilationPhases::Cache.new(
             compiled_content_cache: @compiled_content_cache,
-            compiled_content_store: @compilation_context.compiled_content_store,
+            compiled_content_repo: @compilation_context.compiled_content_repo,
             wrapped: recalculate_phase,
           )
 
           write_phase = Nanoc::Core::CompilationPhases::Write.new(
-            compiled_content_store: @compilation_context.compiled_content_store,
+            compiled_content_repo: @compilation_context.compiled_content_repo,
             wrapped: cache_phase,
           )
 

data/lib/nanoc/core/{compiled_content_store.rb → compiled_content_repo.rb}

@@ -3,7 +3,7 @@
 module Nanoc
   module Core
     # @api private
-    class CompiledContentStore
+    class CompiledContentRepo
       include Nanoc::Core::ContractsSupport
 
       def initialize

data/lib/nanoc/core/compiler.rb

@@ -29,7 +29,7 @@ module Nanoc
         @outdatedness_store     = outdatedness_store
         @focus                  = focus
 
-        @compiled_content_store = Nanoc::Core::CompiledContentStore.new
+        @compiled_content_repo = Nanoc::Core::CompiledContentRepo.new
       end
 
       def run_until_preprocessed
@@ -99,7 +99,8 @@ module Nanoc
           reps:,
           site: @site,
           compiled_content_cache: @compiled_content_cache,
-          compiled_content_store: @compiled_content_store,
+          compiled_content_repo: @compiled_content_repo,
+          outdatedness_store: @outdatedness_store,
         )
       end
 

data/lib/nanoc/core/core_ext/string.rb

@@ -8,7 +8,7 @@ module Nanoc
         #
         # @return [String] The identifier generated from the receiver
         def __nanoc_cleaned_identifier
-          "/#{self}/".gsub(/^\/+|\/+$/, '/')
+          "/#{self}/".gsub(%r{^/+|/+$}, '/')
         end
       end
     end

data/lib/nanoc/core/dependency_tracker.rb

@@ -36,38 +36,25 @@ module Nanoc
         ]
 
       attr_reader :dependency_store
+      attr_reader :root
 
-      def initialize(dependency_store)
+      def initialize(dependency_store, root:)
         @dependency_store = dependency_store
-        @stack = []
-      end
-
-      contract C_OBJ, C_ARGS => C::Any
-      def enter(obj, raw_content: false, attributes: false, compiled_content: false, path: false)
-        unless @stack.empty?
-          Nanoc::Core::NotificationCenter.post(:dependency_created, @stack.last, obj)
-          @dependency_store.record_dependency(
-            @stack.last,
-            obj,
-            raw_content:,
-            attributes:,
-            compiled_content:,
-            path:,
-          )
-        end
-
-        @stack.push(obj)
-      end
-
-      contract C_OBJ => C::Any
-      def exit
-        @stack.pop
+        @root = root
       end
 
       contract C_OBJ, C_ARGS => C::Any
       def bounce(obj, raw_content: false, attributes: false, compiled_content: false, path: false)
-        enter(obj, raw_content:, attributes:, compiled_content:, path:)
-        exit
+        Nanoc::Core::NotificationCenter.post(:dependency_created, @root, obj)
+
+        @dependency_store.record_dependency(
+          @root,
+          obj,
+          raw_content:,
+          attributes:,
+          compiled_content:,
+          path:,
+        )
       end
 
       class Null < DependencyTracker
@@ -75,12 +62,6 @@ module Nanoc
 
         def initialize; end
 
-        contract C_OBJ, C_ARGS => C::Any
-        def enter(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
-
-        contract C_OBJ => C::Any
-        def exit; end
-
         contract C_OBJ, C_ARGS => C::Any
         def bounce(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
       end

data/lib/nanoc/core/errors.rb

@@ -79,9 +79,9 @@ module Nanoc
           cycle.each.with_index do |r, i|
             msg_bits << "    (#{i + 1}) item #{r.item.identifier}, rep #{r.name.inspect}, uses compiled content of"
           end
-          msg_bits << msg_bits.pop + ' (1)'
+          msg_bits << (msg_bits.pop + ' (1)')
 
-          super(msg_bits.map { |x| x + "\n" }.join(''))
+          super(msg_bits.map { |x| x + "\n" }.join)
         end
       end
 

data/lib/nanoc/core/executor.rb

@@ -16,7 +16,7 @@ module Nanoc
           Nanoc::Core::NotificationCenter.post(:filtering_started, @rep, filter_name)
 
           # Run filter
-          last = @compilation_context.compiled_content_store.get_current(@rep)
+          last = @compilation_context.compiled_content_repo.get_current(@rep)
           source = last.binary? ? last.filename : last.string
           filter_args.freeze
           result = filter.setup_and_run(source, filter_args)
@@ -28,7 +28,7 @@ module Nanoc
             end
 
           # Store
-          @compilation_context.compiled_content_store.set_current(@rep, last)
+          @compilation_context.compiled_content_repo.set_current(@rep, last)
         ensure
           Nanoc::Core::NotificationCenter.post(:filtering_ended, @rep, filter_name)
         end
@@ -47,7 +47,7 @@ module Nanoc
         filter_args.freeze
 
         # Check whether item can be laid out
-        last = @compilation_context.compiled_content_store.get_current(@rep)
+        last = @compilation_context.compiled_content_repo.get_current(@rep)
         raise Nanoc::Core::Errors::CannotLayoutBinaryItem.new(@rep) if last.binary?
 
         # Create filter
@@ -68,15 +68,15 @@ module Nanoc
 
           # Store
           last = Nanoc::Core::TextualContent.new(res).tap(&:freeze)
-          @compilation_context.compiled_content_store.set_current(@rep, last)
+          @compilation_context.compiled_content_repo.set_current(@rep, last)
         ensure
           Nanoc::Core::NotificationCenter.post(:filtering_ended, @rep, filter_name)
         end
       end
 
       def snapshot(snapshot_name)
-        last = @compilation_context.compiled_content_store.get_current(@rep)
-        @compilation_context.compiled_content_store.set(@rep, snapshot_name, last)
+        last = @compilation_context.compiled_content_repo.get_current(@rep)
+        @compilation_context.compiled_content_repo.set(@rep, snapshot_name, last)
         Nanoc::Core::NotificationCenter.post(:snapshot_created, @rep, snapshot_name)
       end
 
@@ -106,7 +106,7 @@ module Nanoc
       def filter_for_filtering(filter_name)
         klass = Nanoc::Core::Filter.named!(filter_name)
 
-        last = @compilation_context.compiled_content_store.get_current(@rep)
+        last = @compilation_context.compiled_content_repo.get_current(@rep)
         if klass.from_binary? && !last.binary?
           raise Nanoc::Core::Errors::CannotUseBinaryFilter.new(@rep, klass)
         elsif !klass.from_binary? && last.binary?
@@ -127,7 +127,7 @@ module Nanoc
             items: @compilation_context.site.items,
             dependency_tracker: @dependency_tracker,
             compilation_context: @compilation_context,
-            compiled_content_store: @compilation_context.compiled_content_store,
+            compiled_content_repo: @compilation_context.compiled_content_repo,
           )
       end
     end

data/lib/nanoc/core/identifier.rb

@@ -60,10 +60,10 @@ module Nanoc
 
         case @type
         when :legacy
-          @string = "/#{string}/".gsub(/^\/+|\/+$/, '/').freeze
+          @string = "/#{string}/".gsub(%r{^/+|/+$}, '/').freeze
         when :full
-          raise InvalidIdentifierError.new(string) if string !~ /\A\//
-          raise InvalidFullIdentifierError.new(string) if string =~ /\/\z/
+          raise InvalidIdentifierError.new(string) if string !~ %r{\A/}
+          raise InvalidFullIdentifierError.new(string) if string =~ %r{/\z}
 
           @string = string.dup.freeze
         else
@@ -133,11 +133,11 @@ module Nanoc
       contract String => self
       # @return [Nanoc::Core::Identifier]
       def prefix(string)
-        unless /\A\//.match?(string)
+        unless %r{\A/}.match?(string)
           raise InvalidPrefixError.new(string)
         end
 
-        Nanoc::Core::Identifier.new(string.sub(/\/+\z/, '') + @string, type: @type)
+        Nanoc::Core::Identifier.new(string.sub(%r{/+\z}, '') + @string, type: @type)
       end
 
       contract C::None => String
@@ -152,7 +152,7 @@ module Nanoc
         if extname.empty?
           @string
         else
-          @string[0..-extname.size - 1]
+          @string[0..(-extname.size - 1)]
         end
       end
 
@@ -174,7 +174,7 @@ module Nanoc
         if extname.empty?
           @string
         else
-          @string[0..-extname.size - 2]
+          @string[0..(-extname.size - 2)]
         end
       end
 

data/lib/nanoc/core/item_rep_router.rb

@@ -57,22 +57,18 @@ module Nanoc
         # Encode
         paths = paths.map { |path| path.encode('UTF-8') }
 
-        # Validate format
         paths.each do |path|
+          # Validate format
           unless path.start_with?('/')
             raise RouteWithoutSlashError.new(path, rep)
           end
-        end
 
-        # Validate uniqueness
-        paths.each do |path|
+          # Validate uniqueness
           if assigned_paths.include?(path)
             # TODO: Include snapshot names in error message
             reps = [assigned_paths[path], rep].sort_by { |r| [r.item.identifier, r.name] }
             raise IdenticalRoutesError.new(path, *reps)
           end
-        end
-        paths.each do |path|
           assigned_paths[path] = rep
         end
 
@@ -88,7 +84,7 @@ module Nanoc
         @site.config[:index_filenames].each do |index_filename|
           slashed_index_filename = '/' + index_filename
           if basic_path.end_with?(slashed_index_filename)
-            return basic_path[0..-index_filename.length - 1]
+            return basic_path[0..(-index_filename.length - 1)]
           end
         end
 

data/lib/nanoc/core/item_rep_writer.rb

@@ -8,21 +8,21 @@ module Nanoc
 
       TMP_TEXT_ITEMS_DIR = 'text_items'
 
-      def write_all(item_rep, compiled_content_store)
+      def write_all(item_rep, compiled_content_repo)
         written_paths = Set.new
 
         item_rep.snapshot_defs.map(&:name).each do |snapshot_name|
-          write(item_rep, compiled_content_store, snapshot_name, written_paths)
+          write(item_rep, compiled_content_repo, snapshot_name, written_paths)
         end
       end
 
-      def write(item_rep, compiled_content_store, snapshot_name, written_paths)
+      def write(item_rep, compiled_content_repo, snapshot_name, written_paths)
         item_rep.raw_paths.fetch(snapshot_name, []).each do |raw_path|
-          write_single(item_rep, compiled_content_store, snapshot_name, raw_path, written_paths)
+          write_single(item_rep, compiled_content_repo, snapshot_name, raw_path, written_paths)
         end
       end
 
-      def write_single(item_rep, compiled_content_store, snapshot_name, raw_path, written_paths)
+      def write_single(item_rep, compiled_content_repo, snapshot_name, raw_path, written_paths)
         assert Nanoc::Core::Assertions::PathIsAbsolute.new(path: raw_path)
 
         # Don’t write twice
@@ -42,7 +42,7 @@ module Nanoc
           :rep_write_started, item_rep, raw_path
         )
 
-        content = compiled_content_store.get(item_rep, snapshot_name)
+        content = compiled_content_repo.get(item_rep, snapshot_name)
         if content.binary?
           temp_path = content.filename
         else

data/lib/nanoc/core/outdatedness_checker.rb

@@ -134,7 +134,7 @@ module Nanoc
 
       def attributes_unaffected?(status, dependency)
         reason = status.reasons.find { |r| r.is_a?(Nanoc::Core::OutdatednessReasons::AttributesModified) }
-        reason && !dependency.props.attribute_keys.empty? && (dependency.props.attribute_keys & reason.attributes).empty?
+        reason && !dependency.props.attribute_keys.empty? && !dependency.props.attribute_keys.intersect?(reason.attributes)
       end
 
       def raw_content_prop_causes_outdatedness?(objects, raw_content_prop)

data/lib/nanoc/core/textual_compiled_content_cache.rb

@@ -32,16 +32,12 @@ module Nanoc
         item_cache.key?(rep.name)
       end
 
-      contract Nanoc::Core::ItemRep, C::HashOf[Symbol => Nanoc::Core::Content] => C::Any
+      contract Nanoc::Core::ItemRep, C::HashOf[Symbol => Nanoc::Core::TextualContent] => C::Any
       # Sets the compiled content for the given representation.
       #
       # This cached compiled content is a hash where the keys are the snapshot
       # names, and the values the compiled content at the given snapshot.
       def []=(rep, content)
-        # FIXME: once the binary content cache is properly enabled (no longer
-        # behind a feature flag), change contract to be TextualContent, rather
-        # than Content.
-
         @cache[rep.item.identifier] ||= {}
         @cache[rep.item.identifier][rep.name] = content
       end
@@ -57,13 +53,6 @@ module Nanoc
         end
       end
 
-      # True if there is cached compiled content available for this item, and
-      # all entries are textual.
-      def full_cache_available?(rep)
-        cache = self[rep]
-        cache ? cache.none? { |_snapshot_name, content| content.binary? } : false
-      end
-
       protected
 
       def data

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.14.5'
+    VERSION = '4.14.6'
   end
 end

data/lib/nanoc/core/view_context_for_compilation.rb

@@ -9,26 +9,26 @@ module Nanoc
       attr_reader :items
       attr_reader :dependency_tracker
       attr_reader :compilation_context
-      attr_reader :compiled_content_store
+      attr_reader :compiled_content_repo
 
       contract C::KeywordArgs[
         reps: Nanoc::Core::ItemRepRepo,
         items: Nanoc::Core::IdentifiableCollection,
         dependency_tracker: Nanoc::Core::DependencyTracker,
         compilation_context: Nanoc::Core::CompilationContext,
-        compiled_content_store: Nanoc::Core::CompiledContentStore,
+        compiled_content_repo: Nanoc::Core::CompiledContentRepo,
       ] => C::Any
-      def initialize(reps:, items:, dependency_tracker:, compilation_context:, compiled_content_store:)
+      def initialize(reps:, items:, dependency_tracker:, compilation_context:, compiled_content_repo:)
         @reps = reps
         @items = items
         @dependency_tracker = dependency_tracker
         @compilation_context = compilation_context
-        @compiled_content_store = compiled_content_store
+        @compiled_content_repo = compiled_content_repo
       end
 
       contract Nanoc::Core::ItemRep, C::KeywordArgs[site: Nanoc::Core::Site] => Hash
       def assigns_for(rep, site:)
-        last_content = @compiled_content_store.get_current(rep)
+        last_content = @compiled_content_repo.get_current(rep)
         content_or_filename_assigns =
           if last_content.binary?
             { filename: last_content.filename }

data/lib/nanoc/core/views/compilation_item_rep_view.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    class CompilationItemRepView < ::Nanoc::Core::BasicItemRepView
+      # @abstract
+      def item_view_class
+        Nanoc::Core::CompilationItemView
+      end
+
+      # Returns the item rep’s raw path. It includes the path to the output
+      # directory and the full filename.
+      #
+      # @param [Symbol] snapshot The snapshot for which the path should be
+      #   returned.
+      #
+      # @return [String] The item rep’s raw path.
+      def raw_path(snapshot: :last)
+        @context.dependency_tracker.bounce(_unwrap.item, compiled_content: true)
+
+        raw_path = @item_rep.raw_path(snapshot:)
+
+        unless @item_rep.compiled?
+          could_load = _try_load_from_cache
+
+          unless could_load
+            raise Nanoc::Core::Errors::UnmetDependency.new(@item_rep, snapshot)
+          end
+        end
+
+        # Ensure file exists
+        if raw_path && !File.file?(raw_path)
+          raise Nanoc::Core::Errors::InternalInconsistency,
+                "File `#{raw_path}` expected to exist, but did not."
+        end
+
+        raw_path
+      end
+
+      # Returns the compiled content.
+      #
+      # @param [String] snapshot The name of the snapshot from which to
+      #   fetch the compiled content. By default, the returned compiled content
+      #   will be the content compiled right before the first layout call (if
+      #   any).
+      #
+      # @return [String] The content at the given snapshot.
+      def compiled_content(snapshot: nil)
+        compiled_content_repo = @context.compiled_content_repo
+
+        @context.dependency_tracker.bounce(@item_rep.item, compiled_content: true)
+
+        begin
+          compiled_content_repo.compiled_content(rep: @item_rep, snapshot:)
+        rescue Nanoc::Core::Errors::UnmetDependency => e
+          could_load = _try_load_from_cache
+          unless could_load
+            raise e
+          end
+
+          # Get the compiled content again. Previously in this method, this is
+          # what raised the `UnmetDependency` error.
+          compiled_content_repo.compiled_content(rep: @item_rep, snapshot:)
+        end
+      end
+
+      def _try_load_from_cache
+        # If we get an unmet dependency, try to load the content from the
+        # compiled content cache. If this is not possible, re-raise the unmet
+        # dependency error, and then let the compiler deal with it regularly.
+
+        compilation_context = @context.compilation_context
+        compiled_content_cache = compilation_context.compiled_content_cache
+        compiled_content_repo = compilation_context.compiled_content_repo
+
+        # Requirement: The item rep must not be marked as outdated.
+        outdated = compilation_context.outdatedness_store.include?(@item_rep)
+        return false if outdated
+
+        # Requirement: The compiled content cache must have a cache entry for this item rep.
+        cache_available = compiled_content_cache.full_cache_available?(@item_rep)
+        return false unless cache_available
+
+        # Load the compiled content from the cache
+        Nanoc::Core::NotificationCenter.post(:cached_content_used, @item_rep)
+        compiled_content_repo.set_all(@item_rep, compiled_content_cache[@item_rep])
+
+        # Mark as compiled
+        @item_rep.compiled = true
+
+        true
+      end
+    end
+  end
+end

data/lib/nanoc/core.rb

@@ -2,7 +2,6 @@
 
 # Ruby stdlib
 require 'base64'
-require 'fiber'
 require 'find'
 require 'singleton'
 require 'tmpdir'
@@ -48,7 +47,7 @@ module Nanoc
     # @api private
     def self.version_information
       "Nanoc #{Nanoc::Core::VERSION} © 2007–… Denis Defreyne.\n" \
-      "Running #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} with RubyGems #{Gem::VERSION}.\n"
+        "Running #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} with RubyGems #{Gem::VERSION}.\n"
     end
 
     # @return [Boolean] True if the current platform is Windows, false otherwise.
@@ -74,6 +73,7 @@ end
 loader = Zeitwerk::Loader.new
 loader.inflector = inflector_class.new
 loader.push_dir(__dir__ + '/..')
+loader.push_dir(__dir__ + '/core/views', namespace: Nanoc::Core)
 loader.ignore(__dir__ + '/../nanoc-core.rb')
 loader.ignore(__dir__ + '/core/core_ext')
 loader.setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.14.5
+  version: 4.14.6
 platform: ruby
 authors:
 - Denis Defreyne
@@ -165,9 +165,6 @@ files:
 - lib/nanoc/core/action_sequence_store.rb
 - lib/nanoc/core/aggregate_data_source.rb
 - lib/nanoc/core/assertions.rb
-- lib/nanoc/core/basic_item_rep_collection_view.rb
-- lib/nanoc/core/basic_item_rep_view.rb
-- lib/nanoc/core/basic_item_view.rb
 - lib/nanoc/core/basic_outdatedness_checker.rb
 - lib/nanoc/core/binary_compiled_content_cache.rb
 - lib/nanoc/core/binary_content.rb
@@ -177,9 +174,6 @@ files:
 - lib/nanoc/core/checksummer.rb
 - lib/nanoc/core/code_snippet.rb
 - lib/nanoc/core/compilation_context.rb
-- lib/nanoc/core/compilation_item_rep_collection_view.rb
-- lib/nanoc/core/compilation_item_rep_view.rb
-- lib/nanoc/core/compilation_item_view.rb
 - lib/nanoc/core/compilation_phases/abstract.rb
 - lib/nanoc/core/compilation_phases/cache.rb
 - lib/nanoc/core/compilation_phases/mark_done.rb
@@ -200,11 +194,10 @@ files:
 - lib/nanoc/core/compilation_stages/store_post_compilation_state.rb
 - lib/nanoc/core/compilation_stages/store_pre_compilation_state.rb
 - lib/nanoc/core/compiled_content_cache.rb
-- lib/nanoc/core/compiled_content_store.rb
+- lib/nanoc/core/compiled_content_repo.rb
 - lib/nanoc/core/compiler.rb
 - lib/nanoc/core/compiler_loader.rb
 - lib/nanoc/core/config_loader.rb
-- lib/nanoc/core/config_view.rb
 - lib/nanoc/core/configuration-schema.json
 - lib/nanoc/core/configuration.rb
 - lib/nanoc/core/content.rb
@@ -227,14 +220,11 @@ files:
 - lib/nanoc/core/feature.rb
 - lib/nanoc/core/filter.rb
 - lib/nanoc/core/identifiable_collection.rb
-- lib/nanoc/core/identifiable_collection_view.rb
 - lib/nanoc/core/identifier.rb
 - lib/nanoc/core/in_memory_data_source.rb
 - lib/nanoc/core/instrumentor.rb
 - lib/nanoc/core/item.rb
 - lib/nanoc/core/item_collection.rb
-- lib/nanoc/core/item_collection_with_reps_view.rb
-- lib/nanoc/core/item_collection_without_reps_view.rb
 - lib/nanoc/core/item_rep.rb
 - lib/nanoc/core/item_rep_builder.rb
 - lib/nanoc/core/item_rep_repo.rb
@@ -243,16 +233,8 @@ files:
 - lib/nanoc/core/item_rep_writer.rb
 - lib/nanoc/core/layout.rb
 - lib/nanoc/core/layout_collection.rb
-- lib/nanoc/core/layout_collection_view.rb
-- lib/nanoc/core/layout_view.rb
 - lib/nanoc/core/lazy_value.rb
-- lib/nanoc/core/mutable_config_view.rb
 - lib/nanoc/core/mutable_document_view_mixin.rb
-- lib/nanoc/core/mutable_identifiable_collection_view.rb
-- lib/nanoc/core/mutable_item_collection_view.rb
-- lib/nanoc/core/mutable_item_view.rb
-- lib/nanoc/core/mutable_layout_collection_view.rb
-- lib/nanoc/core/mutable_layout_view.rb
 - lib/nanoc/core/notification_center.rb
 - lib/nanoc/core/outdatedness_checker.rb
 - lib/nanoc/core/outdatedness_reasons.rb
@@ -268,10 +250,6 @@ files:
 - lib/nanoc/core/outdatedness_status.rb
 - lib/nanoc/core/outdatedness_store.rb
 - lib/nanoc/core/pattern.rb
-- lib/nanoc/core/post_compile_item_collection_view.rb
-- lib/nanoc/core/post_compile_item_rep_collection_view.rb
-- lib/nanoc/core/post_compile_item_rep_view.rb
-- lib/nanoc/core/post_compile_item_view.rb
 - lib/nanoc/core/prefixed_data_source.rb
 - lib/nanoc/core/processing_action.rb
 - lib/nanoc/core/processing_actions.rb
@@ -297,13 +275,35 @@ files:
 - lib/nanoc/core/view_context_for_compilation.rb
 - lib/nanoc/core/view_context_for_pre_compilation.rb
 - lib/nanoc/core/view_context_for_shell.rb
+- lib/nanoc/core/views/basic_item_rep_collection_view.rb
+- lib/nanoc/core/views/basic_item_rep_view.rb
+- lib/nanoc/core/views/basic_item_view.rb
+- lib/nanoc/core/views/compilation_item_rep_collection_view.rb
+- lib/nanoc/core/views/compilation_item_rep_view.rb
+- lib/nanoc/core/views/compilation_item_view.rb
+- lib/nanoc/core/views/config_view.rb
+- lib/nanoc/core/views/identifiable_collection_view.rb
+- lib/nanoc/core/views/item_collection_with_reps_view.rb
+- lib/nanoc/core/views/item_collection_without_reps_view.rb
+- lib/nanoc/core/views/layout_collection_view.rb
+- lib/nanoc/core/views/layout_view.rb
+- lib/nanoc/core/views/mutable_config_view.rb
+- lib/nanoc/core/views/mutable_identifiable_collection_view.rb
+- lib/nanoc/core/views/mutable_item_collection_view.rb
+- lib/nanoc/core/views/mutable_item_view.rb
+- lib/nanoc/core/views/mutable_layout_collection_view.rb
+- lib/nanoc/core/views/mutable_layout_view.rb
+- lib/nanoc/core/views/post_compile_item_collection_view.rb
+- lib/nanoc/core/views/post_compile_item_rep_collection_view.rb
+- lib/nanoc/core/views/post_compile_item_rep_view.rb
+- lib/nanoc/core/views/post_compile_item_view.rb
 - lib/nanoc/core/yaml_loader.rb
 homepage: https://nanoc.app/
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.5/nanoc-core
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.6/nanoc-core
 rdoc_options: []
 require_paths:
 - lib
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Core of Nanoc
 test_files: []

data/lib/nanoc/core/compilation_item_rep_view.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Core
-    class CompilationItemRepView < ::Nanoc::Core::BasicItemRepView
-      # How long to wait before the requested file appears.
-      #
-      # This is a bit of a hack -- ideally, Nanoc would know that the file is
-      # being generated, and wait the appropriate amount of time.
-      FILE_APPEAR_TIMEOUT = 10.0
-
-      # @abstract
-      def item_view_class
-        Nanoc::Core::CompilationItemView
-      end
-
-      # Returns the item rep’s raw path. It includes the path to the output
-      # directory and the full filename.
-      #
-      # @param [Symbol] snapshot The snapshot for which the path should be
-      #   returned.
-      #
-      # @return [String] The item rep’s raw path.
-      def raw_path(snapshot: :last)
-        @context.dependency_tracker.bounce(_unwrap.item, compiled_content: true)
-
-        res = @item_rep.raw_path(snapshot:)
-
-        unless @item_rep.compiled?
-          raise Nanoc::Core::Errors::UnmetDependency.new(@item_rep, snapshot)
-        end
-
-        # Wait for file to exist
-        if res
-          start = Time.now
-          sleep 0.05 until File.file?(res) || Time.now - start > FILE_APPEAR_TIMEOUT
-          raise Nanoc::Core::Errors::InternalInconsistency, "File raw_path did not appear in time (#{FILE_APPEAR_TIMEOUT}s): #{res}" unless File.file?(res)
-        end
-
-        res
-      end
-
-      # Returns the compiled content.
-      #
-      # @param [String] snapshot The name of the snapshot from which to
-      #   fetch the compiled content. By default, the returned compiled content
-      #   will be the content compiled right before the first layout call (if
-      #   any).
-      #
-      # @return [String] The content at the given snapshot.
-      def compiled_content(snapshot: nil)
-        @context.dependency_tracker.bounce(_unwrap.item, compiled_content: true)
-        @context.compiled_content_store.compiled_content(rep: _unwrap, snapshot:)
-      end
-    end
-  end
-end