nanoc-core 4.14.0 → 4.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 789cc6b4702b215a8124a7fd9e223bbd5ae0ab388100d2825cc0aab1a2871706
-  data.tar.gz: 41badc8b04d48a56d08b12394a16677973326c82ff94b61e987c332e27ddcfb5
+  metadata.gz: 1eb383ecd0b9f70dab794c7cbbeaea2000372252ec7fca79a88977f4b9ee52e4
+  data.tar.gz: 10b983997d7836e81a8d9926f8ccaf2f2208e557fce3a61d67675dc954d8dd4a
 SHA512:
-  metadata.gz: 7f65db903bb45e40731a74aff7ed48a9189ed8327e77bc10323a72084e180845fedb2af85b8c4e9f93b1a9b1beb8a9c3b84af562ef89108de994153af7846f79
-  data.tar.gz: 68ba69732bf619f3b30a73b4029d08cfe38e2e4451da63517aca1fc6040cf8d2451438c023844b5dc626c3c6da3ab4009bcd8c35bffc2b72599f6fad866a5a6f
+  metadata.gz: 2a05d9133dfcea7375b3b2dbc86d876701f86d29298bc029eae947b59893071f06df12aeb0491179ec3b6f725770de9ff7af940d16ffbd978c02859acb50e2cb
+  data.tar.gz: e374dd038fb6535c7e48ec2228f872ec06a70022a82306da0a4ac35c11ec2133e88aea1bee4f0ec5fbe339965a63e67f2054a34d1afacb8b7275c26de7e5e6c1

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

@@ -33,7 +33,12 @@ module Nanoc
             end
           end
 
-          selector = Nanoc::Core::ItemRepSelector.new(outdated_reps)
+          selector = Nanoc::Core::ItemRepSelector.new(
+            outdated_reps:,
+            reps: @reps,
+            dependency_store: @dependency_store,
+          )
+
           run_phase_stack do |phase_stack|
             selector.each do |rep|
               handle_errors_while(rep) do
@@ -87,13 +92,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/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/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/item_rep_selector.rb

@@ -4,17 +4,22 @@ module Nanoc
   module Core
     # Yields item reps to compile.
     class ItemRepSelector
-      def initialize(reps)
+      def initialize(outdated_reps:, reps:, dependency_store:)
+        @outdated_reps = outdated_reps
         @reps = reps
+        @dependency_store = dependency_store
       end
 
       # A priority queue that tracks dependencies and can detect circular
       # dependencies.
       class ItemRepPriorityQueue
-        def initialize(reps)
+        def initialize(outdated_reps:, reps:, dependency_store:)
+          @reps = reps
+          @dependency_store = dependency_store
+
           # Prio A: most important; prio C: least important.
           @prio_a = nil
-          @prio_b = reps.dup
+          @prio_b = outdated_reps.dup
           @prio_c = []
 
           # List of reps that we’ve already seen. Reps from `reps` will end up
@@ -59,30 +64,31 @@ module Nanoc
           @completed << @this
         end
 
-        def mark_failed(dep)
-          record_dependency(dep)
+        def mark_failed(needed_rep:)
+          record_dependency(needed_rep)
 
-          # `@this` depends on `dep`, so `dep` has to be compiled first. Thus,
-          # move `@this` into priority C, and `dep` into priority A.
+          # `@this` depends on `needed_rep`, so `needed_rep` has to be compiled
+          # first. Thus, move `@this` into priority C, and `needed_rep` into
+          # priority A.
 
-          # Put `@this` (item rep that needs `dep` to be compiled first) into
-          # priority C (lowest prio).
+          # Put `@this` (item rep that needs `needed_rep` to be compiled first)
+          # into priority C (lowest prio).
           @prio_c.push(@this) unless @prio_c.include?(@this)
 
-          # Put `dep` (item rep that needs to be compiled first, before
+          # Put `needed_rep` (item rep that needs to be compiled first, before
           # `@this`) into priority A (highest prio).
-          @prio_a = dep
+          @prio_a = needed_rep
 
-          # Remember that we’ve prioritised `dep`. This particular element will
-          # come from @prio_b at some point in the future, so we’ll have to skip
-          # it then.
-          @seen << dep
+          # Remember that we’ve prioritised `needed_rep`. This particular
+          # element will come from @prio_b at some point in the future, so we’ll
+          # have to skip it then.
+          @seen << needed_rep
         end
 
         private
 
-        def record_dependency(dep)
-          @dependencies[@this] << dep
+        def record_dependency(rep)
+          @dependencies[@this] << rep
 
           find_cycle(@this, [@this])
         end
@@ -102,7 +108,11 @@ module Nanoc
       end
 
       def each
-        pq = ItemRepPriorityQueue.new(@reps)
+        pq = ItemRepPriorityQueue.new(
+          outdated_reps: @outdated_reps,
+          reps: @reps,
+          dependency_store: @dependency_store,
+        )
 
         loop do
           rep = pq.next
@@ -115,7 +125,7 @@ module Nanoc
             actual_error = e.is_a?(Nanoc::Core::Errors::CompilationError) ? e.unwrap : e
 
             if actual_error.is_a?(Nanoc::Core::Errors::UnmetDependency)
-              pq.mark_failed(actual_error.rep)
+              pq.mark_failed(needed_rep: actual_error.rep)
             else
               raise(e)
             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,18 +24,16 @@ 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, &)
@@ -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/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.14.0'
+    VERSION = '4.14.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.14.2
 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
@@ -304,7 +303,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.0/nanoc-core
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.2/nanoc-core
 rdoc_options: []
 require_paths:
 - lib
@@ -319,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 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:, &)
-          fiber = fiber_for(rep, is_outdated:, &)
-          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