nanoc 3.8.0 → 4.0.0a1

data/test/base/test_context.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
-class Nanoc::ContextTest < Nanoc::TestCase
+class Nanoc::Int::ContextTest < Nanoc::TestCase
   def test_context_with_instance_variable
     # Create context
-    context = Nanoc::Context.new({ foo: 'bar', baz: 'quux' })
+    context = Nanoc::Int::Context.new({ foo: 'bar', baz: 'quux' })
 
     # Ensure correct evaluation
     assert_equal('bar', eval('@foo', context.get_binding))
@@ -11,7 +11,7 @@ class Nanoc::ContextTest < Nanoc::TestCase
 
   def test_context_with_instance_method
     # Create context
-    context = Nanoc::Context.new({ foo: 'bar', baz: 'quux' })
+    context = Nanoc::Int::Context.new({ foo: 'bar', baz: 'quux' })
 
     # Ensure correct evaluation
     assert_equal('bar', eval('foo', context.get_binding))
@@ -22,6 +22,6 @@ class Nanoc::ContextTest < Nanoc::TestCase
     YARD.parse(LIB_DIR + '/nanoc/base/context.rb')
 
     # Run
-    assert_examples_correct 'Nanoc::Context#initialize'
+    assert_examples_correct 'Nanoc::Int::Context#initialize'
   end
 end

data/test/base/test_data_source.rb

@@ -26,17 +26,27 @@ class Nanoc::DataSourceTest < Nanoc::TestCase
     # Test optional methods
     data_source.up
     data_source.down
-    data_source.update
-
-    # Test required methods - general
-    assert_raises(NotImplementedError) { data_source.setup }
 
     # Test methods - loading data
     assert_equal [],  data_source.items
     assert_equal [],  data_source.layouts
+  end
+
+  def test_new_item
+    data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
+
+    item = data_source.new_item('stuff', { title: 'Stuff!' }, '/asdf/')
+    assert_equal 'stuff', item.raw_content
+    assert_equal 'Stuff!', item.attributes[:title]
+    assert_equal Nanoc::Identifier.new('/asdf/'), item.identifier
+  end
+
+  def test_new_layout
+    data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
 
-    # Test required method - creating data
-    assert_raises(NotImplementedError) { data_source.create_item(nil, nil, nil) }
-    assert_raises(NotImplementedError) { data_source.create_layout(nil, nil, nil) }
+    layout = data_source.new_layout('stuff', { title: 'Stuff!' }, '/asdf/')
+    assert_equal 'stuff', layout.raw_content
+    assert_equal 'Stuff!', layout.attributes[:title]
+    assert_equal Nanoc::Identifier.new('/asdf/'), layout.identifier
   end
 end

data/test/base/test_dependency_tracker.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-class Nanoc::DependencyTrackerTest < Nanoc::TestCase
+class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
   def test_initialize
     # Mock items
     items = [mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Verify no dependencies yet
     assert_empty tracker.objects_causing_outdatedness_of(items[0])
@@ -18,7 +18,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items = [mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])
@@ -32,7 +32,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items = [mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[0])
@@ -47,7 +47,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items = [mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])
@@ -63,7 +63,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items = [mock, mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])
@@ -78,7 +78,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items = [mock, mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])
@@ -93,14 +93,14 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items = [mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Start, do something and stop
     tracker.start
-    Nanoc::NotificationCenter.post(:visit_started, items[0])
-    Nanoc::NotificationCenter.post(:visit_started, items[1])
-    Nanoc::NotificationCenter.post(:visit_ended,   items[1])
-    Nanoc::NotificationCenter.post(:visit_ended,   items[0])
+    Nanoc::Int::NotificationCenter.post(:visit_started, items[0])
+    Nanoc::Int::NotificationCenter.post(:visit_started, items[1])
+    Nanoc::Int::NotificationCenter.post(:visit_ended,   items[1])
+    Nanoc::Int::NotificationCenter.post(:visit_ended,   items[0])
     tracker.stop
 
     # Verify dependencies
@@ -118,7 +118,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items[3].stubs(:reference).returns([:item, '/ddd/'])
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])
@@ -126,14 +126,14 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     tracker.record_dependency(items[1], items[3])
 
     # Store
-    tracker.store_graph
+    tracker.store
     assert File.file?(tracker.filename)
 
     # Re-create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Load
-    tracker.load_graph
+    tracker.load
 
     # Check loaded graph
     assert_contains_exactly [items[1]],           tracker.objects_causing_outdatedness_of(items[0])
@@ -156,7 +156,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     new_items = [items[0], items[1], items[2]]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(old_items)
+    tracker = Nanoc::Int::DependencyTracker.new(old_items)
 
     # Record some dependencies
     tracker.record_dependency(old_items[0], old_items[1])
@@ -164,14 +164,14 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     tracker.record_dependency(old_items[1], old_items[3])
 
     # Store
-    tracker.store_graph
+    tracker.store
     assert File.file?(tracker.filename)
 
     # Re-create
-    tracker = Nanoc::DependencyTracker.new(new_items)
+    tracker = Nanoc::Int::DependencyTracker.new(new_items)
 
     # Load
-    tracker.load_graph
+    tracker.load
 
     # Check loaded graph
     assert_contains_exactly [items[1]],       tracker.objects_causing_outdatedness_of(items[0])
@@ -188,21 +188,21 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items[2].stubs(:reference).returns([:item, '/ccc/'])
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])
     tracker.record_dependency(items[1], nil)
 
     # Store
-    tracker.store_graph
+    tracker.store
     assert File.file?(tracker.filename)
 
     # Re-create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Load
-    tracker.load_graph
+    tracker.load
 
     # Check loaded graph
     assert_contains_exactly [items[1]], tracker.objects_causing_outdatedness_of(items[0])
@@ -218,21 +218,21 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items[2].stubs(:reference).returns([:item, '/ccc/'])
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])
     tracker.record_dependency(nil,      items[2])
 
     # Store
-    tracker.store_graph
+    tracker.store
     assert File.file?(tracker.filename)
 
     # Re-create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Load
-    tracker.load_graph
+    tracker.load
 
     # Check loaded graph
     assert_contains_exactly [items[1]], tracker.objects_causing_outdatedness_of(items[0])
@@ -244,7 +244,7 @@ class Nanoc::DependencyTrackerTest < Nanoc::TestCase
     items = [mock, mock, mock]
 
     # Create
-    tracker = Nanoc::DependencyTracker.new(items)
+    tracker = Nanoc::Int::DependencyTracker.new(items)
 
     # Record some dependencies
     tracker.record_dependency(items[0], items[1])

data/test/base/test_directed_graph.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-class Nanoc::DirectedGraphTest < Nanoc::TestCase
+class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
   def test_direct_predecessors
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
@@ -12,7 +12,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_predecessors
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
@@ -22,7 +22,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_direct_successors
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
@@ -32,7 +32,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_successors
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
@@ -42,7 +42,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_edges
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
@@ -50,7 +50,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_edges_with_new_vertices
-    graph = Nanoc::DirectedGraph.new([1])
+    graph = Nanoc::Int::DirectedGraph.new([1])
     assert_equal [1], graph.vertices
     graph.add_edge(1, 2)
     assert_equal [1, 2], graph.vertices
@@ -61,7 +61,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_add_edge
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
     assert_equal [], graph.successors_of(1)
     assert_equal [], graph.predecessors_of(2)
@@ -73,7 +73,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_add_edge_with_new_vertices
-    graph = Nanoc::DirectedGraph.new([1])
+    graph = Nanoc::Int::DirectedGraph.new([1])
     graph.add_edge(1, 2)
     graph.add_edge(3, 2)
 
@@ -82,7 +82,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_delete_edge
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
 
     assert_equal [2], graph.successors_of(1)
@@ -95,7 +95,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_delete_edges_from
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
     graph.add_edge(1, 2)
     graph.add_edge(2, 1)
@@ -134,7 +134,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_delete_edges_to
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
     graph.add_edge(1, 2)
     graph.add_edge(2, 1)
@@ -173,7 +173,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_delete_vertex
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
     graph.add_edge(1, 2)
     graph.add_edge(2, 1)
@@ -192,7 +192,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_delete_vertex_resulting_roots
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     assert_equal Set.new([1, 2, 3]), graph.roots
 
     graph.add_edge(1, 2)
@@ -204,7 +204,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_should_return_empty_array_for_nonexistant_vertices
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
 
     assert_equal [], graph.direct_predecessors_of(4)
     assert_equal [], graph.predecessors_of(4)
@@ -213,30 +213,30 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_roots_after_init
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    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::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     assert_equal Set.new([1, 3]), graph.roots
 
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 3)
     assert_equal Set.new([1, 2]), graph.roots
 
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(2, 1)
     assert_equal Set.new([2, 3]), graph.roots
 
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    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::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
     graph.add_edge(3, 1)
@@ -244,23 +244,23 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_roots_after_removing_edge
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    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::DirectedGraph.new([1, 2, 3])
+    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::DirectedGraph.new([1, 2, 3])
+    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::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
     graph.delete_edge(1, 2)
@@ -268,7 +268,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
     graph.delete_edge(2, 3)
     assert_equal Set.new([1, 2, 3]), graph.roots
 
-    graph = Nanoc::DirectedGraph.new([1, 2, 3])
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
     graph.add_edge(3, 1)
@@ -282,6 +282,6 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
 
   def test_example
     YARD.parse(LIB_DIR + '/nanoc/base/directed_graph.rb')
-    assert_examples_correct 'Nanoc::DirectedGraph'
+    assert_examples_correct 'Nanoc::Int::DirectedGraph'
   end
 end