nanoc-core 4.13.5 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6e74deb4968f4bad8e83ccbd91797be60fac35b5ad4b08687b24751bd880fb
-  data.tar.gz: fd3feca15b92a45617b0dc989f56965822081d83af94cb1d168912c29fd84135
+  metadata.gz: 5de89d113517fc4b36e407d4e143a8cf715a976403a88ebccd7b835657d0fe7c
+  data.tar.gz: fa356053ac5f68c8000fe8f33d5c04441e866921905f9b360a0f55c16897e3ac
 SHA512:
-  metadata.gz: c97de8904374f0620b01848e71e3de9fd753d507aa1ccf1804e94e9eafdcbe2459f318a6646e41a3b18ca6146c78b84271785de65534ca8e729fead59294afcf
-  data.tar.gz: d43e488b4139003a08cfe726e4a8c3ef2a588d63b031be816a924623a68f3b37b083ad5e28f5bffeb2bc23bd713d6f4194fe74d72fd534268ccf57b541dc723e
+  metadata.gz: c6ee804845d8df4865282f5844d9d04005efd6b72235a8d1c145308d9df521f1340852934564b34163623da8809abbde7c003dfc04cea8865dd30139898db2ed
+  data.tar.gz: aff44bee226c1edbf815cb9f459a2ab6a59729f0ffd520a771e101f1b92aa11a3adcbf447547a61a147aee7d032ed0849326d65f59c7e6f36a77886791b45ee9

data/lib/nanoc/core/basic_outdatedness_checker.rb

@@ -77,29 +77,27 @@ module Nanoc
         @action_sequences = action_sequences
 
         # Memoize
-        @_outdatedness_status_for = {}
+        @_apply_rules = {}
       end
 
       contract C_OBJ_MAYBE_REP => C::Maybe[Nanoc::Core::OutdatednessStatus]
       def outdatedness_status_for(obj)
-        # TODO: remove memoization (no longer needed)
-        @_outdatedness_status_for[obj] ||=
-          case obj
-          when Nanoc::Core::ItemRep
-            apply_rules(RULES_FOR_ITEM_REP, obj)
-          when Nanoc::Core::Item
-            apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
-          when Nanoc::Core::Layout
-            apply_rules(RULES_FOR_LAYOUT, obj)
-          when Nanoc::Core::Configuration
-            apply_rules(RULES_FOR_CONFIG, obj)
-          when Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection
-            # Collections are never outdated. Objects inside them might be,
-            # however.
-            apply_rules([], obj)
-          else
-            raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
-          end
+        case obj
+        when Nanoc::Core::ItemRep
+          apply_rules(RULES_FOR_ITEM_REP, obj)
+        when Nanoc::Core::Item
+          apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
+        when Nanoc::Core::Layout
+          apply_rules(RULES_FOR_LAYOUT, obj)
+        when Nanoc::Core::Configuration
+          apply_rules(RULES_FOR_CONFIG, obj)
+        when Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection
+          # Collections are never outdated. Objects inside them might be,
+          # however.
+          apply_rules([], obj)
+        else
+          raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
+        end
       end
 
       def action_sequence_for(rep)
@@ -110,18 +108,19 @@ module Nanoc
 
       contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, Nanoc::Core::OutdatednessStatus => C::Maybe[Nanoc::Core::OutdatednessStatus]
       def apply_rules(rules, obj, status = Nanoc::Core::OutdatednessStatus.new)
-        rules.inject(status) do |acc, rule|
-          if acc.useful_to_apply?(rule)
-            reason = rule.instance.call(obj, self)
-            if reason
-              acc.update(reason)
+        @_apply_rules[obj] ||=
+          rules.inject(status) do |acc, rule|
+            if acc.useful_to_apply?(rule)
+              reason = rule.instance.call(obj, self)
+              if reason
+                acc.update(reason)
+              else
+                acc
+              end
             else
               acc
             end
-          else
-            acc
           end
-        end
       end
 
       contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[Nanoc::Core::OutdatednessStatus]

data/lib/nanoc/core/compilation_item_rep_view.rb

@@ -27,7 +27,7 @@ module Nanoc
         res = @item_rep.raw_path(snapshot:)
 
         unless @item_rep.compiled?
-          Fiber.yield(Nanoc::Core::Errors::UnmetDependency.new(@item_rep, snapshot))
+          raise Nanoc::Core::Errors::UnmetDependency.new(@item_rep, snapshot)
         end
 
         # Wait for file to exist

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

@@ -12,6 +12,9 @@ module Nanoc
           Nanoc::Core::NotificationCenter.post(:compilation_started, rep)
           yield
           Nanoc::Core::NotificationCenter.post(:compilation_ended, rep)
+        rescue Nanoc::Core::Errors::UnmetDependency
+          Nanoc::Core::NotificationCenter.post(:compilation_suspended, rep)
+          raise
         end
       end
     end

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

@@ -23,10 +23,16 @@ module Nanoc
 
           executor = Nanoc::Core::Executor.new(rep, @compilation_context, dependency_tracker)
 
-          @compilation_context.compiled_content_store.set_current(rep, rep.item.content)
+          # 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)
+          end
+
+          actions = pending_action_sequence_for(rep:)
+          until actions.empty?
+            action = actions.first
 
-          actions = @action_sequences[rep]
-          actions.each do |action|
             case action
             when Nanoc::Core::ProcessingActions::Filter
               executor.filter(action.filter_name, action.params)
@@ -39,10 +45,17 @@ module Nanoc
             else
               raise Nanoc::Core::Errors::InternalInconsistency, "unknown action #{action.inspect}"
             end
+
+            actions.shift
           end
         ensure
           dependency_tracker.exit
         end
+
+        def pending_action_sequence_for(rep:)
+          @_pending_action_sequences ||= {}
+          @_pending_action_sequences[rep] ||= @action_sequences[rep].to_a
+        end
       end
     end
   end

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

@@ -87,13 +87,9 @@ module Nanoc
             wrapped: recalculate_phase,
           )
 
-          resume_phase = Nanoc::Core::CompilationPhases::Resume.new(
-            wrapped: cache_phase,
-          )
-
           write_phase = Nanoc::Core::CompilationPhases::Write.new(
             compiled_content_store: @compilation_context.compiled_content_store,
-            wrapped: resume_phase,
+            wrapped: cache_phase,
           )
 
           mark_done_phase = Nanoc::Core::CompilationPhases::MarkDone.new(

data/lib/nanoc/core/compiled_content_store.rb

@@ -57,9 +57,8 @@ module Nanoc
         content = get(rep, snapshot_name)
         return content if content
 
-        # Content is unavailable; notify and try again
-        Fiber.yield(Nanoc::Core::Errors::UnmetDependency.new(rep, snapshot_name))
-        get(rep, snapshot_name)
+        # Content is unavailable
+        raise Nanoc::Core::Errors::UnmetDependency.new(rep, snapshot_name)
       end
 
       contract C::KeywordArgs[rep: Nanoc::Core::ItemRep, snapshot: C::Optional[C::Maybe[Symbol]]] => String

data/lib/nanoc/core/config_loader.rb

@@ -29,7 +29,11 @@ module Nanoc
 
       # @return [String]
       def self.config_filename_for_cwd
-        filenames = %w[nanoc.yaml config.yaml]
+        filenames = [
+          'nanoc.yaml',
+          'nanoc.toml',
+          'config.yaml',
+        ]
         candidate = filenames.find { |f| File.file?(f) }
         candidate && File.expand_path(candidate)
       end
@@ -54,7 +58,8 @@ module Nanoc
       end
 
       def load_file(filename)
-        YamlLoader.load_file(filename)
+        loader = StructuredDataLoader.for_extension(File.extname(filename))
+        loader.load_file(filename)
       end
 
       # @api private

data/lib/nanoc/core/contracts_support.rb

@@ -78,8 +78,8 @@ module Nanoc
           end
         end
 
-        def contract(*args)
-          Contract(*args)
+        def contract(*)
+          Contract(*)
         end
       end
 

data/lib/nanoc/core/dependency_props.rb

@@ -14,24 +14,24 @@ module Nanoc
         C::Or[
           C::SetOf[C::Or[String, Regexp]],
           C::ArrayOf[C::Or[String, Regexp]],
-          C::Bool
+          C::Bool,
         ]
 
       C_ATTR =
         C::Or[
           C::SetOf[
             C::Or[
-              Symbol,          # any value
-              [Symbol, C::Any] # pair (specific value)
+              Symbol, # any value
+              [Symbol, C::Any], # pair (specific value)
             ],
           ],
           C::ArrayOf[
             C::Or[
-              Symbol,          # any value
-              [Symbol, C::Any] # pair (specific value)
+              Symbol, # any value
+              [Symbol, C::Any], # pair (specific value)
             ],
           ],
-          C::Bool
+          C::Bool,
         ]
 
       C_ARGS =
@@ -39,7 +39,7 @@ module Nanoc
           raw_content: C::Optional[C_RAW_CONTENT],
           attributes: C::Optional[C_ATTR],
           compiled_content: C::Optional[C::Bool],
-          path: C::Optional[C::Bool]
+          path: C::Optional[C::Bool],
         ]
 
       contract C_ARGS => C::Any

data/lib/nanoc/core/dependency_store.rb

@@ -9,14 +9,14 @@ module Nanoc
       C_RAW_CONTENT =
         C::Or[
           C::ArrayOf[C::Or[String, Regexp]],
-          C::Bool
+          C::Bool,
         ]
 
       C_ATTR =
         C::Or[
           C::ArrayOf[Symbol],
           C::HashOf[Symbol => C::Any],
-          C::Bool
+          C::Bool,
         ]
 
       C_KEYWORD_PROPS =
@@ -24,7 +24,7 @@ module Nanoc
           raw_content: C::Optional[C_RAW_CONTENT],
           attributes: C::Optional[C_ATTR],
           compiled_content: C::Optional[C::Bool],
-          path: C::Optional[C::Bool]
+          path: C::Optional[C::Bool],
         ]
 
       C_OBJ_SRC = Nanoc::Core::Item
@@ -34,7 +34,7 @@ module Nanoc
           Nanoc::Core::Item,
           Nanoc::Core::Layout,
           Nanoc::Core::Configuration,
-          Nanoc::Core::IdentifiableCollection
+          Nanoc::Core::IdentifiableCollection,
         ]
 
       attr_reader :items

data/lib/nanoc/core/dependency_tracker.rb

@@ -11,20 +11,20 @@ module Nanoc
           Nanoc::Core::Item,
           Nanoc::Core::Layout,
           Nanoc::Core::Configuration,
-          Nanoc::Core::IdentifiableCollection
+          Nanoc::Core::IdentifiableCollection,
         ]
 
       C_RAW_CONTENT =
         C::Or[
           C::ArrayOf[C::Or[String, Regexp]],
-          C::Bool
+          C::Bool,
         ]
 
       C_ATTR =
         C::Or[
           C::ArrayOf[Symbol],
           C::HashOf[Symbol => C::Any],
-          C::Bool
+          C::Bool,
         ]
 
       C_ARGS =
@@ -32,7 +32,7 @@ module Nanoc
           raw_content: C::Optional[C_RAW_CONTENT],
           attributes: C::Optional[C_ATTR],
           compiled_content: C::Optional[C::Bool],
-          path: C::Optional[C::Bool]
+          path: C::Optional[C::Bool],
         ]
 
       attr_reader :dependency_store

data/lib/nanoc/core/directed_graph.rb

@@ -33,6 +33,8 @@ module Nanoc
     #   graph.predecessors_of('e').sort
     #     # => %w( c d )
     class DirectedGraph
+      EMPTY_SET = Set.new.freeze
+
       # @group Creating a graph
 
       # Creates a new directed graph with the given vertices.
@@ -40,7 +42,8 @@ module Nanoc
         @vertices = {}
         @next_vertex_idx = 0
         vertices.each do |v|
-          @vertices[v] = @next_vertex_idx.tap { @next_vertex_idx += 1 }
+          @vertices[v] = @next_vertex_idx
+          @next_vertex_idx += 1
         end
 
         @to_graph = {}
@@ -93,7 +96,8 @@ module Nanoc
       def add_vertex(vertex)
         return if @vertices.key?(vertex)
 
-        @vertices[vertex] = @next_vertex_idx.tap { @next_vertex_idx += 1 }
+        @vertices[vertex] = @next_vertex_idx
+        @next_vertex_idx += 1
       end
 
       # Deletes all edges going to the given vertex.
@@ -121,7 +125,7 @@ module Nanoc
       #
       # @return [Array] Direct predecessors of the given vertex
       def direct_predecessors_of(to)
-        @to_graph.fetch(to, Set.new)
+        @to_graph.fetch(to, EMPTY_SET)
       end
 
       # Returns the predecessors of the given vertex, i.e. the vertices x for

data/lib/nanoc/core/feature.rb

@@ -91,4 +91,4 @@ module Nanoc
   end
 end
 
-Nanoc::Core::Feature.define('where', version: '4.13')
+Nanoc::Core::Feature.define('where', version: '4.14')

data/lib/nanoc/core/filter.rb

@@ -249,11 +249,6 @@ module Nanoc
         end
       end
 
-      # @api private
-      def on_main_fiber(&block)
-        Fiber.yield(block)
-      end
-
       contract C::ArrayOf[C::Named['Nanoc::Core::BasicItemView']] => C::Any
       # Creates a dependency from the item that is currently being filtered onto
       # the given collection of items. In other words, require the given items

data/lib/nanoc/core/instrumentor.rb

@@ -23,7 +23,7 @@ module Nanoc
         @enabled = false
       end
 
-      def self.call(key, *args)
+      def self.call(key, *)
         return yield unless @enabled
 
         begin
@@ -32,7 +32,7 @@ module Nanoc
           yield
         ensure
           stopwatch.stop
-          Nanoc::Core::NotificationCenter.post(key, stopwatch.duration, *args)
+          Nanoc::Core::NotificationCenter.post(key, stopwatch.duration, *)
         end
       end
     end

data/lib/nanoc/core/notification_center.rb

@@ -10,46 +10,9 @@ module Nanoc
     # table of subscribers is not stored in the observable object itself, but in
     # the notification center.
     class NotificationCenter
-      DONE = Object.new
-      SYNC = Object.new
-
       def initialize
-        @thread = nil
-
         # name => observers dictionary
         @notifications = Hash.new { |hash, name| hash[name] = [] }
-
-        @queue = Queue.new
-
-        @sync_queue = Queue.new
-        on(SYNC, self) { @sync_queue << true }
-      end
-
-      def start
-        @thread ||= Thread.new do # rubocop:disable Naming/MemoizedInstanceVariableName
-          Thread.current.abort_on_exception = true
-
-          loop do
-            elem = @queue.pop
-            break if DONE.equal?(elem)
-
-            name = elem[0]
-            args = elem[1]
-
-            @notifications[name].each do |observer|
-              observer[:block].call(*args)
-            end
-          end
-        end
-      end
-
-      def stop
-        @queue << DONE
-        @thread.join
-      end
-
-      def force_stop
-        @queue << DONE
       end
 
       def on(name, id = nil, &block)
@@ -61,26 +24,24 @@ module Nanoc
       end
 
       def post(name, *args)
-        @queue << [name, args]
-        self
-      end
+        @notifications[name].each do |observer|
+          observer[:block].call(*args)
+        end
 
-      def sync
-        post(SYNC)
-        @sync_queue.pop
+        self
       end
 
       class << self
         def instance
-          @_instance ||= new.tap(&:start)
+          @_instance ||= new
         end
 
         def on(name, id = nil, &)
           instance.on(name, id, &)
         end
 
-        def post(name, *args)
-          instance.post(name, *args)
+        def post(name, *)
+          instance.post(name, *)
         end
 
         def remove(name, id)
@@ -88,18 +49,8 @@ module Nanoc
         end
 
         def reset
-          instance.stop
           @_instance = nil
         end
-
-        def force_reset
-          instance.force_stop
-          @_instance = nil
-        end
-
-        def sync
-          instance.sync
-        end
       end
     end
   end

data/lib/nanoc/core/outdatedness_checker.rb

@@ -28,7 +28,7 @@ module Nanoc
         dependency_store: Nanoc::Core::DependencyStore,
         action_sequence_store: Nanoc::Core::ActionSequenceStore,
         action_sequences: C_ACTION_SEQUENCES,
-        reps: Nanoc::Core::ItemRepRepo
+        reps: Nanoc::Core::ItemRepRepo,
       ] => C::Any
       def initialize(site:, checksum_store:, checksums:, dependency_store:, action_sequence_store:, action_sequences:, reps:)
         @site = site

data/lib/nanoc/core/structured_data_loader.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    # @api private
+    module StructuredDataLoader
+      class UnknownLanguageError < StandardError
+        def initialize(lang)
+          super("cannot find loader for language: #{lang.inspect}")
+        end
+      end
+
+      def self.for_language(language)
+        case language
+        when :yaml
+          YamlLoader
+        when :toml
+          TomlLoader
+        else
+          raise UnknownLanguageError.enw(language)
+        end
+      end
+
+      def self.for_extension(ext)
+        case ext
+        when '.yaml'
+          YamlLoader
+        when '.toml'
+          TomlLoader
+        else
+          raise UnknownLanguageError.enw(language)
+        end
+      end
+    end
+  end
+end

data/lib/nanoc/core/toml_loader.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    # @api private
+    module TomlLoader
+      def self.load(string)
+        require 'perfect_toml'
+        PerfectTOML.parse(string)
+      end
+
+      def self.load_file(filename)
+        require 'perfect_toml'
+        load(File.read(filename))
+      end
+    end
+  end
+end

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.13.5'
+    VERSION = '4.14.1'
   end
 end

data/lib/nanoc/core/view.rb

@@ -10,7 +10,7 @@ module Nanoc
       contract C::Maybe[C::Or[
         Nanoc::Core::ViewContextForCompilation,
         Nanoc::Core::ViewContextForPreCompilation,
-        Nanoc::Core::ViewContextForShell
+        Nanoc::Core::ViewContextForShell,
       ]] => C::Any
       def initialize(context)
         @context = context

data/lib/nanoc/core/yaml_loader.rb

@@ -11,8 +11,8 @@ module Nanoc
 
       private_constant :OPTIONS
 
-      def self.load(yaml_string)
-        YAML.safe_load(yaml_string, **OPTIONS)
+      def self.load(string)
+        YAML.safe_load(string, **OPTIONS)
       end
 
       def self.load_file(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.13.5
+  version: 4.14.1
 platform: ruby
 authors:
 - Denis Defreyne
@@ -185,7 +185,6 @@ files:
 - lib/nanoc/core/compilation_phases/mark_done.rb
 - lib/nanoc/core/compilation_phases/notify.rb
 - lib/nanoc/core/compilation_phases/recalculate.rb
-- lib/nanoc/core/compilation_phases/resume.rb
 - lib/nanoc/core/compilation_phases/write.rb
 - lib/nanoc/core/compilation_stage.rb
 - lib/nanoc/core/compilation_stages/build_reps.rb
@@ -286,9 +285,11 @@ files:
 - lib/nanoc/core/snapshot_def.rb
 - lib/nanoc/core/store.rb
 - lib/nanoc/core/string_pattern.rb
+- lib/nanoc/core/structured_data_loader.rb
 - lib/nanoc/core/temp_filename_factory.rb
 - lib/nanoc/core/textual_compiled_content_cache.rb
 - lib/nanoc/core/textual_content.rb
+- lib/nanoc/core/toml_loader.rb
 - lib/nanoc/core/trivial_error.rb
 - lib/nanoc/core/utils.rb
 - lib/nanoc/core/version.rb
@@ -302,7 +303,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.13.5/nanoc-core
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.1/nanoc-core
 rdoc_options: []
 require_paths:
 - lib
@@ -310,14 +311,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Core of Nanoc
 test_files: []

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

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Core
-    module CompilationPhases
-      # Provides functionality for suspending and resuming item rep compilation (using fibers).
-      class Resume < Abstract
-        include Nanoc::Core::ContractsSupport
-
-        DONE = Object.new
-
-        contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
-        def run(rep, is_outdated:, &block)
-          fiber = fiber_for(rep, is_outdated:, &block)
-          while fiber.alive?
-            res = fiber.resume
-
-            case res
-            when Nanoc::Core::Errors::UnmetDependency
-              Nanoc::Core::NotificationCenter.post(:compilation_suspended, rep, res.rep, res.snapshot_name)
-              raise(res)
-            when Proc
-              fiber.resume(res.call)
-            when DONE
-              # ignore
-            else
-              raise Nanoc::Core::Errors::InternalInconsistency.new(
-                "Fiber yielded object of unexpected type #{res.class}",
-              )
-            end
-          end
-        end
-
-        private
-
-        contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => Fiber
-        def fiber_for(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
-          @fibers ||= {}
-
-          @fibers[rep] ||=
-            Fiber.new do
-              yield
-              @fibers.delete(rep)
-              DONE
-            end
-
-          @fibers[rep]
-        end
-      end
-    end
-  end
-end