nanoc3 3.2.0a4 → 3.2.0b1

data/test/base/test_layout.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::LayoutTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -19,10 +17,14 @@ class Nanoc3::LayoutTest < MiniTest::Unit::TestCase
   def test_frozen_identifier
     layout = Nanoc3::Layout.new("foo", {}, '/foo')
 
-    error = assert_raises(RuntimeError) do
+    raised = false
+    begin
       layout.identifier.chop!
+    rescue => error
+      raised = true
+      assert_equal "can't modify frozen string", error.message
     end
-    assert_equal "can't modify frozen string", error.message
+    assert raised, 'Should have raised when trying to modify a frozen string'
   end
 
   def test_lookup_with_known_attribute
@@ -41,4 +43,17 @@ class Nanoc3::LayoutTest < MiniTest::Unit::TestCase
     assert_equal(nil, layout[:filter])
   end
 
+  def test_dump_and_load
+    layout = Nanoc3::Layout.new(
+      "foobar",
+      { :a => { :b => 123 }},
+      '/foo/')
+
+    layout = Marshal.load(Marshal.dump(layout))
+
+    assert_equal '/foo/', layout.identifier
+    assert_equal 'foobar', layout.raw_content
+    assert_equal({ :a => { :b => 123 }}, layout.attributes)
+  end
+
 end

data/test/base/test_memoization.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::MemoizationTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -36,6 +34,33 @@ class Nanoc3::MemoizationTest < MiniTest::Unit::TestCase
 
   end
 
+  class EqualSample
+
+    extend Nanoc3::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
     sample1a = Sample1.new(10)
     sample1b = Sample1.new(15)
@@ -50,4 +75,16 @@ class Nanoc3::MemoizationTest < MiniTest::Unit::TestCase
     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_notification_center.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::NotificationCenterTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_outdatedness_checker.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::OutdatednessCheckerTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -362,4 +360,35 @@ class Nanoc3::OutdatednessCheckerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_items_in_rules_should_not_cause_outdatedness
+    # Create site
+    with_site(:name => 'foo') do |site|
+      File.open('content/index.html', 'w') { |io| io.write('o hello') }
+      File.open('Rules', 'w') do |io|
+        io.write("compile '/' do\n")
+        io.write("  filter :erb, :stuff => @items\n")
+        io.write("end\n")
+        io.write("\n")
+        io.write("route '/' do\n")
+        io.write("  '/index.html'\n")
+        io.write("end\n")
+      end
+    end
+
+    # Compile
+    FileUtils.cd('foo') do
+      site = Nanoc3::Site.new('.')
+      site.compile
+    end
+
+    # Assert not outdated
+    FileUtils.cd('foo') do
+      site = Nanoc3::Site.new('.')
+      outdatedness_checker = site.compiler.outdatedness_checker
+      site.items.each do |item|
+        refute outdatedness_checker.outdated?(item), "item should not be outdated"
+      end
+    end
+  end
+
 end

data/test/base/test_plugin.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::PluginTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_rule.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::RuleTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_rule_context.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::RuleContextTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_site.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::SiteTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -55,7 +53,7 @@ EOF
 
   def test_load_data_sources_first
     # Create site
-    Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+    Nanoc3::CLI.run %w( create_site bar)
 
     FileUtils.cd('bar') do
       # Create data source code
@@ -82,6 +80,35 @@ EOF
     end
   end
 
+  def test_setup_child_parent_links
+    Nanoc3::CLI.run %w( create_site bar)
+    FileUtils.cd('bar') do
+      Nanoc3::CLI.run %w( create_item /parent/ )
+      Nanoc3::CLI.run %w( create_item /parent/foo/ )
+      Nanoc3::CLI.run %w( create_item /parent/bar/ )
+      Nanoc3::CLI.run %w( create_item /parent/bar/qux/ )
+
+      site = Nanoc3::Site.new('.')
+
+      root   = site.items.find { |i| i.identifier == '/' }
+      style  = site.items.find { |i| i.identifier == '/stylesheet/' }
+      parent = site.items.find { |i| i.identifier == '/parent/' }
+      foo    = site.items.find { |i| i.identifier == '/parent/foo/' }
+      bar    = site.items.find { |i| i.identifier == '/parent/bar/' }
+      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 nil,    root.parent
+      assert_equal root,   parent.parent
+      assert_equal parent, foo.parent
+      assert_equal parent, bar.parent
+      assert_equal bar,    qux.parent
+    end
+  end
+
 end
 
 describe 'Nanoc3::Site#initialize' do

data/test/cli/commands/test_compile.rb

@@ -1,12 +1,33 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::Commands::CompileTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
 
-  def test_stub
+  def test_profiling_information
+    with_site do |site|
+      Nanoc3::CLI.run %w( create_item foo )
+      Nanoc3::CLI.run %w( create_item bar )
+      Nanoc3::CLI.run %w( create_item baz )
+
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do\n"
+        io.write "  filter :erb\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '*' do\n"
+        io.write "  if item.binary?\n"
+        io.write "    item.identifier.chop + '.' + item[:extension]\n"
+        io.write "  else\n"
+        io.write "    item.identifier + 'index.html'\n"
+        io.write "  end\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "layout '*', :erb\n"
+      end
+
+      Nanoc3::CLI.run %w( compile --verbose )
+    end
   end
 
 end

data/test/cli/commands/test_create_item.rb

@@ -1,12 +1,14 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::Commands::CreateItemTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
 
-  def test_stub
+  def test_run
+    with_site do |site|
+      Nanoc3::CLI.run %w( create_item /blah/ )
+      assert File.file?('content/blah.html')
+    end
   end
 
 end

data/test/cli/commands/test_create_layout.rb

@@ -1,17 +1,17 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::Commands::CreateLayoutTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
 
   def test_can_compile_new_layout
-    Nanoc3::CLI::Base.new.run([ 'create_site', 'foo' ])
+    require 'nanoc3/cli'
+
+    Nanoc3::CLI.run %w( create_site foo )
 
     FileUtils.cd('foo') do
       # Create new layout
-      Nanoc3::CLI::Base.new.run([ 'create_layout', 'moo' ])
+      Nanoc3::CLI.run %w( create_layout moo )
 
       # Makes rules use new layout
       rules_raw = File.read('Rules')

data/test/cli/commands/test_create_site.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::Commands::CreateSiteTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
 
   def test_create_site_with_existing_name
-    Nanoc3::CLI::Base.new.run([ 'create_site', 'foo' ])
-    assert_raises(SystemExit) { Nanoc3::CLI::Base.new.run([ 'create_site', 'foo' ]) }
+    Nanoc3::CLI.run %w( create_site foo )
+    assert_raises(SystemExit) do
+      Nanoc3::CLI.run %w( create_site foo )
+    end
   end
 
   def test_can_compile_new_site
-    Nanoc3::CLI::Base.new.run([ 'create_site', 'foo' ])
+    Nanoc3::CLI.run %w( create_site foo )
 
     FileUtils.cd('foo') do
       site = Nanoc3::Site.new('.')

data/test/cli/commands/test_help.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::Commands::HelpTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
 
-  def test_stub
+  def test_run
+    Nanoc3::CLI.run %w( help )
+    Nanoc3::CLI.run %w( help co )
   end
 
 end

data/test/cli/commands/test_info.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::Commands::InfoTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
 
-  def test_stub
+  def test_run
+    Nanoc3::CLI.run %w( info )
   end
 
 end

data/test/cli/commands/test_update.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::Commands::UpdateTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/cli/test_cli.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+class Nanoc3::CLITest < MiniTest::Unit::TestCase
+
+  include Nanoc3::TestHelpers
+
+  COMMAND_CODE = <<EOS
+# encoding: utf-8
+
+usage       '_test [options]'
+summary     'meh'
+description 'longer meh'
+
+run do |opts, args, cmd|
+  File.open('_test.out', 'w') { |io| io.write('It works!') }
+end
+EOS
+
+  def test_load_custom_commands
+    Nanoc3::CLI.run %w( create_site foo )
+
+    FileUtils.cd('foo') do
+      # Create command
+      FileUtils.mkdir_p('commands')
+      File.open('commands/_test.rb', 'w') { |io| io.write(COMMAND_CODE) }
+
+      # Run command
+      begin
+        Nanoc3::CLI.run %w( _test )
+      rescue SystemExit
+        assert false, 'Running _test should not cause system exit'
+      end
+
+      # Check
+      assert File.file?('_test.out')
+      assert_equal 'It works!', File.read('_test.out')
+    end
+  end
+
+end

data/test/cli/test_logger.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CLI::LoggerTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/data_sources/test_filesystem.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::DataSources::FilesystemTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/data_sources/test_filesystem_unified.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::DataSources::FilesystemUnifiedTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -191,78 +189,54 @@ class Nanoc3::DataSources::FilesystemUnifiedTest < MiniTest::Unit::TestCase
   end
 
   def test_identifier_for_filename_with_subfilename_allowing_periods_in_identifiers
-    # Create data source
-    data_source = new_data_source(:allow_periods_in_identifiers => true)
-
-    # Build directory
-    FileUtils.mkdir_p('foo')
-    File.open('foo/bar.yaml',         'w') { |io| io.write('test') }
-    File.open('foo/bar.html',         'w') { |io| io.write('test') }
-    File.open('foo/quxbar.yaml',      'w') { |io| io.write('test') }
-    File.open('foo/quxbar.html',      'w') { |io| io.write('test') }
-    File.open('foo/barqux.yaml',      'w') { |io| io.write('test') }
-    File.open('foo/barqux.html',      'w') { |io| io.write('test') }
-    File.open('foo/quxbarqux.yaml',   'w') { |io| io.write('test') }
-    File.open('foo/quxbarqux.html',   'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.yaml',     'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.html',     'w') { |io| io.write('test') }
-    File.open('foo/bar.qux.yaml',     'w') { |io| io.write('test') }
-    File.open('foo/bar.qux.html',     'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.qux.yaml', 'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.qux.html', 'w') { |io| io.write('test') }
-
-    # Check content filename
-    {
+    expectations = {
       'foo/bar.yaml'         => '/foo/bar/',
       'foo/quxbar.yaml'      => '/foo/quxbar/',
       'foo/barqux.yaml'      => '/foo/barqux/',
       'foo/quxbarqux.yaml'   => '/foo/quxbarqux/',
       'foo/qux.bar.yaml'     => '/foo/qux.bar/',
       'foo/bar.qux.yaml'     => '/foo/bar.qux/',
-      'foo/qux.bar.qux.yaml' => '/foo/qux.bar.qux/'
-    }.each_pair do |meta_filename, expected_identifier|
-      assert_equal(
-        expected_identifier,
-        data_source.instance_eval { identifier_for_filename(meta_filename) }
-      )
+      'foo/qux.bar.qux.yaml' => '/foo/qux.bar.qux/',
+      'foo/index.yaml'       => '/foo/',
+      'index.yaml'           => '/',
+      'foo/blah_index.yaml'  => '/foo/blah_index/'
+    }
+
+    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    expectations.each_pair do |meta_filename, expected_identifier|
+      content_filename = meta_filename.sub(/yaml$/, 'html')
+      [ meta_filename, content_filename ].each do |filename|
+        assert_equal(
+          expected_identifier,
+          data_source.instance_eval { identifier_for_filename(filename) }
+        )
+      end
     end
   end
 
   def test_identifier_for_filename_with_subfilename_disallowing_periods_in_identifiers
-    # Create data source
-    data_source = new_data_source
-
-    # Build directory
-    FileUtils.mkdir_p('foo')
-    File.open('foo/bar.yaml',         'w') { |io| io.write('test') }
-    File.open('foo/bar.html',         'w') { |io| io.write('test') }
-    File.open('foo/quxbar.yaml',      'w') { |io| io.write('test') }
-    File.open('foo/quxbar.html',      'w') { |io| io.write('test') }
-    File.open('foo/barqux.yaml',      'w') { |io| io.write('test') }
-    File.open('foo/barqux.html',      'w') { |io| io.write('test') }
-    File.open('foo/quxbarqux.yaml',   'w') { |io| io.write('test') }
-    File.open('foo/quxbarqux.html',   'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.yaml',     'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.html',     'w') { |io| io.write('test') }
-    File.open('foo/bar.qux.yaml',     'w') { |io| io.write('test') }
-    File.open('foo/bar.qux.html',     'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.qux.yaml', 'w') { |io| io.write('test') }
-    File.open('foo/qux.bar.qux.html', 'w') { |io| io.write('test') }
-
-    # Check content filename
-    {
+    expectations = {
       'foo/bar.yaml'         => '/foo/bar/',
       'foo/quxbar.yaml'      => '/foo/quxbar/',
       'foo/barqux.yaml'      => '/foo/barqux/',
       'foo/quxbarqux.yaml'   => '/foo/quxbarqux/',
       'foo/qux.bar.yaml'     => '/foo/qux/',
       'foo/bar.qux.yaml'     => '/foo/bar/',
-      'foo/qux.bar.qux.yaml' => '/foo/qux/'
-    }.each_pair do |meta_filename, expected_identifier|
-      assert_equal(
-        expected_identifier,
-        data_source.instance_eval { identifier_for_filename(meta_filename) }
-      )
+      'foo/qux.bar.qux.yaml' => '/foo/qux/',
+      'foo/index.yaml'       => '/foo/',
+      'index.yaml'           => '/',
+      'foo/blah_index.yaml'  => '/foo/blah_index/'
+    }
+
+    data_source = new_data_source
+    expectations.each_pair do |meta_filename, expected_identifier|
+      content_filename = meta_filename.sub(/yaml$/, 'html')
+      [ meta_filename, content_filename ].each do |filename|
+        assert_equal(
+          expected_identifier,
+          data_source.instance_eval { identifier_for_filename(filename) }
+        )
+      end
     end
   end