nanoc 3.8.0 → 4.0.0a1

data/test/base/test_item_rep_recorder_proxy.rb

@@ -1,17 +1,17 @@
 # encoding: utf-8
 
-class Nanoc::ItemRepRecorderProxyTest < Nanoc::TestCase
+class Nanoc::Int::ItemRepRecorderProxyTest < Nanoc::TestCase
   def test_double_names
-    proxy = Nanoc::ItemRepRecorderProxy.new(mock)
+    proxy = Nanoc::Int::ItemRepRecorderProxy.new(mock)
 
     proxy.snapshot(:foo, stuff: :giraffe)
-    assert_raises(Nanoc::Errors::CannotCreateMultipleSnapshotsWithSameName) do
+    assert_raises(Nanoc::Int::Errors::CannotCreateMultipleSnapshotsWithSameName) do
       proxy.snapshot(:foo, stuff: :donkey)
     end
   end
 
   def test_double_params
-    proxy = Nanoc::ItemRepRecorderProxy.new(mock)
+    proxy = Nanoc::Int::ItemRepRecorderProxy.new(mock)
 
     proxy.snapshot(:foo)
     proxy.snapshot(:bar)

data/test/base/test_layout.rb

@@ -1,27 +1,19 @@
 # encoding: utf-8
 
-class Nanoc::LayoutTest < Nanoc::TestCase
+class Nanoc::Int::LayoutTest < Nanoc::TestCase
   def test_initialize
     # Make sure attributes are cleaned
-    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
+    layout = Nanoc::Int::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
     assert_equal({ foo: 'bar' }, layout.attributes)
 
     # Make sure identifier is cleaned
-    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, 'foo')
-    assert_equal('/foo/', layout.identifier)
-  end
-
-  def test_frozen_identifier
-    layout = Nanoc::Layout.new('foo', {}, '/foo')
-
-    assert_raises_frozen_error do
-      layout.identifier.chop!
-    end
+    layout = Nanoc::Int::Layout.new('content', { 'foo' => 'bar' }, 'foo')
+    assert_equal(Nanoc::Identifier.new('/foo/'), layout.identifier)
   end
 
   def test_lookup_with_known_attribute
     # Create layout
-    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
+    layout = Nanoc::Int::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
 
     # Check attributes
     assert_equal('bar', layout[:foo])
@@ -29,21 +21,21 @@ class Nanoc::LayoutTest < Nanoc::TestCase
 
   def test_lookup_with_unknown_attribute
     # Create layout
-    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
+    layout = Nanoc::Int::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
 
     # Check attributes
     assert_equal(nil, layout[:filter])
   end
 
   def test_dump_and_load
-    layout = Nanoc::Layout.new(
+    layout = Nanoc::Int::Layout.new(
       'foobar',
       { a: { b: 123 } },
       '/foo/')
 
     layout = Marshal.load(Marshal.dump(layout))
 
-    assert_equal '/foo/', layout.identifier
+    assert_equal Nanoc::Identifier.new('/foo/'), layout.identifier
     assert_equal 'foobar', layout.raw_content
     assert_equal({ a: { b: 123 } }, layout.attributes)
   end

data/test/base/test_memoization.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-class Nanoc::MemoizationTest < Nanoc::TestCase
+class Nanoc::Int::MemoizationTest < Nanoc::TestCase
   class Sample1
-    extend Nanoc::Memoization
+    extend Nanoc::Int::Memoization
 
     def initialize(value)
       @value = value
@@ -15,7 +15,7 @@ class Nanoc::MemoizationTest < Nanoc::TestCase
   end
 
   class Sample2
-    extend Nanoc::Memoization
+    extend Nanoc::Int::Memoization
 
     def initialize(value)
       @value = value
@@ -28,7 +28,7 @@ class Nanoc::MemoizationTest < Nanoc::TestCase
   end
 
   class EqualSample
-    extend Nanoc::Memoization
+    extend Nanoc::Int::Memoization
 
     def initialize(value)
       @value = value

data/test/base/test_notification_center.rb

@@ -1,30 +1,30 @@
 # encoding: utf-8
 
-class Nanoc::NotificationCenterTest < Nanoc::TestCase
+class Nanoc::Int::NotificationCenterTest < Nanoc::TestCase
   def test_post
     # Set up notification
-    Nanoc::NotificationCenter.on :ping_received, :test do
+    Nanoc::Int::NotificationCenter.on :ping_received, :test do
       @ping_received = true
     end
 
     # Post
     @ping_received = false
-    Nanoc::NotificationCenter.post :ping_received
+    Nanoc::Int::NotificationCenter.post :ping_received
     assert(@ping_received)
   end
 
   def test_remove
     # Set up notification
-    Nanoc::NotificationCenter.on :ping_received, :test do
+    Nanoc::Int::NotificationCenter.on :ping_received, :test do
       @ping_received = true
     end
 
     # Remove observer
-    Nanoc::NotificationCenter.remove :ping_received, :test
+    Nanoc::Int::NotificationCenter.remove :ping_received, :test
 
     # Post
     @ping_received = false
-    Nanoc::NotificationCenter.post :ping_received
+    Nanoc::Int::NotificationCenter.post :ping_received
     assert(!@ping_received)
   end
 end

data/test/base/test_outdatedness_checker.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
+class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
   def test_not_outdated
     # Compile once
     with_site(name: 'foo') do |site|
@@ -36,7 +36,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::NotEnoughData,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::NotEnoughData,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -59,7 +59,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::NotWritten,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::NotWritten,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -83,7 +83,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/new/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::SourceModified,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::SourceModified,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -109,7 +109,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::DependenciesOutdated,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -141,7 +141,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::DependenciesOutdated,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -176,7 +176,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::DependenciesOutdated,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -208,7 +208,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::DependenciesOutdated,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -242,7 +242,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::DependenciesOutdated,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -266,7 +266,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::CodeSnippetsModified,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::CodeSnippetsModified,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -288,7 +288,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::ConfigurationModified,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::ConfigurationModified,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -331,7 +331,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Compile once
     FileUtils.cd('foo') do
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
       site.compile
     end
 
@@ -349,10 +349,10 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Check
     FileUtils.cd('foo') do
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::OutdatednessReasons::RulesModified,
+      assert_equal ::Nanoc::Int::OutdatednessReasons::RulesModified,
         outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -374,13 +374,13 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Compile
     FileUtils.cd('foo') do
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
       site.compile
     end
 
     # Assert not outdated
     FileUtils.cd('foo') do
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
       outdatedness_checker = site.compiler.outdatedness_checker
       site.items.each do |item|
         refute outdatedness_checker.outdated?(item), 'item should not be outdated'
@@ -407,13 +407,13 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Compile
     FileUtils.cd('foo') do
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
       site.compile
     end
 
     # Assert not outdated
     FileUtils.cd('foo') do
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
       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_plugin.rb

@@ -18,7 +18,7 @@ class Nanoc::PluginTest < Nanoc::TestCase
   def test_register
     SampleFilter.send(:identifier, :_plugin_test_sample_filter)
 
-    registry = Nanoc::PluginRegistry.instance
+    registry = Nanoc::Int::PluginRegistry.instance
     filter = registry.find(Nanoc::Filter, :_plugin_test_sample_filter)
 
     refute_nil filter

data/test/base/test_rule.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Nanoc::RuleTest < Nanoc::TestCase
+class Nanoc::Int::RuleTest < Nanoc::TestCase
   def test_initialize
     # TODO: implement
   end
@@ -18,7 +18,7 @@ class Nanoc::RuleTest < Nanoc::TestCase
     identifier = '/anything/else/'
     expected   = ['anything', 'else']
 
-    rule = Nanoc::Rule.new(regexp, :string, Proc.new {})
+    rule = Nanoc::Int::Rule.new(regexp, :string, Proc.new {})
 
     assert_equal expected, rule.send(:matches, identifier)
   end

data/test/base/test_rule_context.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Nanoc::RuleContextTest < Nanoc::TestCase
+class Nanoc::Int::RuleContextTest < Nanoc::TestCase
   def test_objects
     # Mock everything
     config = mock
@@ -14,10 +14,10 @@ class Nanoc::RuleContextTest < Nanoc::TestCase
     item.stubs(:site).returns(site)
     rep = mock
     rep.stubs(:item).returns(item)
-    compiler = Nanoc::Compiler.new(site)
+    compiler = Nanoc::Int::Compiler.new(site)
 
     # Create context
-    @rule_context = Nanoc::RuleContext.new(rep: rep, compiler: compiler)
+    @rule_context = Nanoc::Int::RuleContext.new(rep: rep, compiler: compiler)
 
     # Check
     assert_equal rep,     @rule_context.rep
@@ -48,10 +48,10 @@ class Nanoc::RuleContextTest < Nanoc::TestCase
     rep.expects(:snapshot).with('awesome')
 
     # Mock compiler
-    compiler = Nanoc::Compiler.new(site)
+    compiler = Nanoc::Int::Compiler.new(site)
 
     # Create context
-    @rule_context = Nanoc::RuleContext.new(rep: rep, compiler: compiler)
+    @rule_context = Nanoc::Int::RuleContext.new(rep: rep, compiler: compiler)
 
     # Check
     rep.filter :foo, bar: 'baz'

data/test/base/test_site.rb

@@ -1,31 +1,31 @@
 # encoding: utf-8
 
-class Nanoc::SiteTest < Nanoc::TestCase
+class Nanoc::Int::SiteTest < Nanoc::TestCase
   def test_initialize_with_dir_without_config_yaml
-    assert_raises(Nanoc::Errors::GenericTrivial) do
-      Nanoc::Site.new('.')
+    assert_raises(Nanoc::Int::Errors::GenericTrivial) do
+      Nanoc::Int::Site.new('.')
     end
   end
 
   def test_initialize_with_dir_with_config_yaml
     File.open('config.yaml', 'w') { |io| io.write('output_dir: public_html') }
-    site = Nanoc::Site.new('.')
+    site = Nanoc::Int::Site.new('.')
     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::Site.new('.')
+    site = Nanoc::Int::Site.new('.')
     assert_equal 'public_html', site.config[:output_dir]
   end
 
   def test_initialize_with_config_hash
-    site = Nanoc::Site.new(foo: 'bar')
+    site = Nanoc::Int::Site.new(foo: 'bar')
     assert_equal 'bar', site.config[:foo]
   end
 
   def test_initialize_with_incomplete_data_source_config
-    site = Nanoc::Site.new(data_sources: [{ type: 'foo', items_root: '/bar/' }])
+    site = Nanoc::Int::Site.new(data_sources: [{ type: 'foo', items_root: '/bar/' }])
     assert_equal('foo',   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])
@@ -58,7 +58,7 @@ EOF
       end
     end
 
-    site = Nanoc::Site.new('.')
+    site = Nanoc::Int::Site.new('.')
     assert_nil site.config[:parent_config_file]
     assert site.config[:enable_output_diff]
     assert_equal 'bar', site.config[:foo]
@@ -72,8 +72,8 @@ parent_config_file: foo/foo.yaml
 EOF
     end
 
-    error = assert_raises(Nanoc::Errors::GenericTrivial) do
-      Nanoc::Site.new('.')
+    error = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
+      Nanoc::Int::Site.new('.')
     end
     assert_equal(
       "Could not find parent configuration file 'foo/foo.yaml'",
@@ -96,8 +96,8 @@ EOF
       end
     end
 
-    error = assert_raises(Nanoc::Errors::GenericTrivial) do
-      Nanoc::Site.new('.')
+    error = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
+      Nanoc::Int::Site.new('.')
     end
     assert_equal(
       "Cycle detected. Could not use parent configuration file '../nanoc.yaml'",
@@ -113,7 +113,7 @@ EOF
     dsl.expects(:compile).with('*')
 
     # Create site
-    site = Nanoc::Site.new({})
+    site = Nanoc::Int::Site.new({})
     site.compiler.rules_collection.stubs(:dsl).returns(dsl)
 
     # Create rules file
@@ -138,7 +138,7 @@ EOF
       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::Item.new('content', {}, '/foo/') ] ; end\n"
+        io.write "  def items ; [ Nanoc::Int::Item.new('content', {}, '/foo/') ] ; end\n"
         io.write "end\n"
       end
 
@@ -149,24 +149,48 @@ EOF
       end
 
       # Create site
-      site = Nanoc::Site.new('.')
-      site.load_data
+      site = Nanoc::Int::Site.new('.')
+      site.load
 
       # Check
       assert_equal 1,       site.data_sources.size
-      assert_equal '/foo/', site.items[0].identifier
+      assert_equal Nanoc::Identifier.new('/foo/'), site.items[0].identifier
+    end
+  end
+
+  def test_identifier_classes
+    Nanoc::CLI.run %w( create_site bar)
+    FileUtils.cd('bar') do
+      FileUtils.mkdir_p('content')
+      FileUtils.mkdir_p('layouts')
+
+      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.items.each do |item|
+        assert_equal Nanoc::Identifier, item.identifier.class
+      end
+
+      site.layouts.each do |layout|
+        assert_equal Nanoc::Identifier, layout.identifier.class
+      end
     end
   end
 
   def test_setup_child_parent_links
     Nanoc::CLI.run %w( create_site bar)
     FileUtils.cd('bar') do
-      Nanoc::CLI.run %w( create_item /parent/ )
-      Nanoc::CLI.run %w( create_item /parent/foo/ )
-      Nanoc::CLI.run %w( create_item /parent/bar/ )
-      Nanoc::CLI.run %w( create_item /parent/bar/qux/ )
+      FileUtils.mkdir_p('content/parent')
+      FileUtils.mkdir_p('content/parent/bar')
+
+      File.open('content/parent.md', 'w') { |io| io << 'asdf' }
+      File.open('content/parent/foo.md', 'w') { |io| io << 'asdf' }
+      File.open('content/parent/bar.md', 'w') { |io| io << 'asdf' }
+      File.open('content/parent/bar/qux.md', 'w') { |io| io << 'asdf' }
 
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
 
       root   = site.items.find { |i| i.identifier == '/' }
       style  = site.items.find { |i| i.identifier == '/stylesheet/' }
@@ -193,8 +217,8 @@ EOF
       FileUtils.mkdir_p('content/sam')
       File.open('content/sam/index.html', 'w') { |io| io.write('I am Sam, too!') }
 
-      assert_raises(Nanoc::Errors::DuplicateIdentifier) do
-        site = Nanoc::Site.new('.')
+      assert_raises(Nanoc::Int::Errors::DuplicateIdentifier) do
+        site = Nanoc::Int::Site.new('.')
         site.load
       end
     end
@@ -206,64 +230,64 @@ EOF
       FileUtils.mkdir_p('layouts/sam')
       File.open('layouts/sam/index.html', 'w') { |io| io.write('I am Sam, too!') }
 
-      assert_raises(Nanoc::Errors::DuplicateIdentifier) do
-        site = Nanoc::Site.new('.')
+      assert_raises(Nanoc::Int::Errors::DuplicateIdentifier) do
+        site = Nanoc::Int::Site.new('.')
         site.load
       end
     end
   end
 end
 
-describe 'Nanoc::Site#initialize' do
+describe 'Nanoc::Int::Site#initialize' do
   include Nanoc::TestHelpers
 
   it 'should merge default config' do
-    site = Nanoc::Site.new(foo: 'bar')
+    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::Site.new({})
+    Nanoc::Int::Site.new({})
   end
 
   it 'should not raise for non-existant output directory' do
-    Nanoc::Site.new(output_dir: 'fklsdhailfdjalghlkasdflhagjskajdf')
+    Nanoc::Int::Site.new(output_dir: 'fklsdhailfdjalghlkasdflhagjskajdf')
   end
 
   it 'should not raise for unknown data sources' do
     proc do
-      Nanoc::Site.new(data_source: 'fklsdhailfdjalghlkasdflhagjskajdf')
+      Nanoc::Int::Site.new(data_source: 'fklsdhailfdjalghlkasdflhagjskajdf')
     end
   end
 end
 
-describe 'Nanoc::Site#compiler' do
+describe 'Nanoc::Int::Site#compiler' do
   include Nanoc::TestHelpers
 
   it 'should not raise under normal circumstances' do
-    site = Nanoc::Site.new({})
+    site = Nanoc::Int::Site.new({})
     site.compiler
   end
 end
 
-describe 'Nanoc::Site#data_sources' do
+describe 'Nanoc::Int::Site#data_sources' do
   include Nanoc::TestHelpers
 
   it 'should not raise for known data sources' do
-    site = Nanoc::Site.new({})
+    site = Nanoc::Int::Site.new({})
     site.data_sources
   end
 
   it 'should raise for unknown data sources' do
     proc do
-      site = Nanoc::Site.new(
+      site = Nanoc::Int::Site.new(
         data_sources: [
           { type: 'fklsdhailfdjalghlkasdflhagjskajdf' }
         ]
       )
       site.data_sources
-    end.must_raise Nanoc::Errors::UnknownDataSource
+    end.must_raise Nanoc::Int::Errors::UnknownDataSource
   end
 
   it 'should also use the toplevel config for data sources' do
@@ -277,7 +301,7 @@ describe 'Nanoc::Site#data_sources' do
         io.write "      bbb: two\n"
       end
 
-      site = Nanoc::Site.new('.')
+      site = Nanoc::Int::Site.new('.')
       data_sources = site.data_sources
 
       assert data_sources.first.config[:aaa] = 'one'