nanoc 4.0.0b4 → 4.0.0rc1

data/lib/nanoc/cli/commands/create-site.rb

@@ -24,18 +24,18 @@ string_pattern_type: glob
 # A list of file extensions that nanoc will consider to be textual rather than
 # binary. If an item with an extension not in this list is found,  the file
 # will be considered as binary.
-text_extensions: #{array_to_yaml(Nanoc::Int::Site::DEFAULT_CONFIG[:text_extensions])}
+text_extensions: #{array_to_yaml(Nanoc::Int::Configuration::DEFAULT_CONFIG[:text_extensions])}
 
 # The path to the directory where all generated files will be written to. This
 # can be an absolute path starting with a slash, but it can also be path
 # relative to the site directory.
-output_dir: #{Nanoc::Int::Site::DEFAULT_CONFIG[:output_dir]}
+output_dir: #{Nanoc::Int::Configuration::DEFAULT_CONFIG[:output_dir]}
 
 # A list of index filenames, i.e. names of files that will be served by a web
 # server when a directory is requested. Usually, index files are named
 # “index.html”, but depending on the web server, this may be something else,
 # such as “default.htm”. This list is used by nanoc to generate pretty URLs.
-index_filenames: #{array_to_yaml(Nanoc::Int::Site::DEFAULT_CONFIG[:index_filenames])}
+index_filenames: #{array_to_yaml(Nanoc::Int::Configuration::DEFAULT_CONFIG[:index_filenames])}
 
 # Whether or not to generate a diff of the compiled content when compiling a
 # site. The diff will contain the differences between the compiled content
@@ -59,18 +59,18 @@ prune:
 data_sources:
   -
     # The type is the identifier of the data source.
-    type: #{Nanoc::Int::Site::DEFAULT_DATA_SOURCE_CONFIG[:type]}
+    type: #{Nanoc::Int::Configuration::DEFAULT_DATA_SOURCE_CONFIG[:type]}
 
     # The path where items should be mounted (comparable to mount points in
     # Unix-like systems). This is “/” by default, meaning that items will have
     # “/” prefixed to their identifiers. If the items root were “/en/”
     # instead, an item at content/about.html would have an identifier of
     # “/en/about/” instead of just “/about/”.
-    items_root: #{Nanoc::Int::Site::DEFAULT_DATA_SOURCE_CONFIG[:items_root]}
+    items_root: #{Nanoc::Int::Configuration::DEFAULT_DATA_SOURCE_CONFIG[:items_root]}
 
     # The path where layouts should be mounted. The layouts root behaves the
     # same as the items root, but applies to layouts rather than items.
-    layouts_root: #{Nanoc::Int::Site::DEFAULT_DATA_SOURCE_CONFIG[:layouts_root]}
+    layouts_root: #{Nanoc::Int::Configuration::DEFAULT_DATA_SOURCE_CONFIG[:layouts_root]}
 
     # The encoding to use for input files. If your input files are not in
     # UTF-8 (which they should be!), change this.
@@ -266,14 +266,15 @@ EOS
     <div id="sidebar">
       <h2>Documentation</h2>
       <ul>
-        <li><a href="http://nanoc.ws/docs/">Documentation</a></li>
-        <li><a href="http://nanoc.ws/docs/tutorial/">Getting Started</a></li>
+        <li><a href="http://v4.nanoc.ws/about/">About</a></li>
+        <li><a href="http://v4.nanoc.ws/doc/">Documentation</a></li>
+        <li><a href="http://v4.nanoc.ws/doc/tutorial/">Tutorial</a></li>
       </ul>
       <h2>Community</h2>
       <ul>
-        <li><a href="http://groups.google.com/group/nanoc/">Discussion Group</a></li>
-        <li><a href="irc://chat.freenode.net/#nanoc">IRC Channel</a></li>
-        <li><a href="http://github.com/nanoc/nanoc/wiki/">Wiki</a></li>
+        <li><a href="http://groups.google.com/group/nanoc/">Discussion group</a></li>
+        <li><a href="irc://chat.freenode.net/#nanoc">IRC channel</a></li>
+        <li><a href="http://v4.nanoc.ws/contributing/">Contributing</a></li>
       </ul>
     </div>
   </body>

data/lib/nanoc/cli/commands/prune.rb

@@ -16,6 +16,7 @@ module Nanoc::CLI::Commands
   class Prune < ::Nanoc::CLI::CommandRunner
     def run
       load_site
+      site.compiler.load
 
       if options.key?(:yes)
         Nanoc::Extra::Pruner.new(site, exclude: prune_config_exclude).run

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -32,7 +32,7 @@ module Nanoc::CLI::Commands
       PLUGIN_CLASS_ORDER.each do |superclass|
         plugins_with_this_superclass = {
           builtin: plugins_builtin.select { |p| p[:superclass] == superclass },
-          custom: plugins_custom.select  { |p| p[:superclass] == superclass }
+          custom: plugins_custom.select  { |p| p[:superclass] == superclass },
         }
 
         # Print kind
@@ -58,7 +58,7 @@ module Nanoc::CLI::Commands
             puts format(
               "    %-#{max_identifiers_length}s (%s)",
               plugin[:identifiers].join(', '),
-              plugin[:class].to_s.sub(/^::/, '')
+              plugin[:class].to_s.sub(/^::/, ''),
             )
           end
         end
@@ -72,13 +72,13 @@ module Nanoc::CLI::Commands
     PLUGIN_CLASS_ORDER = [
       Nanoc::Filter,
       Nanoc::DataSource,
-      Nanoc::Extra::Deployer
+      Nanoc::Extra::Deployer,
     ] unless defined? PLUGIN_CLASS_ORDER
 
     PLUGIN_CLASSES = {
       Nanoc::Filter          => 'Filters',
       Nanoc::DataSource      => 'Data Sources',
-      Nanoc::Extra::Deployer => 'Deployers'
+      Nanoc::Extra::Deployer => 'Deployers',
     } unless defined? PLUGIN_CLASSES
 
     def name_for_plugin_class(klass)

data/lib/nanoc/cli/commands/show-rules.rb

@@ -10,48 +10,39 @@ module Nanoc::CLI::Commands
     def run
       require_site
 
-      @c    = Nanoc::CLI::ANSIStringColorizer
-      @calc = site.compiler.rule_memory_calculator
+      @c = Nanoc::CLI::ANSIStringColorizer
+      @rules = site.compiler.rules_collection
 
-      # TODO: explain /foo/
-      # TODO: explain content/foo.html
-      # TODO: explain output/foo/index.html
-
-      site.items.each   { |i| explain_item(i)   }
-      site.layouts.each { |l| explain_layout(l) }
+      site.items.sort_by(&:identifier).each   { |e| explain_item(e) }
+      site.layouts.sort_by(&:identifier).each { |e| explain_layout(e) }
     end
 
-    protected
-
     def explain_item(item)
       puts "#{@c.c('Item ' + item.identifier, :bold, :yellow)}:"
-      puts "  (from #{item[:filename]})" if item[:filename]
+
       item.reps.each do |rep|
-        puts "  Rep #{rep.name}:"
-        if @calc[rep].empty? && rep.raw_path.nil?
-          puts '    (nothing)'
-        else
-          @calc[rep].each do |mem|
-            puts format('    %s %s',
-              @c.c(format('%-10s', mem[0].to_s), :blue),
-              mem[1..-1].map(&:inspect).join(', '))
-          end
-          if rep.raw_path
-            puts format('    %s %s',
-              @c.c(format('%-10s', 'write to'), :blue),
-              rep.raw_path)
-          end
-        end
+        rule = @rules.compilation_rule_for(rep)
+        puts "  Rep #{rep.name}: #{rule ? rule.pattern : '(none)'}"
       end
+
       puts
     end
 
     def explain_layout(layout)
       puts "#{@c.c('Layout ' + layout.identifier, :bold, :yellow)}:"
-      puts "  (from #{layout[:filename]})" if layout[:filename]
-      puts format('  %s %s',
-        @c.c(format('%-10s', 'filter'), :blue),
-        @calc[layout].map(&:inspect).join(', '))
+
+      found = false
+      @rules.layout_filter_mapping.each do |pattern, _|
+        if pattern.match?(layout.identifier)
+          puts "  #{pattern}"
+          found = true
+          break
+        end
+      end
+      unless found
+        puts '  (none)'
+      end
+
       puts
     end
   end

data/lib/nanoc/cli/commands/view.rb

@@ -24,7 +24,7 @@ module Nanoc::CLI::Commands
       # Set options
       options_for_rack = {
         Port: (options[:port] || 3000).to_i,
-        Host: (options[:host] || '0.0.0.0')
+        Host: (options[:host] || '0.0.0.0'),
       }
 
       # Get handler

data/lib/nanoc/cli/error_handler.rb

@@ -207,7 +207,7 @@ module Nanoc::CLI
       'redcloth'       => 'RedCloth',
       'rubypants'      => 'rubypants',
       'sass'           => 'sass',
-      'w3c_validators' => 'w3c_validators'
+      'w3c_validators' => 'w3c_validators',
     }
 
     # Attempts to find a resolution for the given error, or nil if no

data/lib/nanoc/cli.rb

@@ -116,9 +116,9 @@ module Nanoc::CLI
   #
   # @return [void]
   def self.load_custom_commands
-    if Nanoc::Int::Site.cwd_is_nanoc_site?
-      site = Nanoc::Int::Site.new('.')
-      site.config[:commands_dirs].each do |path|
+    if Nanoc::Int::SiteLoader.cwd_is_nanoc_site?
+      config = Nanoc::Int::ConfigLoader.new.new_from_cwd
+      config[:commands_dirs].each do |path|
         load_commands_at(path)
       end
     end

data/lib/nanoc/data_sources/filesystem.rb

@@ -54,7 +54,7 @@ module Nanoc::DataSources
           content_filename = filename_for(base_filename, content_ext)
 
           # Read content and metadata
-          is_binary = content_filename && !@site.config[:text_extensions].include?(File.extname(content_filename)[1..-1])
+          is_binary = content_filename && !@site_config[:text_extensions].include?(File.extname(content_filename)[1..-1])
           if is_binary && klass == Nanoc::Int::Item
             meta                = (meta_filename && YAML.load_file(meta_filename)) || {}
             content_or_filename = content_filename
@@ -169,7 +169,7 @@ module Nanoc::DataSources
     # basename before concatenating it with a period and the extension).
     def filename_for(_base_filename, _ext)
       raise NotImplementedError.new(
-        "#{self.class} does not implement #filename_for"
+        "#{self.class} does not implement #filename_for",
       )
     end
 
@@ -177,7 +177,7 @@ module Nanoc::DataSources
     # can be the content filename or the meta filename.
     def identifier_for_filename(_filename)
       raise NotImplementedError.new(
-        "#{self.class} does not implement #identifier_for_filename"
+        "#{self.class} does not implement #identifier_for_filename",
       )
     end
 
@@ -234,7 +234,7 @@ module Nanoc::DataSources
       pieces = data.split(/^(-{5}|-{3})[ \t]*\r?\n?/, 3)
       if pieces.size < 4
         raise RuntimeError.new(
-          "The file '#{content_filename}' appears to start with a metadata section (three or five dashes at the top) but it does not seem to be in the correct format."
+          "The file '#{content_filename}' appears to start with a metadata section (three or five dashes at the top) but it does not seem to be in the correct format.",
         )
       end
 

data/lib/nanoc/extra/checking/runner.rb

@@ -62,8 +62,6 @@ module Nanoc::Extra::Checking
       run_check_classes(check_classes_named(check_class_names))
     end
 
-    protected
-
     def load_dsl_if_available
       @dsl_loaded ||= false
       unless @dsl_loaded
@@ -108,6 +106,9 @@ module Nanoc::Extra::Checking
     def run_checks(classes)
       return [] if classes.empty?
 
+      # TODO: remove me
+      @site.compiler.load
+
       checks = []
       issues = Set.new
       length = classes.map { |c| c.identifier.to_s.length }.max + 18

data/lib/nanoc/extra/deployers/rsync.rb

@@ -32,7 +32,7 @@ module Nanoc::Extra::Deployers
       '--compress',
       '--exclude=".hg"',
       '--exclude=".svn"',
-      '--exclude=".git"'
+      '--exclude=".git"',
     ]
 
     # @see Nanoc::Extra::Deployer#run

data/lib/nanoc/extra/link_collector.rb

@@ -11,7 +11,7 @@ module ::Nanoc::Extra
       'img' => :src,
       'link' => :href,
       'script' => :src,
-      'video' => :src
+      'video' => :src,
     }
 
     def initialize(filenames, mode = nil)

data/lib/nanoc/helpers/capturing.rb

@@ -113,7 +113,7 @@ module Nanoc::Helpers
             @site.unwrap.captures_store_compiled_items << item
             item.forced_outdated = true
             item.reps.each do |r|
-              r.content_snapshots = { last: item.content }
+              r.snapshot_contents = { last: item.content }
               raise Nanoc::Int::Errors::UnmetDependency.new(r)
             end
           end

data/lib/nanoc/helpers/rendering.rb

@@ -92,10 +92,10 @@ module Nanoc::Helpers
         item: @item,
         item_rep: @item_rep,
         items: @items,
-        layout: Nanoc::LayoutView.new(layout), # FIXME: this does not need to be rewrapped
+        layout: layout,
         layouts: @layouts,
         config: @config,
-        site: @site
+        site: @site,
       }.merge(other_assigns)
 
       # Get filter name

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current nanoc version.
-  VERSION = '4.0.0b4'
+  VERSION = '4.0.0rc1'
 end

data/nanoc.gemspec

@@ -1,12 +1,11 @@
-$LOAD_PATH.unshift(File.expand_path('../lib/', __FILE__))
-require 'nanoc/version'
+require_relative 'lib/nanoc/version'
 
 Gem::Specification.new do |s|
   s.name        = 'nanoc'
   s.version     = Nanoc::VERSION
   s.homepage    = 'http://nanoc.ws/'
-  s.summary     = 'a web publishing system written in Ruby for building small to medium-sized websites.'
-  s.description = 'nanoc is a simple but very flexible static site generator written in Ruby. It operates on local files, and therefore does not run on the server. nanoc “compiles” the local source files into HTML (usually), by evaluating eRuby, Markdown, etc.'
+  s.summary     = 'A static-site generator with a focus on flexibility.'
+  s.description = 'nanoc is a static-site generator focused on flexibility. It transforms content from a format such as Markdown or AsciiDoc into another format, usually HTML, and lays out pages consistently to retain the site’s look and feel throughout. Static sites built with nanoc can be deployed to any web server.'
 
   s.author  = 'Denis Defreyne'
   s.email   = 'denis.defreyne@stoneship.org'

data/tasks/doc.rake

@@ -11,6 +11,6 @@ YARD::Rake::YardocTask.new(:doc) do |yard|
     '--output-dir',      'doc/yardoc',
     '--template-path',   'doc/yardoc_templates',
     '--load',            'doc/yardoc_handlers/identifier.rb',
-    '--query',           '@api.text != "private"',
+    '--query',           '@api.text != "private"'
   ]
 end

data/tasks/rubocop.rake

@@ -1,10 +1,6 @@
-begin
-  require 'rubocop/rake_task'
+require 'rubocop/rake_task'
 
-  RuboCop::RakeTask.new(:rubocop) do |task|
-    task.options  = %w( --display-cop-names --format simple )
-    task.patterns = ['lib/**/*.rb']
-  end
-rescue LoadError
-  warn 'Could not load RuboCop. RuboCop rake tasks will be unavailable.'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.options  = %w( --display-cop-names --format simple )
+  task.patterns = ['lib/**/*.rb']
 end

data/tasks/test.rake

@@ -1,33 +1,17 @@
 require 'rspec/core/rake_task'
+require 'rake/testtask'
+require 'coveralls/rake/task'
 
-def run_tests(dir_glob)
-  ENV['ARGS'] ||= ''
-  ENV['QUIET'] ||= 'true'
+Coveralls::RakeTask.new
 
-  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/..'))
-
-  # require our test helper so we don't have to in each individual test
-  require 'test/helper'
-
-  test_files = Dir["#{dir_glob}*_spec.rb"] + Dir["#{dir_glob}test_*.rb"]
-  test_files.each { |f| require f }
-
-  res = Minitest.run(ENV['ARGS'].split)
-  exit(res) if res != 0
-end
+SUBDIRS = %w( * base cli data_sources extra filters helpers )
 
 namespace :test do
-  # test:all
-  desc 'Run all tests'
-  task :all do
-    run_tests 'test/**/'
-  end
-
-  # test:...
-  %w( base cli data_sources extra filters helpers ).each do |dir|
-    desc "Run all #{dir} tests"
-    task dir.to_sym do |_task|
-      run_tests "test/#{dir}/**/"
+  SUBDIRS.each do |dir|
+    Rake::TestTask.new(dir == '*' ? 'all' : dir) do |t|
+      t.test_files = Dir["test/#{dir}/**/*_spec.rb"] + Dir["test/#{dir}/**/test_*.rb"]
+      t.libs = ['./lib', '.']
+      t.ruby_opts = ['-r./test/helper']
     end
   end
 end
@@ -37,5 +21,5 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = false
 end
 
-desc 'Alias for test:all + rubocop'
-task test: [:spec, :'test:all', :rubocop]
+desc 'Run all tests and specs'
+task test: [:spec, :'test:all', :'coveralls:push']

data/test/base/test_compiler.rb

@@ -116,7 +116,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       0 => 'd',
       1 => 'b', # never used! not c, because b takes priority
       2 => 'b',
-      3 => 'a'
+      3 => 'a',
     }
 
     # Check
@@ -137,7 +137,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       raw: 'raw.txt',
       pre: 'pre.txt',
       post: 'post.txt',
-      last: 'last.txt'
+      last: 'last.txt',
     }
 
     # Create rule
@@ -190,6 +190,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     with_site do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert Dir['output/*'].size == 1
@@ -203,6 +204,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       File.open('content/foo.html', 'w') { |io| io.write('o hai') }
       File.open('content/bar.html', 'w') { |io| io.write('o bai') }
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert Dir['output/*'].size == 2
@@ -222,6 +224,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
         io.write('manatee')
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert Dir['output/*'].size == 2
@@ -241,6 +244,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
         io.write('<%= @items.find { |i| i.identifier == "/foo/" }.compiled_content %>')
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       assert_raises Nanoc::Int::Errors::RecursiveCompilation do
         site.compile
       end
@@ -266,7 +270,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Create site
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       error = assert_raises(RuntimeError) do
         site.compile
       end
@@ -279,7 +283,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     Nanoc::CLI.run %w( create_site bar)
 
     FileUtils.cd('bar') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
 
       compiler = Nanoc::Int::Compiler.new(site)
       def compiler.route_reps
@@ -299,7 +303,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     FileUtils.cd('bar') do
       Nanoc::CLI.run %w( compile )
 
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # At this point, even the already compiled items in the previous pass
@@ -328,7 +332,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       assert_raises Nanoc::Int::Errors::CannotCreateMultipleSnapshotsWithSameName do
         site.compile
       end
@@ -358,7 +362,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check
@@ -391,7 +395,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check
@@ -421,7 +425,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check
@@ -454,7 +458,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check
@@ -475,7 +479,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check
@@ -506,7 +510,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check
@@ -529,7 +533,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
         io.write "layout '*', :erb\n"
       end
 
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert_equal Set.new(%w( content/blah.dat )), Set.new(Dir['content/*'])
@@ -545,7 +549,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check
@@ -573,7 +577,8 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
         io.write "layout '*', :erb\n"
       end
 
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       rep = site.items['/a/'].reps[0]
       dt = site.compiler.dependency_tracker
       dt.start
@@ -602,7 +607,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
         io.write "layout '/**/*', :erb\n"
       end
 
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end

data/test/base/test_compiler_dsl.rb

@@ -41,7 +41,7 @@ class Nanoc::Int::CompilerDSLTest < Nanoc::TestCase
       File.open('more_rules.rb', 'w') { |io| io.write "preprocess { @items['/foo/'][:preprocessed] = true }" }
 
       # Create other necessary stuff
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.items << item
       dsl = site.compiler.rules_collection.dsl
       io = capturing_stdio do
@@ -76,7 +76,7 @@ class Nanoc::Int::CompilerDSLTest < Nanoc::TestCase
       File.open('more_rules.rb', 'w') { |io| io.write "passthrough '/foo/'" }
 
       # Create other necessary stuff
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.items << item
       dsl = site.compiler.rules_collection.dsl
 
@@ -107,7 +107,7 @@ EOS
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check paths
@@ -131,7 +131,7 @@ EOS
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check paths
@@ -163,7 +163,7 @@ EOS
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check paths
@@ -194,7 +194,7 @@ EOS
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check paths
@@ -224,7 +224,7 @@ EOS
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check paths
@@ -256,7 +256,7 @@ EOS
       end
 
       # Compile
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       # Check paths