nanoc 4.7.13 → 4.7.14

data/lib/nanoc/data_sources/filesystem.rb

@@ -183,7 +183,7 @@ module Nanoc::DataSources
 
     def attributes_checksum_data_for(proto_doc, content_filename, meta_filename)
       Digest::SHA1.digest(
-        YAML.dump(
+        Marshal.dump(
           attributes: proto_doc.attributes_checksum_data,
           extra_attributes: extra_attributes_for(content_filename, meta_filename),
         ),

data/lib/nanoc/rule_dsl/rules_collection.rb

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

data/lib/nanoc/version.rb

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

data/spec/nanoc/base/directed_graph_spec.rb

@@ -1,401 +1,228 @@
 # frozen_string_literal: true
 
 describe Nanoc::Int::DirectedGraph do
-  subject(:graph) { described_class.new([1, 2, 3]) }
+  subject(:graph) { described_class.new(%w[1 2 3]) }
 
-  describe '#inspect' do
-    subject { graph.inspect }
+  describe '#edges' do
+    subject { graph.edges }
 
     context 'empty graph' do
-      it { is_expected.to eq('Nanoc::Int::DirectedGraph()') }
+      it { is_expected.to be_empty }
     end
 
-    context 'one edge, no props' do
+    context 'graph with vertices, but no edges' do
       before do
-        graph.add_edge(1, 2)
+        graph.add_vertex('1')
+        graph.add_vertex('2')
       end
 
-      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props=nil)') }
+      it { is_expected.to be_empty }
     end
 
-    context 'two edges, no props' do
+    context 'graph with edges from previously added vertices' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
+        graph.add_vertex('1')
+        graph.add_vertex('2')
+        graph.add_vertex('3')
+
+        graph.add_edge('1', '2')
+        graph.add_edge('1', '3')
       end
 
-      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props=nil, 2 -> 3 props=nil)') }
+      it { is_expected.to match_array([[0, 1, nil], [0, 2, nil]]) }
     end
 
-    context 'one edge, props' do
+    context 'graph with edges from new vertices' do
       before do
-        graph.add_edge(1, 2, props: 'giraffe')
+        graph.add_edge('1', '2')
+        graph.add_edge('1', '3')
       end
 
-      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props="giraffe")') }
+      it { is_expected.to match_array([[0, 1, nil], [0, 2, nil]]) }
     end
 
-    context 'two edges, props' do
+    context 'graph with edge props' do
       before do
-        graph.add_edge(1, 2, props: 'donkey')
-        graph.add_edge(2, 3, props: 'zebra')
+        graph.add_edge('1', '2', props: { name: 'Mr. C' })
+        graph.add_edge('1', '3', props: { name: 'Cooper' })
       end
 
-      it { is_expected.to eq('Nanoc::Int::DirectedGraph(1 -> 2 props="donkey", 2 -> 3 props="zebra")') }
+      it { is_expected.to match_array([[0, 1, { name: 'Mr. C' }], [0, 2, { name: 'Cooper' }]]) }
     end
   end
 
-  describe '#any_cycle' do
-    subject { graph.any_cycle }
+  describe '#props_for' do
+    subject { graph.props_for('1', '2') }
 
-    context 'no cycles' do
+    context 'no edge' do
       it { is_expected.to be_nil }
     end
 
-    context 'one cycle without head' do
-      before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 1)
-      end
-
-      it { is_expected.to eq([1, 2]) }
+    context 'edge, but no props' do
+      before { graph.add_edge('1', '2') }
+      it { is_expected.to be_nil }
     end
 
-    context 'one cycle with head' do
-      before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 2)
-      end
+    context 'edge with props' do
+      before { graph.add_edge('1', '2', props: { name: 'Mr. C' }) }
+      it { is_expected.to eq(name: 'Mr. C') }
 
-      it { is_expected.to eq([2, 3]) }
+      context 'deleted edge (#delete_edges_to)' do
+        before { graph.delete_edges_to('2') }
+        it { is_expected.to be_nil }
+      end
     end
+  end
 
-    context 'one cycle with tail' do
-      before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 20)
-        graph.add_edge(20, 21)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 1)
-      end
+  describe '#direct_predecessors_of' do
+    subject { graph.direct_predecessors_of('2') }
 
-      it { is_expected.to eq([1, 2, 3]) }
+    context 'no edges' do
+      it { is_expected.to be_empty }
     end
 
-    context 'large cycle' do
-      before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 4)
-        graph.add_edge(4, 5)
-        graph.add_edge(5, 1)
-      end
-
-      it { is_expected.to eq([1, 2, 3, 4, 5]) }
+    context 'one edge to' do
+      before { graph.add_edge('1', '2') }
+      it { is_expected.to eq(['1']) }
     end
 
-    context 'large cycle with head' do
+    context 'two edges to' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 4)
-        graph.add_edge(4, 5)
-        graph.add_edge(5, 2)
+        graph.add_edge('1', '2')
+        graph.add_edge('3', '2')
       end
 
-      it { is_expected.to eq([2, 3, 4, 5]) }
+      it { is_expected.to match_array(%w[1 3]) }
+    end
+
+    context 'edge from' do
+      before { graph.add_edge('2', '3') }
+      it { is_expected.to be_empty }
     end
   end
 
-  describe '#all_paths' do
-    subject { graph.all_paths.to_a }
+  describe '#direct_successors_of' do
+    subject { graph.direct_successors_of('2') }
 
-    context 'no cycles' do
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [2],
-          [3],
-        )
-      end
+    context 'no edges' do
+      it { is_expected.to be_empty }
     end
 
-    context 'one cycle without head' do
-      before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 1)
-      end
+    context 'one edge to' do
+      before { graph.add_edge('1', '2') }
+      it { is_expected.to be_empty }
+    end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 1],
-          [2],
-          [2, 1],
-          [2, 1, 2],
-          [3],
-        )
-      end
+    context 'one edge from' do
+      before { graph.add_edge('2', '3') }
+      it { is_expected.to eq(['3']) }
     end
 
-    context 'one cycle with head' do
+    context 'two edges from' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 2)
+        graph.add_edge('2', '1')
+        graph.add_edge('2', '3')
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 3],
-          [1, 2, 3, 2],
-          [2],
-          [2, 3],
-          [2, 3, 2],
-          [3],
-          [3, 2],
-          [3, 2, 3],
-        )
-      end
+      it { is_expected.to match_array(%w[1 3]) }
     end
+  end
+
+  describe '#predecessors_of' do
+    subject { graph.predecessors_of('2') }
 
-    context 'one cycle with tail' do
+    context 'no predecessors' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 20)
-        graph.add_edge(20, 21)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 1)
+        graph.add_edge('2', '3')
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 20],
-          [1, 2, 20, 21],
-          [1, 2, 3],
-          [1, 2, 3, 1],
-          [2],
-          [2, 20],
-          [2, 20, 21],
-          [2, 3],
-          [2, 3, 1],
-          [2, 3, 1, 2],
-          [3],
-          [3, 1],
-          [3, 1, 2],
-          [3, 1, 2, 20],
-          [3, 1, 2, 20, 21],
-          [3, 1, 2, 3],
-          [20],
-          [20, 21],
-          [21],
-        )
-      end
+      it { is_expected.to be_empty }
     end
 
-    context 'large cycle' do
+    context 'direct predecessor' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 4)
-        graph.add_edge(4, 5)
-        graph.add_edge(5, 1)
-      end
-
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 3],
-          [1, 2, 3, 4],
-          [1, 2, 3, 4, 5],
-          [1, 2, 3, 4, 5, 1],
-          [2],
-          [2, 3],
-          [2, 3, 4],
-          [2, 3, 4, 5],
-          [2, 3, 4, 5, 1],
-          [2, 3, 4, 5, 1, 2],
-          [3],
-          [3, 4],
-          [3, 4, 5],
-          [3, 4, 5, 1],
-          [3, 4, 5, 1, 2],
-          [3, 4, 5, 1, 2, 3],
-          [4],
-          [4, 5],
-          [4, 5, 1],
-          [4, 5, 1, 2],
-          [4, 5, 1, 2, 3],
-          [4, 5, 1, 2, 3, 4],
-          [5],
-          [5, 1],
-          [5, 1, 2],
-          [5, 1, 2, 3],
-          [5, 1, 2, 3, 4],
-          [5, 1, 2, 3, 4, 5],
-        )
+        graph.add_edge('2', '3')
+        graph.add_edge('1', '2')
       end
-    end
 
-    context 'large cycle with head' do
-      before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 4)
-        graph.add_edge(4, 5)
-        graph.add_edge(5, 2)
+      context 'no indirect predecessors' do
+        it { is_expected.to match_array(['1']) }
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 3],
-          [1, 2, 3, 4],
-          [1, 2, 3, 4, 5],
-          [1, 2, 3, 4, 5, 2],
-          [2],
-          [2, 3],
-          [2, 3, 4],
-          [2, 3, 4, 5],
-          [2, 3, 4, 5, 2],
-          [3],
-          [3, 4],
-          [3, 4, 5],
-          [3, 4, 5, 2],
-          [3, 4, 5, 2, 3],
-          [4],
-          [4, 5],
-          [4, 5, 2],
-          [4, 5, 2, 3],
-          [4, 5, 2, 3, 4],
-          [5],
-          [5, 2],
-          [5, 2, 3],
-          [5, 2, 3, 4],
-          [5, 2, 3, 4, 5],
-        )
+      context 'indirect predecessors' do
+        before { graph.add_edge('3', '1') }
+        it { is_expected.to match_array(%w[1 2 3]) }
       end
     end
   end
 
-  describe '#dfs_from' do
-    subject do
-      [].tap do |ps|
-        graph.dfs_from(1) do |p|
-          ps << p
-        end
-      end
-    end
+  describe '#successors_of' do
+    subject { graph.successors_of('2') }
 
-    context 'no cycles' do
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-        )
+    context 'no successors' do
+      before do
+        graph.add_edge('1', '2')
       end
+
+      it { is_expected.to be_empty }
     end
 
-    context 'one cycle without head' do
+    context 'direct predecessor' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 1)
+        graph.add_edge('1', '2')
+        graph.add_edge('2', '3')
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 1],
-        )
+      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
 
-    context 'one cycle with head' do
+  describe '#inspect' do
+    subject { graph.inspect }
+
+    context 'empty graph' do
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph()') }
+    end
+
+    context 'one edge, no props' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 2)
+        graph.add_edge('1', '2')
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 3],
-          [1, 2, 3, 2],
-        )
-      end
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph("1" -> "2" props=nil)') }
     end
 
-    context 'one cycle with tail' do
+    context 'two edges, no props' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 20)
-        graph.add_edge(20, 21)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 1)
+        graph.add_edge('1', '2')
+        graph.add_edge('2', '3')
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 20],
-          [1, 2, 20, 21],
-          [1, 2, 3],
-          [1, 2, 3, 1],
-        )
-      end
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph("1" -> "2" props=nil, "2" -> "3" props=nil)') }
     end
 
-    context 'large cycle' do
+    context 'one edge, props' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 4)
-        graph.add_edge(4, 5)
-        graph.add_edge(5, 1)
+        graph.add_edge('1', '2', props: 'giraffe')
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 3],
-          [1, 2, 3, 4],
-          [1, 2, 3, 4, 5],
-          [1, 2, 3, 4, 5, 1],
-        )
-      end
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph("1" -> "2" props="giraffe")') }
     end
 
-    context 'large cycle with head' do
+    context 'two edges, props' do
       before do
-        graph.add_edge(1, 2)
-        graph.add_edge(2, 3)
-        graph.add_edge(3, 4)
-        graph.add_edge(4, 5)
-        graph.add_edge(5, 2)
+        graph.add_edge('1', '2', props: 'donkey')
+        graph.add_edge('2', '3', props: 'zebra')
       end
 
-      example do
-        expect(subject).to contain_exactly(
-          [1],
-          [1, 2],
-          [1, 2, 3],
-          [1, 2, 3, 4],
-          [1, 2, 3, 4, 5],
-          [1, 2, 3, 4, 5, 2],
-        )
-      end
+      it { is_expected.to eq('Nanoc::Int::DirectedGraph("1" -> "2" props="donkey", "2" -> "3" props="zebra")') }
     end
   end
 end