nanoc-core 4.12.11 → 4.12.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7fc026255728ddb8de8c0756afdfbdc7548e47938d9c4fb464023c0811ae4e2
-  data.tar.gz: a8531e9c3920f81c9caa88996b1f195eedec21ef392cda04cd2fcf76c0f83106
+  metadata.gz: 94f41a5b7ba9b534f61e42a82dc9df7bebed20e7f2aadc6610d6b9523e2a3e8a
+  data.tar.gz: a40f9d8498cf715052ba691850e0e59c0877c107a7b0973594645ce7548cc289
 SHA512:
-  metadata.gz: f819fe95a0d25831e51ba4ce360ca76921c01517402bf67d3407d369b1fc8c7f05a7262fe0df1dbfd03e3c3f12d72281d818db19746f294f135e8b017a21a07d
-  data.tar.gz: c0de0aef8f83c0a7723d755bf804a25f3ca574e308b54b36cac6e0a91ac5b0b2c4658635cd899d18fdc830d51250a151cbb23d69dfdd4b4abd1cde5b12c96a2c
+  metadata.gz: 9c28483387d092e48b15f568fb910b60aa237dde2c152938ed4e36174ada46f56edbb29742ad7da98e903d5ed44066b40bc0821891ee48b1e1d48ff607d08370
+  data.tar.gz: b1d14a6cdbb245eb97b7820060406aa545571430214d835110f15d47bd721c49b28a66ee0473130699f4c4be2493cbd8267c81938c4dbc5981b5ce763a3a9437

data/lib/nanoc/core/errors.rb

@@ -72,10 +72,7 @@ module Nanoc
       # Error that is raised during site compilation when an item (directly or
       # indirectly) includes its own item content, leading to endless recursion.
       class DependencyCycle < ::Nanoc::Core::Error
-        def initialize(stack)
-          start_idx = stack.index(stack.last)
-          cycle = stack[start_idx..-2]
-
+        def initialize(cycle)
           msg_bits = []
           msg_bits << 'The site cannot be compiled because there is a dependency cycle:'
           msg_bits << ''

data/lib/nanoc/core/item_rep_selector.rb

@@ -8,58 +8,47 @@ module Nanoc
         @reps = reps
       end
 
-      # An iterator (FIFO) over an array, with ability to ignore certain
-      # elements.
-      class ItemRepIgnorableIterator
-        def initialize(array)
-          @array = array.dup
-        end
-
-        def next_ignoring(ignored)
-          elem = @array.shift
-          elem = @array.shift while ignored.include?(elem)
-          elem
-        end
-      end
-
       # A priority queue that tracks dependencies and can detect circular
       # dependencies.
       class ItemRepPriorityQueue
         def initialize(reps)
           # Prio A: most important; prio C: least important.
-          @prio_a = []
-          @prio_b = ItemRepIgnorableIterator.new(reps)
+          @prio_a = nil
+          @prio_b = reps.dup
           @prio_c = []
 
-          # Stack of things that depend on each other. This is used for
-          # detecting and reporting circular dependencies.
-          @stack = []
-
           # List of reps that we’ve already seen. Reps from `reps` will end up
           # in here. Reps can end up in here even *before* they come from
           # `reps`, when they are part of a dependency.
           @seen = Set.new
+
+          # List of reps that have already been completed (yielded followed by
+          # `#mark_ok`).
+          @completed = Set.new
+
+          # Record (hard) dependencies. Used for detecting cycles.
+          @dependencies = Hash.new { |hash, key| hash[key] = Set.new }
         end
 
         def next
           # Read prio A
-          @this = @prio_a.pop
+          @this = @prio_a
           if @this
-            @stack.push(@this)
+            @prio_a = nil
             return @this
           end
 
           # Read prio B
-          @this = @prio_b.next_ignoring(@seen)
+          @this = @prio_b.shift
+          @this = @prio_b.shift while @seen.include?(@this)
           if @this
-            @stack.push(@this)
             return @this
           end
 
           # Read prio C
           @this = @prio_c.pop
+          @this = @prio_c.pop while @completed.include?(@this)
           if @this
-            @stack.push(@this)
             return @this
           end
 
@@ -67,30 +56,49 @@ module Nanoc
         end
 
         def mark_ok
-          @stack.pop
+          @completed << @this
         end
 
         def mark_failed(dep)
-          if @stack.include?(dep)
-            raise Nanoc::Core::Errors::DependencyCycle.new(@stack + [dep])
-          end
+          record_dependency(dep)
 
           # `@this` depends on `dep`, so `dep` has to be compiled first. Thus,
           # move `@this` into priority C, and `dep` into priority A.
 
           # Put `@this` (item rep that needs `dep` to be compiled first) into
           # priority C (lowest prio).
-          @prio_c.push(@this)
+          @prio_c.push(@this) unless @prio_c.include?(@this)
 
           # Put `dep` (item rep that needs to be compiled first, before
           # `@this`) into priority A (highest prio).
-          @prio_a.push(dep)
+          @prio_a = dep
 
           # 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
         end
+
+        private
+
+        def record_dependency(dep)
+          @dependencies[@this] << dep
+
+          find_cycle(@this, [@this])
+        end
+
+        def find_cycle(dep, path)
+          @dependencies[dep].each do |dep1|
+            # Check whether this dependency path ends in `@this` again. If it
+            # does, we have a cycle (because we started from `@this`).
+            if dep1 == @this
+              raise Nanoc::Core::Errors::DependencyCycle.new(path)
+            end
+
+            # Continue checking, starting from `dep1` this time.
+            find_cycle(dep1, [*path, dep1])
+          end
+        end
       end
 
       def each

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.11'
+    VERSION = '4.12.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.11
+  version: 4.12.13
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-12 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Core of Nanoc