nanoc-core 4.14.7 → 4.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0842ed49f126a6c02412de3835dba441e69d4fb8d2fb8cf4bcb05dc56c8e07f6'
-  data.tar.gz: 740b42972643b02ec8ee939e1ccfbf3e4ce783e9098b519d1c7c38e8a8409f00
+  metadata.gz: 0211c060faacb014851580a92bafd7ab56e576541a094bb902392ea9b2ba2376
+  data.tar.gz: 2db3ce08a6f9c9f45169febe922302f0b239442cadc3c60e0801b2883d3ea714
 SHA512:
-  metadata.gz: 1d7eca3780c7750e200efcd31ab4490c830ada047556b39371542739579b743a10bb4391429cda7e8be5e326bf77efd64e2dce4d109215dd63f736cb0b8cdb49
-  data.tar.gz: a07b12e89289d45e848c884a5c6677a23f46d8a64433617d8e9beee27c81bf23d0c8ca2721b950fd0c78046c9b97c566035d453a068862da0d661aa363f17a4d
+  metadata.gz: 4bbcdbb0f02ee56c56e282f18612eef792bb443ffc00a15a4ea8e332f04ad8992ec07a15583615d0b6fa5a7198b0fcb9be0d1eb08257da69843c2aaa4f9fd1ac
+  data.tar.gz: a300299cb68e8f4db138f5109132a996f8dce933b70ead85e0816b951ec10ac316daaadfc9ebabb57463efcef4b240010b7e098d1e3cae9557fafd51a563ffb3

data/lib/nanoc/core/code_snippet.rb

@@ -52,7 +52,7 @@ module Nanoc
       #
       # @return [Object] An unique reference to this object
       def reference
-        "code_snippet:#{filename}"
+        :"code_snippet:#{filename}"
       end
 
       def inspect

data/lib/nanoc/core/configuration.rb

@@ -188,7 +188,7 @@ module Nanoc
       #
       # @return [Object] An unique reference to this object
       def reference
-        'configuration'
+        :configuration
       end
 
       def inspect

data/lib/nanoc/core/context.rb

@@ -33,11 +33,10 @@ module Nanoc
       # Returns a binding for this instance.
       #
       # @return [Binding] A binding for this instance
-      # rubocop:disable Naming/AccessorMethodName
+      # rubocop:disable-next Naming/AccessorMethodName
       def get_binding
         binding
       end
-      # rubocop:enable Naming/AccessorMethodName
 
       def method_missing(method, *args, &)
         ivar_name = "@#{method}"

data/lib/nanoc/core/directed_graph.rb

@@ -21,8 +21,6 @@ module Nanoc
     #   # Get (direct) predecessors
     #   graph.direct_predecessors_of('b').sort
     #     # => %w( a )
-    #   graph.predecessors_of('e').sort
-    #     # => %w( a b c d )
     #
     #   # Modify edges
     #   graph.delete_edges_to('c')
@@ -30,8 +28,6 @@ module Nanoc
     #   # Get (direct) predecessors again
     #   graph.direct_predecessors_of('e').sort
     #     # => %w( d )
-    #   graph.predecessors_of('e').sort
-    #     # => %w( c d )
     class DirectedGraph
       EMPTY_SET = Set.new.freeze
 
@@ -39,10 +35,12 @@ module Nanoc
 
       # Creates a new directed graph with the given vertices.
       def initialize(vertices)
-        @vertices = {}
+        @vertex_to_idx_map = {}
+        @vertices = []
         @next_vertex_idx = 0
         vertices.each do |v|
-          @vertices[v] = @next_vertex_idx
+          @vertices << v
+          @vertex_to_idx_map[v] = @next_vertex_idx
           @next_vertex_idx += 1
         end
 
@@ -50,14 +48,12 @@ module Nanoc
         @from_graph = {}
 
         @edge_props = {}
-
-        invalidate_caches
       end
 
       def inspect
         s = []
 
-        @vertices.each_pair do |v2, _|
+        @vertices.each do |v2|
           direct_predecessors_of(v2).each do |v1|
             s << [
               "#{v1.inspect} -> #{v2.inspect} " \
@@ -91,8 +87,6 @@ module Nanoc
         if props
           @edge_props[[from, to]] = props
         end
-
-        invalidate_caches
       end
 
       # Adds the given vertex to the graph.
@@ -101,9 +95,10 @@ module Nanoc
       #
       # @return [void]
       def add_vertex(vertex)
-        return if @vertices.key?(vertex)
+        return if @vertex_to_idx_map.key?(vertex)
 
-        @vertices[vertex] = @next_vertex_idx
+        @vertices << vertex
+        @vertex_to_idx_map[vertex] = @next_vertex_idx
         @next_vertex_idx += 1
       end
 
@@ -120,8 +115,6 @@ module Nanoc
           @from_graph.delete(from)
         end
         @to_graph.delete(to)
-
-        invalidate_caches
       end
 
       # @group Querying the graph
@@ -140,24 +133,13 @@ module Nanoc
         @from_graph.fetch(from, EMPTY_SET)
       end
 
-      # Returns the predecessors of the given vertex, i.e. the vertices x for
-      # which there is a path from x to the given vertex y.
-      #
-      # @param to The vertex of which the predecessors should be calculated
-      #
-      # @return [Array] Predecessors of the given vertex
-      def predecessors_of(to)
-        @predecessors[to] ||=
-          recursively_find_vertices(to, :direct_predecessors_of)
-      end
-
       def props_for(from, to)
         @edge_props[[from, to]]
       end
 
       # @return [Array] The list of all vertices in this graph.
       def vertices
-        @vertices.keys.sort_by { |v| @vertices[v] }
+        @vertices
       end
 
       # Returns an array of tuples representing the edges. The result of this
@@ -166,49 +148,15 @@ module Nanoc
       # @return [Array] The list of all edges in this graph.
       def edges
         result = []
-        @vertices.each_pair do |v2, i2|
+        @vertices.each_with_index do |v2, i2|
           direct_predecessors_of(v2)
-            .map { |v1| [@vertices[v1], v1] }
+            .map { |v1| [@vertex_to_idx_map[v1], v1] }
             .each do |i1, v1|
               result << [i1, i2, @edge_props[[v1, v2]]]
             end
         end
         result
       end
-
-      private
-
-      # Invalidates cached data. This method should be called when the internal
-      # graph representation is changed.
-      def invalidate_caches
-        @predecessors = {}
-      end
-
-      # Recursively finds vertices, starting at the vertex start, using the
-      # given method, which should be a symbol to a method that takes a vertex
-      # and returns related vertices (e.g. predecessors, successors).
-      def recursively_find_vertices(start, method)
-        all_vertices = Set.new
-
-        processed_vertices   = Set.new
-        unprocessed_vertices = [start]
-
-        until unprocessed_vertices.empty?
-          # Get next unprocessed vertex
-          vertex = unprocessed_vertices.pop
-          next if processed_vertices.include?(vertex)
-
-          processed_vertices << vertex
-
-          # Add predecessors of this vertex
-          send(method, vertex).each do |v|
-            all_vertices << v unless all_vertices.include?(v)
-            unprocessed_vertices << v
-          end
-        end
-
-        all_vertices
-      end
     end
   end
 end

data/lib/nanoc/core/item.rb

@@ -4,7 +4,7 @@ module Nanoc
   module Core
     class Item < ::Nanoc::Core::Document
       def reference
-        @_reference ||= "item:#{identifier}"
+        @_reference ||= :"item:#{identifier}"
       end
 
       def identifier=(new_identifier)

data/lib/nanoc/core/item_collection.rb

@@ -10,7 +10,7 @@ module Nanoc
       end
 
       def reference
-        'items'
+        :items
       end
     end
   end

data/lib/nanoc/core/item_rep.rb

@@ -95,7 +95,7 @@ module Nanoc
 
       # Returns an object that can be used for uniquely identifying objects.
       def reference
-        "item_rep:#{item.identifier}:#{name}"
+        :"item_rep:#{item.identifier}:#{name}"
       end
 
       def to_s

data/lib/nanoc/core/layout.rb

@@ -4,7 +4,7 @@ module Nanoc
   module Core
     class Layout < ::Nanoc::Core::Document
       def reference
-        @_reference ||= "layout:#{identifier}"
+        @_reference ||= :"layout:#{identifier}"
       end
 
       def identifier=(new_identifier)

data/lib/nanoc/core/layout_collection.rb

@@ -10,7 +10,7 @@ module Nanoc
       end
 
       def reference
-        'layouts'
+        :layouts
       end
     end
   end

data/lib/nanoc/core/mutable_document_view_mixin.rb

@@ -55,12 +55,11 @@ module Nanoc
         # the suggested alternative (Array#include?) carries a measurable
         # performance penatly.
         #
-        # rubocop:disable Style/MultipleComparison
+        # rubocop:disable-next Style/MultipleComparison
         klass == Nanoc::Core::Item ||
           klass == Nanoc::Core::Layout ||
           klass == Nanoc::Core::CompilationItemView ||
           klass == Nanoc::Core::LayoutView
-        # rubocop:enable Style/MultipleComparison
       end
     end
   end

data/lib/nanoc/core/outdatedness_checker.rb

@@ -93,7 +93,7 @@ module Nanoc
         objs_outdated_due_to_dependencies = Set.new
 
         seen = Set.new
-        pending = [nil] + basic_outdated_objs.to_a
+        pending = [nil, @site.items, @site.layouts] + basic_outdated_objs.to_a
         until pending.empty?
           obj = pending.shift
           obj = obj.item if obj.is_a?(Nanoc::Core::ItemRep)

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.14.7'
+    VERSION = '4.14.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.14.7
+  version: 4.14.8
 platform: ruby
 authors:
 - Denis Defreyne
@@ -297,7 +297,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.7/nanoc-core
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.8/nanoc-core
 rdoc_options: []
 require_paths:
 - lib
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Core of Nanoc
 test_files: []