nanoc 4.0.0b4 → 4.0.0rc1

data/test/base/test_item.rb

@@ -10,7 +10,7 @@ class Nanoc::Int::ItemTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'content',
       { one: 'one in item' },
-      '/path/'
+      '/path/',
     )
 
     assert_equal([:item, '/path/'], item.reference)

data/test/base/test_item_rep.rb

@@ -2,10 +2,10 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_only_last_available
     # Create rep
     item = Nanoc::Int::Item.new(
-      'blah blah blah', {}, '/',
+      'blah blah blah', {}, '/'
     )
     rep = Nanoc::Int::ItemRep.new(item, nil)
-    rep.content_snapshots = {
+    rep.snapshot_contents = {
       last: Nanoc::Int::TextualContent.new('last content'),
     }
     rep.expects(:compiled?).returns(true)
@@ -17,10 +17,10 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_pre_and_last_available
     # Create rep
     item = Nanoc::Int::Item.new(
-      'blah blah blah', {}, '/',
+      'blah blah blah', {}, '/'
     )
     rep = Nanoc::Int::ItemRep.new(item, nil)
-    rep.content_snapshots = {
+    rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre content'),
       last: Nanoc::Int::TextualContent.new('last content'),
     }
@@ -33,10 +33,10 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_custom_snapshot
     # Create rep
     item = Nanoc::Int::Item.new(
-      'blah blah blah', {}, '/',
+      'blah blah blah', {}, '/'
     )
     rep = Nanoc::Int::ItemRep.new(item, nil)
-    rep.content_snapshots = {
+    rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre content'),
       last: Nanoc::Int::TextualContent.new('last content'),
     }
@@ -49,10 +49,10 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_invalid_snapshot
     # Create rep
     item = Nanoc::Int::Item.new(
-      'blah blah blah', {}, '/',
+      'blah blah blah', {}, '/'
     )
     rep = Nanoc::Int::ItemRep.new(item, nil)
-    rep.content_snapshots = {
+    rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre content'),
       last: Nanoc::Int::TextualContent.new('last content'),
     }
@@ -66,7 +66,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_uncompiled_content
     # Create rep
     item = Nanoc::Int::Item.new(
-      'blah blah', {}, '/',
+      'blah blah', {}, '/'
     )
     rep = Nanoc::Int::ItemRep.new(item, nil)
     rep.expects(:compiled?).returns(false)
@@ -80,11 +80,11 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_moving_pre_snapshot
     # Create rep
     item = Nanoc::Int::Item.new(
-      'blah blah', {}, '/',
+      'blah blah', {}, '/'
     )
     rep = Nanoc::Int::ItemRep.new(item, nil)
     rep.expects(:compiled?).returns(false)
-    rep.content_snapshots = {
+    rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre!'),
       last: Nanoc::Int::TextualContent.new('last!'),
     }
@@ -98,12 +98,14 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_non_moving_pre_snapshot
     # Create rep
     item = Nanoc::Int::Item.new(
-      'blah blah', {}, '/',
+      'blah blah', {}, '/'
     )
     rep = Nanoc::Int::ItemRep.new(item, nil)
     rep.expects(:compiled?).returns(false)
-    rep.snapshots = [[:pre, true]]
-    rep.content_snapshots = {
+    rep.snapshot_defs = [
+      Nanoc::Int::SnapshotDef.new(:pre, true),
+    ]
+    rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre!'),
       post: Nanoc::Int::TextualContent.new('post!'),
       last: Nanoc::Int::TextualContent.new('last!'),

data/test/base/test_memoization.rb

@@ -25,32 +25,7 @@ class Nanoc::Int::MemoizationTest < Nanoc::TestCase
     memoize :run
   end
 
-  class EqualSample
-    extend Nanoc::Int::Memoization
-
-    def initialize(value)
-      @value = value
-    end
-
-    def hash
-      4
-    end
-
-    def eql?(_other)
-      true
-    end
-
-    def ==(_other)
-      true
-    end
-
-    def run(n)
-      @value * 10 + n
-    end
-    memoize :run
-  end
-
-  def test
+  def test_normal
     sample1a = Sample1.new(10)
     sample1b = Sample1.new(15)
     sample2a = Sample2.new(20)
@@ -63,16 +38,4 @@ class Nanoc::Int::MemoizationTest < Nanoc::TestCase
       assert_equal 100 * 25 + 7, sample2b.run(7)
     end
   end
-
-  def test_equal
-    sample1 = EqualSample.new(2)
-    sample2 = EqualSample.new(3)
-
-    3.times do
-      assert_equal 2 * 10 + 5, sample1.run(5)
-      assert_equal 2 * 10 + 3, sample1.run(3)
-      assert_equal 3 * 10 + 5, sample2.run(5)
-      assert_equal 3 * 10 + 3, sample2.run(3)
-    end
-  end
 end

data/test/base/test_outdatedness_checker.rb

@@ -5,11 +5,14 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
     # Check
     with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items['/'].reps[0]
       assert_nil outdatedness_checker.outdatedness_reason_for(rep)
@@ -22,6 +25,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -32,6 +36,8 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::Int::OutdatednessReasons::NotEnoughData,
@@ -45,6 +51,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -55,6 +62,8 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::Int::OutdatednessReasons::NotWritten,
@@ -69,6 +78,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       File.open('content/new.html', 'w') { |io| io.write('o hello too') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -79,6 +89,8 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/new/' }.reps[0]
       assert_equal ::Nanoc::Int::OutdatednessReasons::SourceModified,
@@ -92,6 +104,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('layouts/default.html', 'w') { |io| io.write('!!! <%= yield %> !!!') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -103,6 +116,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     # Check
     with_site(name: 'foo') do |site|
       # FIXME: ugly fugly hack
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -122,6 +136,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
         io.write('stuff')
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -135,6 +150,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     # Check
     with_site(name: 'foo') do |site|
       # FIXME: ugly fugly hack
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -157,6 +173,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
         io.write('stuff')
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -170,6 +187,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     # Check
     with_site(name: 'foo') do |site|
       # FIXME: ugly fugly hack
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -191,6 +209,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
         io.write('stuff')
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -202,6 +221,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     # Check
     with_site(name: 'foo') do |site|
       # FIXME: ugly fugly hack
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -223,6 +243,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
         io.write('stuff')
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -236,6 +257,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     # Check
     with_site(name: 'foo') do |site|
       # FIXME: ugly fugly hack
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -252,6 +274,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -262,6 +285,8 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::Int::OutdatednessReasons::CodeSnippetsModified,
@@ -274,6 +299,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -291,6 +317,8 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::Int::OutdatednessReasons::ConfigurationModified,
@@ -303,6 +331,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -313,6 +342,8 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_nil outdatedness_checker.outdatedness_reason_for(rep)
@@ -336,7 +367,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Compile once
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
@@ -354,7 +385,8 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::Int::OutdatednessReasons::RulesModified,
@@ -379,13 +411,13 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Compile
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
     # Assert not outdated
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       outdatedness_checker = site.compiler.outdatedness_checker
       site.items.each do |item|
         refute outdatedness_checker.outdated?(item), 'item should not be outdated'
@@ -412,13 +444,13 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Compile
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
 
     # Assert not outdated
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       outdatedness_checker = site.compiler.outdatedness_checker
       site.items.each do |item|
         refute outdatedness_checker.outdated?(item), 'item should not be outdated'

data/test/base/test_site.rb

@@ -1,30 +1,30 @@
 class Nanoc::Int::SiteTest < Nanoc::TestCase
   def test_initialize_with_dir_without_config_yaml
-    assert_raises(Nanoc::Int::Errors::GenericTrivial) do
-      Nanoc::Int::Site.new('.')
+    assert_raises(Nanoc::Int::ConfigLoader::NoConfigFileFoundError) do
+      Nanoc::Int::SiteLoader.new.new_from_cwd
     end
   end
 
   def test_initialize_with_dir_with_config_yaml
     File.open('config.yaml', 'w') { |io| io.write('output_dir: public_html') }
-    site = Nanoc::Int::Site.new('.')
+    site = Nanoc::Int::SiteLoader.new.new_from_cwd
     assert_equal 'public_html', site.config[:output_dir]
   end
 
   def test_initialize_with_dir_with_nanoc_yaml
     File.open('nanoc.yaml', 'w') { |io| io.write('output_dir: public_html') }
-    site = Nanoc::Int::Site.new('.')
+    site = Nanoc::Int::SiteLoader.new.new_from_cwd
     assert_equal 'public_html', site.config[:output_dir]
   end
 
   def test_initialize_with_config_hash
-    site = Nanoc::Int::Site.new(foo: 'bar')
+    site = Nanoc::Int::SiteLoader.new.new_with_config(foo: 'bar')
     assert_equal 'bar', site.config[:foo]
   end
 
   def test_initialize_with_incomplete_data_source_config
-    site = Nanoc::Int::Site.new(data_sources: [{ type: 'foo', items_root: '/bar/' }])
-    assert_equal('foo',   site.config[:data_sources][0][:type])
+    site = Nanoc::Int::SiteLoader.new.new_with_config(data_sources: [{ items_root: '/bar/' }])
+    assert_equal('filesystem', site.config[:data_sources][0][:type])
     assert_equal('/bar/', site.config[:data_sources][0][:items_root])
     assert_equal('/',     site.config[:data_sources][0][:layouts_root])
     assert_equal({},      site.config[:data_sources][0][:config])
@@ -56,7 +56,7 @@ EOF
       end
     end
 
-    site = Nanoc::Int::Site.new('.')
+    site = Nanoc::Int::SiteLoader.new.new_from_cwd
     assert_nil site.config[:parent_config_file]
     assert site.config[:enable_output_diff]
     assert_equal 'bar', site.config[:foo]
@@ -70,13 +70,9 @@ parent_config_file: foo/foo.yaml
 EOF
     end
 
-    error = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
-      Nanoc::Int::Site.new('.')
+    assert_raises(Nanoc::Int::ConfigLoader::NoParentConfigFileFoundError) do
+      Nanoc::Int::SiteLoader.new.new_from_cwd
     end
-    assert_equal(
-      "Could not find parent configuration file 'foo/foo.yaml'",
-      error.message
-    )
   end
 
   def test_initialize_with_parent_config_file_cycle
@@ -94,13 +90,9 @@ EOF
       end
     end
 
-    error = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
-      Nanoc::Int::Site.new('.')
+    assert_raises(Nanoc::Int::ConfigLoader::CyclicalConfigFileError) do
+      Nanoc::Int::SiteLoader.new.new_from_cwd
     end
-    assert_equal(
-      "Cycle detected. Could not use parent configuration file '../nanoc.yaml'",
-      error.message
-    )
   end
 
   def test_load_rules_with_existing_rules_file
@@ -111,7 +103,7 @@ EOF
     dsl.expects(:compile).with('*')
 
     # Create site
-    site = Nanoc::Int::Site.new({})
+    site = Nanoc::Int::SiteLoader.new.new_empty
     site.compiler.rules_collection.stubs(:dsl).returns(dsl)
 
     # Create rules file
@@ -127,35 +119,6 @@ EOF
     site.compiler.rules_collection.load
   end
 
-  def test_load_data_sources_first
-    # Create site
-    Nanoc::CLI.run %w( create_site bar)
-
-    FileUtils.cd('bar') do
-      # Create data source code
-      File.open('lib/some_data_source.rb', 'w') do |io|
-        io.write "class FooDataSource < Nanoc::DataSource\n"
-        io.write "  identifier :site_test_foo\n"
-        io.write "  def items ; [ Nanoc::Int::Item.new('content', {}, '/foo/') ] ; end\n"
-        io.write "end\n"
-      end
-
-      # Update configuration
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "data_sources:\n"
-        io.write '  - type: site_test_foo'
-      end
-
-      # Create site
-      site = Nanoc::Int::Site.new('.')
-      site.load
-
-      # Check
-      assert_equal 1, site.data_sources.size
-      refute_nil site.items['/foo/']
-    end
-  end
-
   def test_identifier_classes
     Nanoc::CLI.run %w( create_site bar)
     FileUtils.cd('bar') do
@@ -165,7 +128,7 @@ EOF
       File.open('content/foo_bar.md', 'w') { |io| io << 'asdf' }
       File.open('layouts/detail.erb', 'w') { |io| io << 'asdf' }
 
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
 
       site.items.each do |item|
         assert_equal Nanoc::Identifier, item.identifier.class
@@ -191,7 +154,7 @@ EOF
       File.open('content/parent/bar.md', 'w') { |io| io << 'asdf' }
       File.open('content/parent/bar/qux.md', 'w') { |io| io << 'asdf' }
 
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
 
       root   = site.items.find { |i| i.identifier == '/' }
       style  = site.items.find { |i| i.identifier == '/stylesheet/' }
@@ -222,7 +185,7 @@ EOF
       File.open('content/parent/foo.md', 'w') { |io| io << 'asdf' }
       File.open('content/parent/bar/qux.md', 'w') { |io| io << 'asdf' }
 
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
 
       root   = site.items.find { |i| i.identifier == '/index.html' }
       parent = site.items.find { |i| i.identifier == '/parent.md' }
@@ -248,8 +211,7 @@ EOF
       File.open('content/sam/index.html', 'w') { |io| io.write('I am Sam, too!') }
 
       assert_raises(Nanoc::Int::Errors::DuplicateIdentifier) do
-        site = Nanoc::Int::Site.new('.')
-        site.load
+        Nanoc::Int::SiteLoader.new.new_from_cwd
       end
     end
   end
@@ -261,81 +223,17 @@ EOF
       File.open('layouts/sam/index.html', 'w') { |io| io.write('I am Sam, too!') }
 
       assert_raises(Nanoc::Int::Errors::DuplicateIdentifier) do
-        site = Nanoc::Int::Site.new('.')
-        site.load
+        Nanoc::Int::SiteLoader.new.new_from_cwd
       end
     end
   end
 end
 
-describe 'Nanoc::Int::Site#initialize' do
-  include Nanoc::TestHelpers
-
-  it 'should merge default config' do
-    site = Nanoc::Int::Site.new(foo: 'bar')
-    site.config[:foo].must_equal 'bar'
-    site.config[:output_dir].must_equal 'output'
-  end
-
-  it 'should not raise under normal circumstances' do
-    Nanoc::Int::Site.new({})
-  end
-
-  it 'should not raise for non-existant output directory' do
-    Nanoc::Int::Site.new(output_dir: 'fklsdhailfdjalghlkasdflhagjskajdf')
-  end
-
-  it 'should not raise for unknown data sources' do
-    proc do
-      Nanoc::Int::Site.new(data_source: 'fklsdhailfdjalghlkasdflhagjskajdf')
-    end
-  end
-end
-
 describe 'Nanoc::Int::Site#compiler' do
   include Nanoc::TestHelpers
 
   it 'should not raise under normal circumstances' do
-    site = Nanoc::Int::Site.new({})
+    site = Nanoc::Int::SiteLoader.new.new_empty
     site.compiler
   end
 end
-
-describe 'Nanoc::Int::Site#data_sources' do
-  include Nanoc::TestHelpers
-
-  it 'should not raise for known data sources' do
-    site = Nanoc::Int::Site.new({})
-    site.data_sources
-  end
-
-  it 'should raise for unknown data sources' do
-    proc do
-      site = Nanoc::Int::Site.new(
-        data_sources: [
-          { type: 'fklsdhailfdjalghlkasdflhagjskajdf' }
-        ]
-      )
-      site.data_sources
-    end.must_raise Nanoc::Int::Errors::UnknownDataSource
-  end
-
-  it 'should also use the toplevel config for data sources' do
-    with_site do
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "data_sources:\n"
-        io.write "  -\n"
-        io.write "    type: filesystem\n"
-        io.write "    aaa: one\n"
-        io.write "    config:\n"
-        io.write "      bbb: two\n"
-      end
-
-      site = Nanoc::Int::Site.new('.')
-      data_sources = site.data_sources
-
-      assert data_sources.first.config[:aaa] = 'one'
-      assert data_sources.first.config[:bbb] = 'two'
-    end
-  end
-end

data/test/cli/commands/test_compile.rb

@@ -219,7 +219,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
         level: level,
         action: action,
         path: path,
-        duration: duration
+        duration: duration,
       }
     end