nanoc 4.8.0 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab3b0e2a49c31a0e5209b914287d56489eb2e119
-  data.tar.gz: 63ed26c7176937deef06fc01a2c7a831983b96ff
+  metadata.gz: 8537bc61d500ed5bae70dcae626b5991fd43dea7
+  data.tar.gz: 565524a4ffb2733eb6b05fe547c3ee7e2b0788e9
 SHA512:
-  metadata.gz: 7294e06953f7be8c6331578429f229b3ff6ca06ba1ac9339de20eb77788f60f45dc5310ee9e212f2d0d375171cbd9b7ad86950d5f57bdbd4c4b84a2fc1ffd569
-  data.tar.gz: 7dd6820592b64f3e1a84fb655d2e6682d094752c80ac9133bb59aea639379a930d1a72388b9c4038fd414d90fed44058ed1d59f2b61a60bf47304620aa213405
+  metadata.gz: b174cadc89845ac6b8e7fec2cea4f9feb4022eef44653a6f505c9eb00d10c59c9ba3fc73d5b2f61cb9a928248fac433944d81e780eb0934dd309939def7ecd2a
+  data.tar.gz: 78c42adc2b1bc34501aaae163baffc6ab839b45f81d80430a924cca13d0d3a63573702c0a02bcdce4e788a7a5cf560c5250c09617fa065f1c0cc124086412516

data/NEWS.md

@@ -1,8 +1,14 @@
 # Nanoc news
 
+## 4.8.1 (2017-08-06)
+
+Enhancements:
+
+* Various speed improvements
+
 ## 4.8.0 (2017-07-17)
 
-Featured:
+Features:
 
 * Added `asciidoctor` filter (#1199)
 

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

@@ -7,28 +7,30 @@ 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 e ))
+  #   graph = Nanoc::Int::DirectedGraph.new(%w( a b c d e f g ))
   #
   #   # Add edges
   #   graph.add_edge('a', 'b')
   #   graph.add_edge('b', 'c')
+  #   graph.add_edge('b', 'f')
+  #   graph.add_edge('b', 'g')
   #   graph.add_edge('c', 'd')
-  #   graph.add_edge('b', 'e')
+  #   graph.add_edge('d', 'e')
   #
-  #   # Get (direct) successors
-  #   graph.direct_successors_of('a').sort
-  #     # => %w( b )
-  #   graph.successors_of('a').sort
-  #     # => %w( b c d e )
+  #   # 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')
   #
-  #   # Get (direct) successors again
-  #   graph.direct_successors_of('a').sort
-  #     # => %w( b )
-  #   graph.successors_of('a').sort
-  #     # => %w( b e )
+  #   # Get (direct) predecessors again
+  #   graph.direct_predecessors_of('e').sort
+  #     # => %w( d )
+  #   graph.predecessors_of('e').sort
+  #     # => %w( c d )
   #
   # @api private
   class DirectedGraph
@@ -42,7 +44,6 @@ module Nanoc::Int
         @vertices[v] = @next_vertex_idx.tap { @next_vertex_idx += 1 }
       end
 
-      @from_graph = {}
       @to_graph   = {}
 
       @edge_props = {}
@@ -53,8 +54,8 @@ module Nanoc::Int
     def inspect
       s = []
 
-      @vertices.each_pair do |v1, _|
-        direct_successors_of(v1).each do |v2|
+      @vertices.each_pair do |v2, _|
+        direct_predecessors_of(v2).each do |v1|
           s << [v1.inspect + ' -> ' + v2.inspect + ' props=' + @edge_props[[v1, v2]].inspect]
         end
       end
@@ -75,9 +76,6 @@ module Nanoc::Int
       add_vertex(from)
       add_vertex(to)
 
-      @from_graph[from] ||= Set.new
-      @from_graph[from] << to
-
       @to_graph[to] ||= Set.new
       @to_graph[to] << from
 
@@ -108,7 +106,6 @@ module Nanoc::Int
       return if @to_graph[to].nil?
 
       @to_graph[to].each do |from|
-        @from_graph[from].delete(to)
         @edge_props.delete([from, to])
       end
       @to_graph.delete(to)
@@ -125,17 +122,7 @@ module Nanoc::Int
     #
     # @return [Array] Direct predecessors of the given vertex
     def direct_predecessors_of(to)
-      @to_graph[to].to_a
-    end
-
-    # Returns the direct successors of the given vertex, i.e. the vertices y
-    # where there is an edge from the given vertex x to y.
-    #
-    # @param from The vertex of which the successors should be calculated
-    #
-    # @return [Array] Direct successors of the given vertex
-    def direct_successors_of(from)
-      @from_graph[from].to_a
+      @to_graph.fetch(to, Set.new)
     end
 
     # Returns the predecessors of the given vertex, i.e. the vertices x for
@@ -148,16 +135,6 @@ module Nanoc::Int
       @predecessors[to] ||= recursively_find_vertices(to, :direct_predecessors_of)
     end
 
-    # Returns the successors of the given vertex, i.e. the vertices y for
-    # which there is a path from the given vertex x to y.
-    #
-    # @param from The vertex of which the successors should be calculated
-    #
-    # @return [Array] Successors of the given vertex
-    def successors_of(from)
-      @successors[from] ||= recursively_find_vertices(from, :direct_successors_of)
-    end
-
     def props_for(from, to)
       @edge_props[[from, to]]
     end
@@ -173,8 +150,8 @@ module Nanoc::Int
     # @return [Array] The list of all edges in this graph.
     def edges
       result = []
-      @vertices.each_pair do |v1, i1|
-        direct_successors_of(v1).map { |v2| [@vertices[v2], v2] }.each do |i2, v2|
+      @vertices.each_pair do |v2, i2|
+        direct_predecessors_of(v2).map { |v1| [@vertices[v1], v1] }.each do |i1, v1|
           result << [i1, i2, @edge_props[[v1, v2]]]
         end
       end
@@ -187,7 +164,6 @@ module Nanoc::Int
     # graph representation is changed.
     def invalidate_caches
       @predecessors = {}
-      @successors   = {}
     end
 
     # Recursively finds vertices, starting at the vertex start, using the
@@ -212,7 +188,7 @@ module Nanoc::Int
         end
       end
 
-      all_vertices.to_a
+      all_vertices
     end
   end
 end

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

@@ -18,6 +18,8 @@ module Nanoc::Int
 
       @attributes =
         case attributes
+        when Set
+          attributes
         when Enumerable
           Set.new(attributes)
         else
@@ -26,6 +28,8 @@ module Nanoc::Int
 
       @raw_content =
         case raw_content
+        when Set
+          raw_content
         when Enumerable
           Set.new(raw_content)
         else

data/lib/nanoc/cli.rb

@@ -96,7 +96,7 @@ module Nanoc::CLI
     @root_command = nil
 
     # Add root command
-    filename = File.dirname(__FILE__) + '/cli/commands/nanoc.rb'
+    filename = __dir__ + '/cli/commands/nanoc.rb'
     @root_command = load_command_at(filename)
 
     # Add help command
@@ -104,7 +104,7 @@ module Nanoc::CLI
     add_command(help_cmd)
 
     # Add other commands
-    cmd_filenames = Dir[File.dirname(__FILE__) + '/cli/commands/*.rb']
+    cmd_filenames = Dir[__dir__ + '/cli/commands/*.rb']
     cmd_filenames.each do |cmd_filename|
       next if File.basename(cmd_filename, '.rb') == 'nanoc'
       cmd = load_command_at(cmd_filename)

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.8.0'
+  VERSION = '4.8.1'
 end

data/spec/nanoc/base/directed_graph_spec.rb

@@ -81,9 +81,18 @@ describe Nanoc::Int::DirectedGraph do
       it { is_expected.to be_empty }
     end
 
+    context 'requested for non-existant vertex' do
+      subject { graph.direct_predecessors_of('12345') }
+
+      it { is_expected.to be_empty }
+      it { is_expected.to be_a(Set) }
+    end
+
     context 'one edge to' do
       before { graph.add_edge('1', '2') }
-      it { is_expected.to eq(['1']) }
+
+      it { is_expected.to match_array(['1']) }
+      it { is_expected.to be_a(Set) }
     end
 
     context 'two edges to' do
@@ -93,44 +102,27 @@ describe Nanoc::Int::DirectedGraph do
       end
 
       it { is_expected.to match_array(%w[1 3]) }
+      it { is_expected.to be_a(Set) }
     end
 
     context 'edge from' do
       before { graph.add_edge('2', '3') }
+
       it { is_expected.to be_empty }
+      it { is_expected.to be_a(Set) }
     end
   end
 
-  describe '#direct_successors_of' do
-    subject { graph.direct_successors_of('2') }
+  describe '#predecessors_of' do
+    subject { graph.predecessors_of('2') }
 
-    context 'no edges' do
-      it { is_expected.to be_empty }
-    end
+    context 'requested for non-existant vertex' do
+      subject { graph.predecessors_of('12345') }
 
-    context 'one edge to' do
-      before { graph.add_edge('1', '2') }
       it { is_expected.to be_empty }
+      it { is_expected.to be_a(Set) }
     end
 
-    context 'one edge from' do
-      before { graph.add_edge('2', '3') }
-      it { is_expected.to eq(['3']) }
-    end
-
-    context 'two edges from' do
-      before do
-        graph.add_edge('2', '1')
-        graph.add_edge('2', '3')
-      end
-
-      it { is_expected.to match_array(%w[1 3]) }
-    end
-  end
-
-  describe '#predecessors_of' do
-    subject { graph.predecessors_of('2') }
-
     context 'no predecessors' do
       before do
         graph.add_edge('2', '3')
@@ -156,34 +148,6 @@ describe Nanoc::Int::DirectedGraph do
     end
   end
 
-  describe '#successors_of' do
-    subject { graph.successors_of('2') }
-
-    context 'no successors' do
-      before do
-        graph.add_edge('1', '2')
-      end
-
-      it { is_expected.to be_empty }
-    end
-
-    context 'direct predecessor' do
-      before do
-        graph.add_edge('1', '2')
-        graph.add_edge('2', '3')
-      end
-
-      context 'no indirect successors' do
-        it { is_expected.to match_array(['3']) }
-      end
-
-      context 'indirect successors' do
-        before { graph.add_edge('3', '1') }
-        it { is_expected.to match_array(%w[1 2 3]) }
-      end
-    end
-  end
-
   describe '#inspect' do
     subject { graph.inspect }
 

data/spec/spec_helper.rb

@@ -36,7 +36,7 @@ RSpec.configure do |c|
   end
 
   c.around(:each, chdir: false) do |example|
-    FileUtils.cd(File.dirname(__FILE__) + '/..') do
+    FileUtils.cd(__dir__ + '/..') do
       example.run
     end
   end

data/test/base/test_directed_graph.rb

@@ -6,13 +6,11 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
   def test_add_edge
     graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
-    assert_equal [], graph.successors_of(1)
-    assert_equal [], graph.predecessors_of(2)
+    assert_equal [], graph.predecessors_of(2).to_a
 
     graph.add_edge(1, 2)
 
-    assert_equal [2], graph.successors_of(1)
-    assert_equal [1], graph.predecessors_of(2)
+    assert_equal [1], graph.predecessors_of(2).to_a
   end
 
   def test_add_edge_with_new_vertices
@@ -35,38 +33,20 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     graph.add_edge(3, 1)
 
     assert_equal [2, 3], graph.direct_predecessors_of(1).sort
-    assert_equal [2, 3], graph.direct_successors_of(1).sort
     assert_equal [1, 3], graph.direct_predecessors_of(2).sort
-    assert_equal [1, 3], graph.direct_successors_of(2).sort
     assert_equal [1, 2], graph.direct_predecessors_of(3).sort
-    assert_equal [1, 2], graph.direct_successors_of(3).sort
 
     graph.delete_edges_to(1)
 
     assert_equal [], graph.direct_predecessors_of(1).sort
-    assert_equal [2, 3], graph.direct_successors_of(1).sort
     assert_equal [1, 3], graph.direct_predecessors_of(2).sort
-    assert_equal [3], graph.direct_successors_of(2).sort
     assert_equal [1, 2], graph.direct_predecessors_of(3).sort
-    assert_equal [2], graph.direct_successors_of(3).sort
 
     graph.delete_edges_to(2)
 
     assert_equal [], graph.direct_predecessors_of(1).sort
-    assert_equal [3], graph.direct_successors_of(1).sort
     assert_equal [], graph.direct_predecessors_of(2).sort
-    assert_equal [3], graph.direct_successors_of(2).sort
     assert_equal [1, 2], graph.direct_predecessors_of(3).sort
-    assert_equal [], graph.direct_successors_of(3).sort
-  end
-
-  def test_should_return_empty_array_for_nonexistant_vertices
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-
-    assert_equal [], graph.direct_predecessors_of(4)
-    assert_equal [], graph.predecessors_of(4)
-    assert_equal [], graph.direct_successors_of(4)
-    assert_equal [], graph.successors_of(4)
   end
 
   def test_example

data/test/helper.rb

@@ -27,7 +27,7 @@ require 'nanoc/cli'
 Nanoc::CLI.setup
 
 module Nanoc::TestHelpers
-  LIB_DIR = File.expand_path(File.dirname(__FILE__) + '/../lib')
+  LIB_DIR = File.expand_path(__dir__ + '/../lib')
 
   def disable_nokogiri?
     ENV.key?('DISABLE_NOKOGIRI')
@@ -271,7 +271,7 @@ EOS
   end
 
   def root_dir
-    File.absolute_path(File.dirname(__FILE__) + '/..')
+    File.absolute_path(__dir__ + '/..')
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri