nanoc 4.7.13 → 4.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6113ac8b3ca8085d1247d4e880144d62af62037
-  data.tar.gz: 557d2ae493c26da9ebe71735fcb19da59f9aeba4
+  metadata.gz: 95f87711482fb7881b63a2a4d0a7fca8fecede30
+  data.tar.gz: 6d5b0673fa14f07f4081cc473e24bdd0d558b481
 SHA512:
-  metadata.gz: 7a0f046fd0f6b324dfea8451b0ab89142ff32a572e3e948cbf23e13337de70726097069101ed5484805d105f72ccd245ab8de0db2568f8310878e09eb083db4e
-  data.tar.gz: 06e63734588725c3260fa543ad6844fb94dd7369092bea7249415f1096f363eed66267b752b0cb309e52377d730737688ef8b445b5b19b4029ed13889e7c6894
+  metadata.gz: 1ea685c54608f0c56af24542324c2cc2f3a4c7f84718c22d3abfde40288695290b45c83106283570be844b5183b12ca82c9a9239fefe34c47b8e73d9414755ad
+  data.tar.gz: cd48b21ea8577192f94e990a462d5237a81ea8a54bf3e60012e8552c69344b43abedafe5d70824d7f3732e95b7963542d59b55a2c331cb1df3e137475d6f89a5

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.7.14 (2017-07-16)
+
+Enhancements:
+
+* Various speed improvements (#1195, #1198)
+
 ## 4.7.13 (2017-07-02)
 
 Enhancements:

data/bin/nanoc

@@ -2,6 +2,13 @@
 # frozen_string_literal: true
 
 require 'nanoc'
+
+begin
+  require 'nanoc-rust'
+  NanocRust.activate!
+rescue LoadError
+end
+
 require 'nanoc/cli'
 
 if File.file?('Gemfile') && !defined?(Bundler)

data/lib/nanoc/base/entities/code_snippet.rb

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

data/lib/nanoc/base/entities/configuration.rb

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

data/lib/nanoc/base/entities/directed_graph.rb

@@ -7,27 +7,28 @@ module Nanoc::Int
   # @example Creating and using a directed graph
   #
   #   # Create a graph with three vertices
-  #   graph = Nanoc::Int::DirectedGraph.new(%w( a b c d ))
+  #   graph = Nanoc::Int::DirectedGraph.new(%w( a b c d e ))
   #
   #   # Add edges
   #   graph.add_edge('a', 'b')
   #   graph.add_edge('b', 'c')
   #   graph.add_edge('c', 'd')
+  #   graph.add_edge('b', 'e')
   #
-  #   # Get (direct) predecessors
-  #   graph.direct_predecessors_of('d').sort
-  #     # => %w( c )
-  #   graph.predecessors_of('d').sort
-  #     # => %w( a b c )
+  #   # Get (direct) successors
+  #   graph.direct_successors_of('a').sort
+  #     # => %w( b )
+  #   graph.successors_of('a').sort
+  #     # => %w( b c d e )
   #
   #   # Modify edges
-  #   graph.delete_edge('a', 'b')
+  #   graph.delete_edges_to('c')
   #
-  #   # Get (direct) predecessors again
-  #   graph.direct_predecessors_of('d').sort
-  #     # => %w( c )
-  #   graph.predecessors_of('d').sort
-  #     # => %w( b c )
+  #   # Get (direct) successors again
+  #   graph.direct_successors_of('a').sort
+  #     # => %w( b )
+  #   graph.successors_of('a').sort
+  #     # => %w( b e )
   #
   # @api private
   class DirectedGraph
@@ -36,8 +37,9 @@ module Nanoc::Int
     # Creates a new directed graph with the given vertices.
     def initialize(vertices)
       @vertices = {}
-      vertices.each_with_index do |v, i|
-        @vertices[v] = i
+      @next_vertex_idx = 0
+      vertices.each do |v|
+        @vertices[v] = @next_vertex_idx.tap { @next_vertex_idx += 1 }
       end
 
       @from_graph = {}
@@ -45,8 +47,6 @@ module Nanoc::Int
 
       @edge_props = {}
 
-      @roots = Set.new(@vertices.keys)
-
       invalidate_caches
     end
 
@@ -85,30 +85,6 @@ module Nanoc::Int
         @edge_props[[from, to]] = props
       end
 
-      @roots.delete(to)
-
-      invalidate_caches
-    end
-
-    # Removes the edge from the first vertex to the second vertex. If the
-    # edge does not exist, nothing is done.
-    #
-    # @param from Start vertex of the edge
-    #
-    # @param to   End vertex of the edge
-    #
-    # @return [void]
-    def delete_edge(from, to)
-      @from_graph[from] ||= Set.new
-      @from_graph[from].delete(to)
-
-      @to_graph[to] ||= Set.new
-      @to_graph[to].delete(from)
-
-      @edge_props.delete([from, to])
-
-      @roots.add(to) if @to_graph[to].empty?
-
       invalidate_caches
     end
 
@@ -120,25 +96,7 @@ module Nanoc::Int
     def add_vertex(v)
       return if @vertices.key?(v)
 
-      @vertices[v] = @vertices.size
-
-      @roots << v
-    end
-
-    # Deletes all edges coming from the given vertex.
-    #
-    # @param from Vertex from which all edges should be removed
-    #
-    # @return [void]
-    def delete_edges_from(from)
-      return if @from_graph[from].nil?
-
-      @from_graph[from].each do |to|
-        @to_graph[to].delete(from)
-        @edge_props.delete([from, to])
-        @roots.add(to) if @to_graph[to].empty?
-      end
-      @from_graph.delete(from)
+      @vertices[v] = @next_vertex_idx.tap { @next_vertex_idx += 1 }
     end
 
     # Deletes all edges going to the given vertex.
@@ -154,64 +112,12 @@ module Nanoc::Int
         @edge_props.delete([from, to])
       end
       @to_graph.delete(to)
-      @roots.add(to)
-    end
-
-    # Removes the given vertex from the graph.
-    #
-    # @param v Vertex to remove from the graph
-    #
-    # @return [void]
-    def delete_vertex(v)
-      delete_edges_to(v)
-      delete_edges_from(v)
 
-      @vertices.delete(v)
-      @roots.delete(v)
+      invalidate_caches
     end
 
     # @group Querying the graph
 
-    # Returns a cycle if there is any.
-    def any_cycle
-      all_paths.lazy.map { |path| cycle_in_path(path) }.find(&:itself)
-    end
-
-    # Given a potentially closed path, returns a cycle if there is any.
-    def cycle_in_path(path)
-      vertex = path.last
-      index = path.index(vertex)
-
-      if index < path.size - 1
-        path[index..-2]
-      end
-    end
-
-    # Yields all paths (including potentially closed ones).
-    def all_paths
-      Enumerator.new do |y|
-        @vertices.keys.each do |vertex|
-          dfs_from(vertex) do |path|
-            y << path
-          end
-        end
-      end
-    end
-
-    # Yields all paths (including potentially closed ones) starting from the given vertex.
-    def dfs_from(vertex, path_so_far = [])
-      new_path = path_so_far + [vertex]
-      yield(new_path)
-
-      unless path_so_far.include?(vertex)
-        direct_successors_of(vertex).each do |next_vertex|
-          dfs_from(next_vertex, new_path) do |path|
-            yield(path)
-          end
-        end
-      end
-    end
-
     # Returns the direct predecessors of the given vertex, i.e. the vertices
     # x where there is an edge from x to the given vertex y.
     #
@@ -275,13 +181,6 @@ module Nanoc::Int
       result
     end
 
-    # Returns all root vertices, i.e. vertices where no edge points to.
-    #
-    # @return [Set] The set of all root vertices in this graph.
-    def roots
-      @roots
-    end
-
     private
 
     # Invalidates cached data. This method should be called when the internal

data/lib/nanoc/base/entities/item.rb

@@ -4,7 +4,7 @@ module Nanoc::Int
   # @api private
   class Item < ::Nanoc::Int::Document
     def reference
-      [:item, identifier.to_s]
+      "item:#{identifier}"
     end
   end
 end

data/lib/nanoc/base/entities/item_collection.rb

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

data/lib/nanoc/base/entities/item_rep.rb

@@ -79,7 +79,7 @@ module Nanoc::Int
 
     # 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 inspect

data/lib/nanoc/base/entities/layout.rb

@@ -4,7 +4,7 @@ module Nanoc::Int
   # @api private
   class Layout < ::Nanoc::Int::Document
     def reference
-      [:layout, identifier.to_s]
+      "layout:#{identifier}"
     end
   end
 end

data/lib/nanoc/base/entities/layout_collection.rb

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

data/lib/nanoc/base/errors.rb

@@ -71,13 +71,14 @@ module Nanoc::Int
     # Error that is raised during site compilation when an item (directly or
     # indirectly) includes its own item content, leading to endless recursion.
     class DependencyCycle < Generic
-      def initialize(graph)
-        cycle = graph.any_cycle
+      def initialize(stack)
+        start_idx = stack.index(stack.last)
+        cycle = stack[start_idx..-2]
 
         msg_bits = []
         msg_bits << 'The site cannot be compiled because there is a dependency cycle:'
         msg_bits << ''
-        cycle.reverse_each.with_index do |r, i|
+        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)'

data/lib/nanoc/base/services/item_rep_selector.rb

@@ -9,79 +9,58 @@ module Nanoc::Int
       @reps = reps
     end
 
-    NONE = Object.new
-
-    def each
-      graph = Nanoc::Int::DirectedGraph.new(@reps)
-
-      prio_dependent = Set.new
-      prio_in_progress = Set.new
-      loop do
-        rep = find(graph, prio_dependent, prio_in_progress)
-        break if NONE.equal?(rep)
-
-        begin
-          prio_in_progress << rep
-          yield(rep)
-          prio_in_progress.delete(rep)
-          graph.delete_vertex(rep)
-        rescue => e
-          handle_error(e, rep, graph, prio_dependent)
-        end
+    class MicroGraph
+      def initialize(reps)
+        @reps = Set.new(reps)
+        @stack = []
       end
 
-      # Check whether everything was compiled
-      unless graph.vertices.empty?
-        raise Nanoc::Int::Errors::DependencyCycle.new(graph)
-      end
-    end
-
-    def find(graph, prio_dependent, prio_in_progress)
-      if graph.roots.empty?
-        NONE
-      elsif prio_dependent.any?
-        find_prio(graph, prio_dependent, prio_dependent, prio_in_progress)
-      elsif prio_in_progress.any?
-        find_prio(graph, prio_in_progress, prio_dependent, prio_in_progress)
-      else
-        graph.roots.each { |e| break e }
-      end
-    end
-
-    def find_prio(graph, prio, prio_dependent, prio_in_progress)
-      until prio.empty?
-        rep = prio.each { |e| break e }
-        if graph.roots.include?(rep)
-          return rep
+      def next
+        if @stack.any?
+          @stack.last
+        elsif @reps.any?
+          @reps.each { |rep| break rep }.tap do |rep|
+            @reps.delete(rep)
+            @stack.push(rep)
+          end
         else
-          prio.delete(rep)
+          nil
         end
       end
 
-      find(graph, prio_dependent, prio_in_progress)
-    end
+      def mark_ok
+        @stack.pop
+      end
 
-    def handle_error(e, rep, graph, prio_dependent)
-      actual_error =
-        if e.is_a?(Nanoc::Int::Errors::CompilationError)
-          e.unwrap
-        else
-          e
+      def mark_failed(dep)
+        if @stack.include?(dep)
+          raise Nanoc::Int::Errors::DependencyCycle.new(@stack + [dep])
         end
 
-      if actual_error.is_a?(Nanoc::Int::Errors::UnmetDependency)
-        handle_dependency_error(actual_error, rep, graph, prio_dependent)
-      else
-        raise(e)
+        @reps.delete(dep)
+        @stack.push(dep)
       end
     end
 
-    def handle_dependency_error(e, rep, graph, prio_dependent)
-      other_rep = e.rep
-      prio_dependent << other_rep
-      graph.add_edge(other_rep, rep)
-      unless graph.vertices.include?(other_rep)
-        graph.add_vertex(other_rep)
+    def each
+      mg = MicroGraph.new(@reps)
+
+      loop do
+        rep = mg.next
+        break if rep.nil?
+
+        begin
+          yield(rep)
+          mg.mark_ok
+        rescue => e
+          actual_error = e.is_a?(Nanoc::Int::Errors::CompilationError) ? e.unwrap : e
+
+          if actual_error.is_a?(Nanoc::Int::Errors::UnmetDependency)
+            mg.mark_failed(actual_error.rep)
+          else
+            raise(e)
+          end
+        end
       end
     end
   end