nanoc 4.0.0b1 → 4.0.0b2

data/test/base/test_layout.rb

@@ -3,12 +3,8 @@
 class Nanoc::Int::LayoutTest < Nanoc::TestCase
   def test_initialize
     # Make sure attributes are cleaned
-    layout = Nanoc::Int::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::Int::Layout.new('content', { 'foo' => 'bar' }, 'foo')
-    assert_equal(Nanoc::Identifier.new('/foo/'), layout.identifier)
   end
 
   def test_lookup_with_known_attribute

data/test/base/test_outdatedness_checker.rb

@@ -13,7 +13,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     # Check
     with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.items[0].reps[0]
+      rep = site.items['/'].reps[0]
       assert_nil outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
@@ -281,7 +281,14 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Change code
     FileUtils.cd('foo') do
-      File.open('nanoc.yaml', 'w') { |io| io.write('awesome: true') }
+      File.open('nanoc.yaml', 'w') do |io|
+        io << 'awesome: true' << "\n"
+        io << 'string_pattern_type: legacy' << "\n"
+        io << 'data_sources:' << "\n"
+        io << '  -' << "\n"
+        io << '    type: filesystem_unified' << "\n"
+        io << '    identifier_type: legacy' << "\n"
+      end
     end
 
     # Check

data/test/base/test_site.rb

@@ -153,8 +153,8 @@ EOF
       site.load
 
       # Check
-      assert_equal 1,       site.data_sources.size
-      assert_equal Nanoc::Identifier.new('/foo/'), site.items[0].identifier
+      assert_equal 1, site.data_sources.size
+      refute_nil site.items['/foo/']
     end
   end
 
@@ -185,7 +185,7 @@ EOF
       FileUtils.mkdir_p('content/parent')
       FileUtils.mkdir_p('content/parent/bar')
 
-      data = File.read('nanoc.yaml').sub('identifier_style: full', 'identifier_style: stripped')
+      data = File.read('nanoc.yaml').sub('identifier_type: full', 'identifier_type: legacy')
       File.open('nanoc.yaml', 'w') { |io| io << data }
 
       File.open('content/parent.md', 'w') { |io| io << 'asdf' }
@@ -203,8 +203,8 @@ EOF
       qux    = site.items.find { |i| i.identifier == '/parent/bar/qux/' }
 
       assert_equal Set.new([parent, style]), Set.new(root.children)
-      assert_equal Set.new([foo, bar]),      Set.new(parent.children)
-      assert_equal Set.new([qux]),           Set.new(bar.children)
+      assert_equal Set.new([foo, bar]), Set.new(parent.children)
+      assert_equal Set.new([qux]), Set.new(bar.children)
 
       assert_equal nil,    root.parent
       assert_equal root,   parent.parent

data/test/cli/commands/test_compile.rb

@@ -49,6 +49,12 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
         io.write "layout '*', :erb\n"
       end
 
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "string_pattern_type: legacy\n"
+        io.write "prune:\n"
+        io.write "  auto_prune: false\n"
+      end
+
       File.open('output/stray.html', 'w') do |io|
         io.write 'I am a stray file and I am about to be deleted!'
       end
@@ -58,6 +64,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       assert File.file?('output/stray.html')
 
       File.open('nanoc.yaml', 'w') do |io|
+        io.write "string_pattern_type: legacy\n"
         io.write "prune:\n"
         io.write "  auto_prune: true\n"
       end
@@ -92,6 +99,12 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
 
       Dir.mkdir('output/excluded_dir')
 
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "string_pattern_type: legacy\n"
+        io.write "prune:\n"
+        io.write "  auto_prune: false\n"
+      end
+
       File.open('output/stray.html', 'w') do |io|
         io.write 'I am a stray file and I am about to be deleted!'
       end
@@ -101,6 +114,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       assert File.file?('output/stray.html')
 
       File.open('nanoc.yaml', 'w') do |io|
+        io.write "string_pattern_type: legacy\n"
         io.write "prune:\n"
         io.write "  auto_prune: true\n"
         io.write "  exclude: [ 'excluded_dir' ]\n"

data/test/cli/commands/test_create_site.rb

@@ -39,6 +39,30 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     end
   end
 
+  def test_can_compile_site_in_nonempty_directory
+    FileUtils.mkdir('foo')
+    FileUtils.touch(File.join('foo', 'SomeFile.txt'))
+    Nanoc::CLI.run %w( create_site foo --force )
+
+    FileUtils.cd('foo') do
+      site = Nanoc::Int::Site.new('.')
+      site.compile
+    end
+  end
+
+  def test_compiled_site_output
+    FileUtils.mkdir('foo')
+    FileUtils.touch(File.join('foo', 'SomeFile.txt'))
+    Nanoc::CLI.run %w( create_site foo --force )
+
+    FileUtils.cd('foo') do
+      site = Nanoc::Int::Site.new('.')
+      site.compile
+
+      assert File.file?('output/index.html')
+    end
+  end
+
   def test_default_encoding
     unless defined?(Encoding)
       skip 'No Encoding class'
@@ -61,11 +85,11 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
 
       # Try with encoding = specific
       File.open('nanoc.yaml', 'w') do |io|
-        io.write("pattern_syntax: glob\n")
+        io.write("string_pattern_type: glob\n")
         io.write("data_sources:\n")
         io.write("  -\n")
         io.write("    type: filesystem_unified\n")
-        io.write("    identifier_style: full\n")
+        io.write("    identifier_type: full\n")
       end
       site = Nanoc::Int::Site.new('.')
       site.compile
@@ -84,4 +108,18 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
       assert_match(/\/stylesheet.css/, File.read('output/index.html'))
     end
   end
+
+  def test_new_site_prunes_by_default
+    FileUtils.mkdir('foo')
+    FileUtils.touch(File.join('foo', 'SomeFile.txt'))
+    Nanoc::CLI.run %w( create_site foo --force )
+
+    FileUtils.cd('foo') do
+      File.write('output/blah.txt', 'stuff')
+
+      Nanoc::CLI.run %w( compile )
+
+      refute File.file?('output/blah.txt')
+    end
+  end
 end

data/test/cli/commands/test_prune.rb

@@ -4,7 +4,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   def test_run_without_yes
     with_site do |_site|
       # Set output dir
-      File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
+      File.open('nanoc.yaml', 'w') { |io| io.write "output_dir: output2\nstring_pattern_type: legacy\n" }
       FileUtils.mkdir_p('output2')
 
       # Create source files
@@ -26,7 +26,14 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   def test_run_with_yes
     with_site do |_site|
       # Set output dir
-      File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
+      File.open('nanoc.yaml', 'w') do |io|
+        io << 'output_dir: output2' << "\n"
+        io << 'string_pattern_type: legacy' << "\n"
+        io << 'data_sources:' << "\n"
+        io << '  -' << "\n"
+        io << '    type: filesystem_unified' << "\n"
+        io << '    identifier_type: legacy' << "\n"
+      end
       FileUtils.mkdir_p('output2')
 
       # Create source files
@@ -46,7 +53,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   def test_run_with_dry_run
     with_site do |_site|
       # Set output dir
-      File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
+      File.open('nanoc.yaml', 'w') { |io| io.write "string_pattern_type: legacy\noutput_dir: output2" }
       FileUtils.mkdir_p('output2')
 
       # Create source files
@@ -66,7 +73,15 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   def test_run_with_exclude
     with_site do |_site|
       # Set output dir
-      File.open('nanoc.yaml', 'w') { |io| io.write "prune:\n  exclude: [ 'good-dir', 'good-file.html' ]" }
+      File.open('nanoc.yaml', 'w') do |io|
+        io << 'prune:' << "\n"
+        io << '  exclude: [ "good-dir", "good-file.html" ]' << "\n"
+        io << 'string_pattern_type: legacy' << "\n"
+        io << 'data_sources:' << "\n"
+        io << '  -' << "\n"
+        io << '    type: filesystem_unified' << "\n"
+        io << '    identifier_type: legacy' << "\n"
+      end
       FileUtils.mkdir_p('output')
 
       # Create source files

data/test/data_sources/test_filesystem.rb

@@ -98,7 +98,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
   def test_all_split_files_in_with_same_extensions
     # Create data source
-    config = { identifier_style: 'full' }
+    config = { identifier_type: 'full' }
     data_source = Nanoc::DataSources::FilesystemUnified.new(nil, nil, nil, config)
 
     # Write sample files

data/test/data_sources/test_filesystem_unified.rb

@@ -75,7 +75,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
   def test_load_objects_with_same_extensions
     # Create data source
-    data_source = new_data_source({ identifier_style: 'full' })
+    data_source = new_data_source({ identifier_type: 'full' })
 
     # Create a fake class
     klass = Class.new do
@@ -133,14 +133,14 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
   def test_identifier_for_filename_with_full_style_identifier
     # Create data source
-    data_source = new_data_source({ identifier_style: 'full' })
+    data_source = new_data_source({ identifier_type: 'full' })
 
     # Get input and expected output
     expected = {
-      '/foo'            => Nanoc::Identifier.new('/foo',            style: :full),
-      '/foo.html'       => Nanoc::Identifier.new('/foo.html',       style: :full),
-      '/foo/index.html' => Nanoc::Identifier.new('/foo/index.html', style: :full),
-      '/foo.html.erb'   => Nanoc::Identifier.new('/foo.html.erb',   style: :full),
+      '/foo'            => Nanoc::Identifier.new('/foo',            type: :full),
+      '/foo.html'       => Nanoc::Identifier.new('/foo.html',       type: :full),
+      '/foo/index.html' => Nanoc::Identifier.new('/foo/index.html', type: :full),
+      '/foo.html.erb'   => Nanoc::Identifier.new('/foo.html.erb',   type: :full),
     }
 
     # Check

data/test/extra/checking/checks/test_stale.rb

@@ -47,7 +47,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
       assert Dir['content/*'].empty?
       assert Dir['output/*'].empty?
 
-      File.open('nanoc.yaml', 'w') { |io| io.write "prune:\n  exclude: [ 'excluded.html' ]" }
+      File.open('nanoc.yaml', 'w') { |io| io.write "string_pattern_type: legacy\nprune:\n  exclude: [ 'excluded.html' ]" }
       File.open('content/index.html', 'w') { |io| io.write('stuff') }
       File.open('output/excluded.html', 'w') { |io| io.write('stuff') }
       assert calc_issues.empty?
@@ -59,7 +59,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
       assert Dir['content/*'].empty?
       assert Dir['output/*'].empty?
 
-      File.open('nanoc.yaml', 'w') { |io| io.write "prune:\n  blah: meh" }
+      File.open('nanoc.yaml', 'w') { |io| io.write "string_pattern_type: legacy\nprune:\n  blah: meh" }
       File.open('content/index.html', 'w') { |io| io.write('stuff') }
       File.open('output/excluded.html', 'w') { |io| io.write('stuff') }
       refute calc_issues.empty?

data/test/helper.rb

@@ -103,7 +103,14 @@ EOS
           end
         end
 
-        File.open('nanoc.yaml', 'w') { |io| io.write('stuff: 12345') }
+        File.open('nanoc.yaml', 'w') do |io|
+          io << 'string_pattern_type: legacy' << "\n"
+          io << 'data_sources:' << "\n"
+          io << '  -' << "\n"
+          io << '    type: filesystem_unified' << "\n"
+          io << '    identifier_type: legacy' << "\n"
+        end
+
         File.open('Rules', 'w') { |io| io.write(rules_content) }
       end
     end

data/test/helpers/test_blogging.rb

@@ -26,64 +26,6 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     item
   end
 
-  def test_articles
-    # Create items
-    @items = [
-      Nanoc::Int::Item.new(
-        'blah',
-        { kind: 'item' },
-        '/0/'
-      ),
-      Nanoc::Int::Item.new(
-        'blah blah',
-        { kind: 'article' },
-        '/1/'
-      ),
-      Nanoc::Int::Item.new(
-        'blah blah blah',
-        { kind: 'article' },
-        '/2/'
-      )
-    ]
-
-    # Check
-    assert_equal(2, articles.size)
-    assert articles.include?(@items[1])
-    assert articles.include?(@items[2])
-  ensure
-    # Cleanup
-    @items = nil
-  end
-
-  def test_sorted_articles
-    # Create items
-    @items = [
-      Nanoc::Int::Item.new(
-        'blah',
-        { kind: 'item' },
-        '/0/'
-      ),
-      Nanoc::Int::Item.new(
-        'blah',
-        { kind: 'article', created_at: (Date.today - 1).to_s },
-        '/1/'
-      ),
-      Nanoc::Int::Item.new(
-        'blah',
-        { kind: 'article', created_at: (Time.now - 500).to_s },
-        '/2/'
-      )
-    ]
-
-    # Check
-    assert_equal(2,         sorted_articles.size)
-    assert_equal(@items[2], sorted_articles[0])
-    assert_equal(@items[1], sorted_articles[1])
-  ensure
-    # Cleanup
-    @items = nil
-  end
-
   def test_atom_feed
     if_have 'builder' do
       # Create items
@@ -623,181 +565,4 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       atom_feed
     end
   end
-
-  def test_url_for_without_custom_path_in_feed
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new('content', {}, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-    item.reps[0].paths[:last] = '/foo/bar/'
-
-    # Check
-    assert_equal('http://example.com/foo/bar/', url_for(item))
-  ensure
-    # Cleanup
-    @item = nil
-  end
-
-  def test_url_for_with_custom_path_in_feed
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new(
-      'content', { custom_path_in_feed: '/meow/woof/' }, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-
-    # Check
-    assert_equal('http://example.com/meow/woof/', url_for(item))
-  ensure
-    # Cleanup
-    @item = nil
-  end
-
-  def test_url_for_with_custom_url_in_feed
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new(
-      'content', { custom_url_in_feed: 'http://example.org/x' }, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-
-    # Check
-    assert_equal('http://example.org/x', url_for(item))
-  ensure
-    # Cleanup
-    @item = nil
-  end
-
-  def test_url_for_without_base_url
-    # Create site
-    @config = Nanoc::ConfigView.new({})
-
-    # Check
-    assert_raises(Nanoc::Int::Errors::GenericTrivial) do
-      url_for(nil)
-    end
-  end
-
-  def test_url_for_without_path
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new('content', {}, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-    item.reps[0].paths[:last] = nil
-
-    # Check
-    assert_equal(nil, url_for(item))
-  end
-
-  def test_feed_url_without_custom_feed_url
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    @item = Nanoc::Int::Item.new('content', {}, '/foo/')
-    @item.reps << Nanoc::Int::ItemRep.new(@item, :default)
-    @item.reps[0].paths[:last] = '/foo/bar/'
-
-    # Check
-    assert_equal('http://example.com/foo/bar/', feed_url)
-  ensure
-    # Cleanup
-    @item = nil
-  end
-
-  def test_feed_url_with_custom_feed_url
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create feed item
-    @item = Nanoc::Int::Item.new('content', { feed_url: 'http://example.com/feed/' }, '/foo/')
-    @item.reps << Nanoc::Int::ItemRep.new(@item, :default)
-    @item.reps[0].paths[:last] = '/foo/bar/'
-
-    # Check
-    assert_equal('http://example.com/feed/', feed_url)
-  ensure
-    # Cleanup
-    @item = nil
-  end
-
-  def test_feed_url_without_base_url
-    # Create site
-    @config = Nanoc::ConfigView.new({})
-
-    # Check
-    assert_raises(Nanoc::Int::Errors::GenericTrivial) do
-      feed_url
-    end
-  end
-
-  def test_atom_tag_for_with_path
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new('content', { created_at: '2008-05-19' }, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-    item.reps[0].paths[:last] = '/foo/bar/'
-
-    # Check
-    assert_equal('tag:example.com,2008-05-19:/foo/bar/', atom_tag_for(item))
-  end
-
-  def test_atom_tag_for_without_path
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new('content', { created_at: '2008-05-19' }, '/baz/qux/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-
-    # Check
-    assert_equal('tag:example.com,2008-05-19:/baz/qux/', atom_tag_for(item))
-  end
-
-  def test_atom_tag_for_with_base_url_in_dir
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com/somedir' })
-
-    # Create article
-    item = Nanoc::Int::Item.new('content', { created_at: '2008-05-19' }, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-    item.reps[0].paths[:last] = '/foo/bar/'
-
-    # Check
-    assert_equal('tag:example.com,2008-05-19:/somedir/foo/bar/', atom_tag_for(item))
-  end
-
-  def test_atom_tag_for_with_time
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new('content', { created_at: Time.parse('2008-05-19') }, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-    item.reps[0].paths[:last] = '/foo/bar/'
-
-    # Check
-    assert_equal('tag:example.com,2008-05-19:/foo/bar/', atom_tag_for(item))
-  end
-
-  def test_atom_tag_for_with_date
-    # Create site
-    @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
-
-    # Create article
-    item = Nanoc::Int::Item.new('content', { created_at: Date.parse('2008-05-19') }, '/foo/')
-    item.reps << Nanoc::Int::ItemRep.new(item, :default)
-    item.reps[0].paths[:last] = '/foo/bar/'
-
-    # Check
-    assert_equal('tag:example.com,2008-05-19:/foo/bar/', atom_tag_for(item))
-  end
 end