nanoc3 3.2.0a4 → 3.2.0b1

data/test/data_sources/test_filesystem_verbose.rb

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

data/test/extra/core_ext/test_enumerable.rb

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

data/test/extra/core_ext/test_time.rb

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

data/test/extra/deployers/test_rsync.rb

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

data/test/extra/test_auto_compiler.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -9,7 +7,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
   def test_handle_request_with_item_rep_with_index_filename
     if_have 'mime/types', 'rack' do
       # Create site
-      Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+      Nanoc3::CLI.run %w( create_site bar)
 
       FileUtils.cd('bar') do
         # Create item
@@ -49,7 +47,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
   def test_handle_request_with_broken_url
     if_have 'mime/types', 'rack' do
       # Create site
-      Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+      Nanoc3::CLI.run %w( create_site bar)
 
       FileUtils.cd('bar') do
         # Create site
@@ -293,7 +291,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
   def test_serve_with_working_item
     if_have 'mime/types', 'rack' do
       # Create site
-      Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+      Nanoc3::CLI.run %w( create_site bar)
 
       FileUtils.cd('bar') do
         # Create item
@@ -331,7 +329,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
   def test_serve_with_broken_item
     if_have 'mime/types', 'rack' do
       # Create site
-      Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+      Nanoc3::CLI.run %w( create_site bar)
 
       FileUtils.cd('bar') do
         # Create item
@@ -359,7 +357,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
   def test_reload_config_file_before_each_request
     if_have 'rack' do
       # Create site
-      Nanoc3::CLI::Base.new.run([ 'create_site', 'foo' ])
+      Nanoc3::CLI.run %w( create_site foo )
 
       FileUtils.cd('foo') do
         # Create item that outputs config elements

data/test/extra/test_file_proxy.rb

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

data/test/extra/test_vcs.rb

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

data/test/extra/validators/test_links.rb

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

data/test/extra/validators/test_w3c.rb

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

data/test/filters/test_asciidoc.rb

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

data/test/filters/test_bluecloth.rb

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

data/test/filters/test_coderay.rb

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

data/test/filters/test_colorize_syntax.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -146,4 +144,53 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_colorize_syntax_with_default_colorizer
+    if `which pygmentize`.strip.empty?
+      skip 'no pygmentize found, which is required for this test'
+      return
+    end
+
+    if_have 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc3::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
+      expected_output = '<pre><code class="language-ruby"><span class="nb">puts</span> <span class="s2">"foo"</span></code></pre>'
+
+      # Run filter
+      actual_output = filter.run(input, :default_colorizer => :pygmentize)
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
+  def test_colorize_syntax_with_missing_executables
+    if_have 'nokogiri' do
+      begin
+        original_path = ENV['PATH']
+        ENV['PATH'] = './blooblooblah'
+
+        # Create filter
+        filter = ::Nanoc3::Filters::ColorizeSyntax.new
+
+        # Get input and expected output
+        input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
+
+        # Run filter
+        [ :pygmentize, :simon_highlight ].each do |colorizer|
+          begin
+            input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
+            actual_output = filter.run(
+              input,
+              :colorizers => { :ruby => colorizer })
+            flunk "expected colorizer to raise if no executable is available"
+          rescue => e
+          end
+        end
+      ensure
+        ENV['PATH'] = original_path
+      end
+    end
+  end
+
 end

data/test/filters/test_erb.rb

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

data/test/filters/test_erubis.rb

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

data/test/filters/test_haml.rb

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

data/test/filters/test_kramdown.rb

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

data/test/filters/test_less.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::Filters::LessTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -12,7 +10,7 @@ class Nanoc3::Filters::LessTest < MiniTest::Unit::TestCase
       @item = Nanoc3::Item.new("blah", { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
 
       # Create filter
-      filter = ::Nanoc3::Filters::Less.new(:item => @item)
+      filter = ::Nanoc3::Filters::Less.new(:item => @item, :items => [ @item ])
 
       # Run filter
       result = filter.run('.foo { bar: 1 + 1 }')
@@ -30,7 +28,7 @@ class Nanoc3::Filters::LessTest < MiniTest::Unit::TestCase
       @item = Nanoc3::Item.new("blah", { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
 
       # Create filter
-      filter = ::Nanoc3::Filters::Less.new(:item => @item)
+      filter = ::Nanoc3::Filters::Less.new(:item => @item, :items => [ @item ])
 
       # Run filter
       result = filter.run('@import "content/foo/bar/imported_file.less";')
@@ -45,10 +43,11 @@ class Nanoc3::Filters::LessTest < MiniTest::Unit::TestCase
       File.open('content/foo/bar/imported_file.less', 'w') { |io| io.write('p { color: red; }') }
 
       # Create item
+      File.open('content/foo/bar.txt', 'w') { |io| io.write('meh') }
       @item = Nanoc3::Item.new("blah", { :content_filename => 'content/foo/bar.txt' }, '/foo/bar/')
 
       # Create filter
-      filter = ::Nanoc3::Filters::Less.new(:item => @item)
+      filter = ::Nanoc3::Filters::Less.new(:item => @item, :items => [ @item ])
 
       # Run filter
       result = filter.run('@import "bar/imported_file.less";')
@@ -56,4 +55,59 @@ class Nanoc3::Filters::LessTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_recompile_includes
+    if_have 'less' do
+      with_site do |site|
+        # Create two less files
+        Dir['content/*'].each { |i| FileUtils.rm(i) }
+        File.open('content/a.less', 'w') do |io|
+          io.write('@import "b.less";')
+        end
+        File.open('content/b.less', 'w') do |io|
+          io.write("p { color: red; }")
+        end
+
+        # Update rules
+        File.open('Rules', 'w') do |io|
+          io.write "compile '*' do\n"
+          io.write "  filter :less\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/a/' do\n"
+          io.write "  item.identifier.chop + '.css'\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/b/' do\n"
+          io.write "  nil\n"
+          io.write "end\n"
+        end
+
+        # Compile
+        site = Nanoc3::Site.new('.')
+        site.compile
+
+        # Check
+        assert Dir['output/*'].size == 1
+        assert File.file?('output/a.css')
+        refute File.file?('output/b.css')
+        assert_match /^p\s*\{\s*color:\s*red;?\s*\}/, File.read('output/a.css')
+
+        # Update included file
+        File.open('content/b.less', 'w') do |io|
+          io.write("p { color: blue; }")
+        end
+
+        # Recompile
+        site = Nanoc3::Site.new('.')
+        site.compile
+
+        # Recheck
+        assert Dir['output/*'].size == 1
+        assert File.file?('output/a.css')
+        refute File.file?('output/b.css')
+        assert_match /^p\s*\{\s*color:\s*blue;?\s*\}/, File.read('output/a.css')
+      end
+    end
+  end
+
 end

data/test/filters/test_markaby.rb

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

data/test/filters/test_maruku.rb

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

data/test/filters/test_mustache.rb

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

data/test/filters/test_rainpress.rb

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

data/test/filters/test_rdiscount.rb

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

data/test/filters/test_rdoc.rb

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

data/test/filters/test_redcarpet.rb

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

data/test/filters/test_redcloth.rb

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

data/test/filters/test_relativize_paths.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -12,8 +10,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -31,8 +34,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -50,8 +58,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -69,8 +82,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -88,8 +106,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -107,8 +130,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/woof/meow/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/woof/meow/'
     end
 
     # Set content
@@ -136,8 +164,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -155,8 +188,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -174,8 +212,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -193,8 +236,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/foo/bar/baz/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
     end
 
     # Set content
@@ -215,8 +263,13 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Mock item
     filter.instance_eval do
-      @item_rep = MiniTest::Mock.new
-      @item_rep.expect(:path, '/woof/meow/')
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/woof/meow/'
     end
 
     # Set content