nanoc 4.7.13 → 4.7.14

data/spec/nanoc/base/entities/identifiable_collection_spec.rb

@@ -139,12 +139,12 @@ describe Nanoc::Int::IdentifiableCollection do
   end
 
   describe Nanoc::Int::ItemCollection do
-    let(:expected_reference) { :items }
+    let(:expected_reference) { 'items' }
     it_behaves_like 'a generic identifiable collection'
   end
 
   describe Nanoc::Int::LayoutCollection do
-    let(:expected_reference) { :layouts }
+    let(:expected_reference) { 'layouts' }
     it_behaves_like 'a generic identifiable collection'
   end
 end

data/spec/nanoc/base/entities/item_spec.rb

@@ -7,7 +7,7 @@ describe Nanoc::Int::Item do
     let(:item) { described_class.new('hi', {}, '/foo.md') }
 
     it 'has the proper reference' do
-      expect(item.reference).to eql([:item, '/foo.md'])
+      expect(item.reference).to eql('item:/foo.md')
     end
   end
 end

data/spec/nanoc/base/entities/layout_spec.rb

@@ -7,7 +7,7 @@ describe Nanoc::Int::Layout do
     let(:layout) { described_class.new('hi', {}, '/foo.md') }
 
     it 'has the proper reference' do
-      expect(layout.reference).to eql([:layout, '/foo.md'])
+      expect(layout.reference).to eql('layout:/foo.md')
     end
   end
 end

data/spec/nanoc/base/errors/dependency_cycle_spec.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
 describe Nanoc::Int::Errors::DependencyCycle do
-  subject(:error) { described_class.new(graph) }
+  subject(:error) { described_class.new(stack) }
 
-  let(:graph) do
-    Nanoc::Int::DirectedGraph.new([]).tap do |g|
-      g.add_edge(rep_a, rep_b)
-      g.add_edge(rep_b, rep_c)
-      g.add_edge(rep_c, rep_d)
-      g.add_edge(rep_d, rep_e)
-      g.add_edge(rep_e, rep_b)
-    end
+  let(:stack) do
+    [
+      rep_a,
+      rep_b,
+      rep_c,
+      rep_d,
+      rep_e,
+      rep_b,
+    ]
   end
 
   let(:rep_a) { Nanoc::Int::ItemRep.new(Nanoc::Int::Item.new('a', {}, '/a.md'), :default) }
@@ -23,10 +24,10 @@ describe Nanoc::Int::Errors::DependencyCycle do
     expected = <<~EOS
       The site cannot be compiled because there is a dependency cycle:
 
-          (1) item /e.md, rep :default, uses compiled content of
-          (2) item /d.md, rep :default, uses compiled content of
-          (3) item /c.md, rep :default, uses compiled content of
-          (4) item /b.md, rep :default, uses compiled content of (1)
+          (1) item /b.md, rep :default, uses compiled content of
+          (2) item /c.md, rep :default, uses compiled content of
+          (3) item /d.md, rep :default, uses compiled content of
+          (4) item /e.md, rep :default, uses compiled content of (1)
 EOS
 
     expect(error.message).to eql(expected)

data/spec/nanoc/base/services/item_rep_selector_spec.rb

@@ -111,6 +111,47 @@ describe Nanoc::Int::ItemRepSelector do
     end
   end
 
+  describe 'cycle' do
+    context 'dependency on self' do
+      subject do
+        selector.each { |r| raise Nanoc::Int::Errors::UnmetDependency.new(r) }
+      end
+
+      example do
+        expect { subject }.to raise_error(Nanoc::Int::Errors::DependencyCycle, <<~EOS)
+          The site cannot be compiled because there is a dependency cycle:
+
+              (1) item /foo.md, rep :a, uses compiled content of (1)
+          EOS
+      end
+    end
+
+    context 'cycle with three dependencies' do
+      subject do
+        selector.each do |r|
+          case r
+          when reps_array[0]
+            raise Nanoc::Int::Errors::UnmetDependency.new(reps_array[1])
+          when reps_array[1]
+            raise Nanoc::Int::Errors::UnmetDependency.new(reps_array[2])
+          when reps_array[2]
+            raise Nanoc::Int::Errors::UnmetDependency.new(reps_array[0])
+          end
+        end
+      end
+
+      example do
+        expect { subject }.to raise_error(Nanoc::Int::Errors::DependencyCycle, <<~EOS)
+          The site cannot be compiled because there is a dependency cycle:
+
+              (1) item /foo.md, rep :a, uses compiled content of
+              (2) item /foo.md, rep :b, uses compiled content of
+              (3) item /foo.md, rep :c, uses compiled content of (1)
+          EOS
+      end
+    end
+  end
+
   describe 'yield order' do
     context 'linear dependencies' do
       let(:dependencies) do

data/test/base/test_directed_graph.rb

@@ -3,108 +3,6 @@
 require 'helper'
 
 class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
-  def test_direct_predecessors
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-
-    assert_equal [], graph.direct_predecessors_of(1)
-    assert_equal [1], graph.direct_predecessors_of(2)
-    assert_equal [2], graph.direct_predecessors_of(3)
-  end
-
-  def test_predecessors
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-
-    assert_equal [], graph.predecessors_of(1).sort
-    assert_equal [1],    graph.predecessors_of(2).sort
-    assert_equal [1, 2], graph.predecessors_of(3).sort
-  end
-
-  def test_direct_successors
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-
-    assert_equal [2], graph.direct_successors_of(1)
-    assert_equal [3], graph.direct_successors_of(2)
-    assert_equal [], graph.direct_successors_of(3)
-  end
-
-  def test_successors
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-
-    assert_equal [2, 3], graph.successors_of(1).sort
-    assert_equal [3],    graph.successors_of(2).sort
-    assert_equal [], graph.successors_of(3).sort
-  end
-
-  def test_edges
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-
-    assert_equal [[0, 1, nil], [1, 2, nil]], graph.edges.sort
-  end
-
-  def test_edges_with_new_vertices
-    graph = Nanoc::Int::DirectedGraph.new([1])
-    assert_equal [1], graph.vertices
-    graph.add_edge(1, 2)
-    assert_equal [1, 2], graph.vertices
-    graph.add_edge(3, 2)
-    assert_equal [1, 2, 3], graph.vertices
-
-    assert_equal [[0, 1, nil], [2, 1, nil]], graph.edges.sort
-  end
-
-  def test_edge_with_props
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2, props: { donkey: 14 })
-    graph.add_edge(2, 3, props: { giraffe: 3 })
-
-    assert_equal [[0, 1, { donkey: 14 }], [1, 2, { giraffe: 3 }]], graph.edges.sort
-  end
-
-  def test_props_for
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3, 4])
-    graph.add_edge(1, 2, props: { donkey: 14 })
-    graph.add_edge(2, 3, props: { giraffe: 3 })
-    graph.add_edge(3, 4)
-
-    assert_equal({ donkey: 14 }, graph.props_for(1, 2))
-    assert_equal({ giraffe: 3 }, graph.props_for(2, 3))
-    assert_equal(nil, graph.props_for(3, 4))
-  end
-
-  def test_props_for_with_deleted_edge
-    graph = Nanoc::Int::DirectedGraph.new([1, 2])
-    graph.add_edge(1, 2, props: { donkey: 14 })
-    graph.delete_edge(1, 2)
-
-    assert_equal(nil, graph.props_for(1, 2))
-  end
-
-  def test_props_for_with_deleted_edges_from
-    graph = Nanoc::Int::DirectedGraph.new([1, 2])
-    graph.add_edge(1, 2, props: { donkey: 14 })
-    graph.delete_edges_from(1)
-
-    assert_equal(nil, graph.props_for(1, 2))
-  end
-
-  def test_props_for_with_deleted_edges_to
-    graph = Nanoc::Int::DirectedGraph.new([1, 2])
-    graph.add_edge(1, 2, props: { donkey: 14 })
-    graph.delete_edges_to(2)
-
-    assert_equal(nil, graph.props_for(1, 2))
-  end
-
   def test_add_edge
     graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
@@ -126,58 +24,6 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     assert graph.vertices.include?(3)
   end
 
-  def test_delete_edge
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-
-    assert_equal [2], graph.successors_of(1)
-    assert_equal [1], graph.predecessors_of(2)
-
-    graph.delete_edge(1, 2)
-
-    assert_equal [], graph.successors_of(1)
-    assert_equal [], graph.predecessors_of(2)
-  end
-
-  def test_delete_edges_from
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 1)
-    graph.add_edge(2, 3)
-    graph.add_edge(3, 2)
-    graph.add_edge(1, 3)
-    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
-    assert_equal Set.new([]), graph.roots
-
-    graph.delete_edges_from(1)
-
-    assert_equal [2, 3], graph.direct_predecessors_of(1).sort
-    assert_equal [], graph.direct_successors_of(1).sort
-    assert_equal [3], graph.direct_predecessors_of(2).sort
-    assert_equal [1, 3], graph.direct_successors_of(2).sort
-    assert_equal [2], graph.direct_predecessors_of(3).sort
-    assert_equal [1, 2], graph.direct_successors_of(3).sort
-    assert_equal Set.new([]), graph.roots
-
-    graph.delete_edges_from(2)
-
-    assert_equal [3], graph.direct_predecessors_of(1).sort
-    assert_equal [], graph.direct_successors_of(1).sort
-    assert_equal [3], graph.direct_predecessors_of(2).sort
-    assert_equal [], graph.direct_successors_of(2).sort
-    assert_equal [], graph.direct_predecessors_of(3).sort
-    assert_equal [1, 2], graph.direct_successors_of(3).sort
-    assert_equal Set.new([3]), graph.roots
-  end
-
   def test_delete_edges_to
     graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
@@ -194,7 +40,6 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     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
-    assert_equal Set.new([]), graph.roots
 
     graph.delete_edges_to(1)
 
@@ -204,7 +49,6 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     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
-    assert_equal Set.new([1]), graph.roots
 
     graph.delete_edges_to(2)
 
@@ -214,38 +58,6 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     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
-    assert_equal Set.new([1, 2]), graph.roots
-  end
-
-  def test_delete_vertex
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 1)
-    graph.add_edge(2, 3)
-    graph.add_edge(3, 2)
-    graph.add_edge(1, 3)
-    graph.add_edge(3, 1)
-
-    graph.delete_vertex(2)
-
-    assert_equal [3], graph.direct_predecessors_of(1).sort
-    assert_equal [3], graph.direct_successors_of(1).sort
-    assert_equal [1], graph.direct_predecessors_of(3).sort
-    assert_equal [1], graph.direct_successors_of(3).sort
-    assert_equal Set.new([]), graph.roots
-  end
-
-  def test_delete_vertex_resulting_roots
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    assert_equal Set.new([1, 2, 3]), graph.roots
-
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-    assert_equal Set.new([1]), graph.roots
-
-    graph.delete_vertex(2)
-    assert_equal Set.new([1, 3]), graph.roots
   end
 
   def test_should_return_empty_array_for_nonexistant_vertices
@@ -257,74 +69,6 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     assert_equal [], graph.successors_of(4)
   end
 
-  def test_roots_after_init
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-
-    assert_equal Set.new([1, 2, 3]), graph.roots
-  end
-
-  def test_roots_after_adding_edge
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    assert_equal Set.new([1, 3]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 3)
-    assert_equal Set.new([1, 2]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(2, 1)
-    assert_equal Set.new([2, 3]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-    assert_equal Set.new([1]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-    graph.add_edge(3, 1)
-    assert_equal Set.new([]), graph.roots
-  end
-
-  def test_roots_after_removing_edge
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.delete_edge(1, 2)
-    assert_equal Set.new([1, 2, 3]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 3)
-    assert_equal Set.new([1, 2]), graph.roots
-    graph.delete_edge(1, 2) # no such edge
-    assert_equal Set.new([1, 2]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(2, 1)
-    graph.delete_edge(2, 1)
-    assert_equal Set.new([1, 2, 3]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-    graph.delete_edge(1, 2)
-    assert_equal Set.new([1, 2]), graph.roots
-    graph.delete_edge(2, 3)
-    assert_equal Set.new([1, 2, 3]), graph.roots
-
-    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
-    graph.add_edge(1, 2)
-    graph.add_edge(2, 3)
-    graph.add_edge(3, 1)
-    graph.delete_edge(1, 2)
-    assert_equal Set.new([2]), graph.roots
-    graph.delete_edge(2, 3)
-    assert_equal Set.new([2, 3]), graph.roots
-    graph.delete_edge(3, 1)
-    assert_equal Set.new([1, 2, 3]), graph.roots
-  end
-
   def test_example
     YARD.parse(LIB_DIR + '/nanoc/base/entities/directed_graph.rb')
     assert_examples_correct 'Nanoc::Int::DirectedGraph'

metadata

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