webgen 1.0.0.beta3 → 1.0.0

data/test/webgen/content_processor/test_ruby.rb

@@ -3,7 +3,7 @@
 require 'webgen/test_helper'
 require 'webgen/content_processor/ruby'
 
-class TestBuilder < MiniTest::Unit::TestCase
+class TestBuilder < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/content_processor/test_sass.rb

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/test_helper'
-require 'webgen/content_processor/sass'
 require 'webgen/path'
 
-class TestSass < MiniTest::Unit::TestCase
+class TestSass < Minitest::Test
 
   include Webgen::TestHelper
 
   def test_static_call
+    require 'webgen/content_processor/sass' rescue skip('Library sass not installed')
     setup_context
     @website.ext.sass_load_paths = []
     @website.config['content_processor.sass.options'] = {}
@@ -22,14 +22,16 @@ class TestSass < MiniTest::Unit::TestCase
     assert_error_on_line(Webgen::RenderError, 2) { cp.call(@context) }
 
     # test @import-ing of sass files
-    content = "#main\n  background-image: url(relocatable('../dir2/file.test') + \"#iefix\")"
-    result = "#main {\n  background-image: url(\"../../dir2/file.test#iefix\"); }\n"
+    content = "@import 'dir/other'\n#main\n  background-image: url(relocatable('../dir2/file.test') + \"#iefix\")"
+    result = "#id {\n  color: white; }\n\n#main {\n  background-image: url(\"../../dir2/file.test#iefix\"); }\n"
     root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     dir = Webgen::Node.new(root, 'dir/', '/dir/')
     partial = Webgen::Node.new(dir, '_partial.sass', '/dir/_partial.sass')
     partial.node_info[:path] = Webgen::Path.new('test') { StringIO.new(content) }
     dirdir = Webgen::Node.new(dir, 'dir/', '/dir/dir/')
     sass = Webgen::Node.new(dirdir, 'file.sass', '/dir/dir/file.sass')
+    partial2 = Webgen::Node.new(dirdir, '_other.scss', '/dir/dir/_other.scss')
+    partial2.node_info[:path] = Webgen::Path.new('test') { StringIO.new('#id { color:white; }') }
     dir2 = Webgen::Node.new(root, 'dir2/', '/dir2/')
     file = Webgen::Node.new(dir2, 'file.test', '/dir2/file.test')
 
@@ -37,12 +39,12 @@ class TestSass < MiniTest::Unit::TestCase
     @context.content = "@import 'unknown'"
     assert_error_on_line(Webgen::RenderError, 1) { cp.call(@context) }
 
-    @context.content = "@import 'dir/partial' \n@import 'dir/_partial' \n@import 'dir/partial.sass'"
+    @context.content = "@import '../partial' \n@import '../_partial' \n@import '../partial.sass'"
     assert_equal("#{result}\n#{result}\n#{result}", cp.call(@context).content)
   end
 
   def teardown
-    FileUtils.rm_rf(@website.directory)
+    FileUtils.rm_rf(@website.directory) if @website
   end
 
 end

data/test/webgen/content_processor/test_scss.rb

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/test_helper'
-require 'webgen/content_processor/scss'
 
-class TestScss < MiniTest::Unit::TestCase
+class TestScss < Minitest::Test
 
   include Webgen::TestHelper
 
   def test_static_call
+    require 'webgen/content_processor/scss' rescue skip('Library sass not installed')
     setup_context
     @website.config['content_processor.sass.options'] = {}
     @website.ext.sass_load_paths = []
@@ -21,7 +21,7 @@ class TestScss < MiniTest::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf(@website.directory)
+    FileUtils.rm_rf(@website.directory) if @website
   end
 
 end

data/test/webgen/content_processor/test_tags.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/content_processor/tags'
 require 'webgen/utils/tag_parser'
 
-class TestContentProcessorTags < MiniTest::Unit::TestCase
+class TestContentProcessorTags < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/content_processor/test_tidy.rb

@@ -3,15 +3,23 @@
 require 'webgen/test_helper'
 require 'webgen/content_processor/tidy'
 
-class TestTidy < MiniTest::Unit::TestCase
+class TestTidy < Minitest::Test
 
   include Webgen::TestHelper
 
   def test_static_call
+    require 'webgen/content_processor/tidy' rescue skip($!.message)
+
     setup_context
     @website.config['content_processor.tidy.options'] = ''
     cp = Webgen::ContentProcessor::Tidy
 
+    begin
+      cp.call(@context)
+    rescue Webgen::CommandNotFoundError
+      skip("Binary tidy not found")
+    end
+
     begin
       tmp, ENV['PATH'] = ENV['PATH'], '/sbin'
       assert_raises(Webgen::CommandNotFoundError) { cp.call(@context) }

data/test/webgen/content_processor/test_tikz.rb

@@ -1,13 +1,15 @@
 # -*- encoding: utf-8 -*-
 
+require 'timeout'
 require 'webgen/test_helper'
-require 'webgen/content_processor/tikz'
 
-class TestContentProcessorTikz < MiniTest::Unit::TestCase
+class TestContentProcessorTikz < Minitest::Test
 
   include Webgen::TestHelper
 
   def test_static_call
+    require 'webgen/content_processor/tikz' rescue skip($!.message)
+
     setup_context
     @website.ext.content_processor = Webgen::ContentProcessor.new
     @website.ext.content_processor.register('Blocks')
@@ -18,6 +20,7 @@ class TestContentProcessorTikz < MiniTest::Unit::TestCase
     @context.node.define_singleton_method(:[]) {|ignored| nil}
 
     call('\tikz \draw (0,0) -- (0,1);', 'test.png', [], '', '72 72', false)
+    Timeout.timeout(0.2) { call('\tikz \draw (0,0) -- (0,1);', 'test.png', [], '', '72 72', false) } # test cache
     refute_nil(@context.content)
 
     assert_raises(Webgen::RenderError) { call('\tikz \asdfasdfasf', 'test.png', [], '', '72 72', false) }
@@ -38,7 +41,7 @@ class TestContentProcessorTikz < MiniTest::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf(@website.directory)
+    FileUtils.rm_rf(@website.directory) if @website
   end
 
 end

data/test/webgen/content_processor/test_xmllint.rb

@@ -1,17 +1,24 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/test_helper'
-require 'webgen/content_processor/xmllint'
 
-class TestXmllint < MiniTest::Unit::TestCase
+class TestXmllint < Minitest::Test
 
   include Webgen::TestHelper
 
   def test_static_call
+    require 'webgen/content_processor/xmllint' rescue skip($!.message)
+
     setup_context
     @website.config['content_processor.xmllint.options'] = ''
     cp = Webgen::ContentProcessor::Xmllint
 
+    begin
+      cp.call(@context)
+    rescue Webgen::CommandNotFoundError
+      skip("Binary xmllint not found")
+    end
+
     begin
       tmp, ENV['PATH'] = ENV['PATH'], '/sbin'
       assert_raises(Webgen::CommandNotFoundError) { cp.call(@context) }

data/test/webgen/destination/test_file_system.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/destination/file_system'
 require 'webgen/path'
 
-class TestDestinationFileSystem < MiniTest::Unit::TestCase
+class TestDestinationFileSystem < Minitest::Test
 
   def setup
     @dir = dir = Dir.mktmpdir('test-webgen')
@@ -20,7 +20,7 @@ class TestDestinationFileSystem < MiniTest::Unit::TestCase
     dest = Webgen::Destination::FileSystem.new(@website, 'test')
     assert_equal(File.join(@dir, 'test'), dest.root)
     dest = Webgen::Destination::FileSystem.new(@website, '/tmp/hallo')
-    assert_equal('/tmp/hallo', dest.root)
+    assert_equal(File.absolute_path('/tmp/hallo', @website.directory), dest.root)
     dest = Webgen::Destination::FileSystem.new(@website, '../hallo')
     assert_equal(File.expand_path(File.join(@dir, '../hallo')), dest.root)
   end
@@ -40,8 +40,8 @@ class TestDestinationFileSystem < MiniTest::Unit::TestCase
 
     dest.write('/dir/hallo', Webgen::Path.new('fu') { StringIO.new("contentö")})
     assert(dest.exists?('/dir/hallo'))
-    assert_equal('contentö', dest.read('/dir/hallo', 'r'))
-    assert_equal('contentö', File.read(File.join(dest.root, 'dir/hallo')))
+    assert_equal('contentö', dest.read('/dir/hallo', 'r:UTF-8'))
+    assert_equal('contentö', File.read(File.join(dest.root, 'dir/hallo'), :mode => 'r:UTF-8'))
 
     dest.delete('/dir')
     refute(dest.exists?('/dir'))

data/test/webgen/item_tracker/test_file.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'time'
 require 'webgen/item_tracker/file'
 
-class TestItemTrackerFile < MiniTest::Unit::TestCase
+class TestItemTrackerFile < Minitest::Test
 
   def setup
     @website = MiniTest::Mock.new

data/test/webgen/item_tracker/test_missing_node.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'webgen/item_tracker/missing_node'
 require 'webgen/blackboard'
 
-class TestItemTrackerMissingNode < MiniTest::Unit::TestCase
+class TestItemTrackerMissingNode < Minitest::Test
 
   class StubTree
 

data/test/webgen/item_tracker/test_node_content.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/item_tracker/node_content'
 
-class TestNodeContent < MiniTest::Unit::TestCase
+class TestNodeContent < Minitest::Test
 
   def setup
     @website = Object.new

data/test/webgen/item_tracker/test_node_meta_info.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/item_tracker/node_meta_info'
 
-class TestNodeMetaInfo < MiniTest::Unit::TestCase
+class TestNodeMetaInfo < Minitest::Test
 
   def setup
     @website = Object.new

data/test/webgen/item_tracker/test_nodes.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/item_tracker/nodes'
 require 'webgen/node_finder'
 
-class TestItemTrackerNodes < MiniTest::Unit::TestCase
+class TestItemTrackerNodes < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -31,8 +31,7 @@ class TestItemTrackerNodes < MiniTest::Unit::TestCase
     assert_equal(["/file.en.html", "/file.de.html"],
                  @obj.item_data(*@args1))
 
-    assert_equal(["/file.en.html",
-                  ["/file.de.html", ["/file.de.html#frag"]]],
+    assert_equal(["/file.en.html", "/file.de.html"],
                  @obj.item_data(*@args2))
   end
 
@@ -43,7 +42,6 @@ class TestItemTrackerNodes < MiniTest::Unit::TestCase
       @website.ext.item_tracker.expect(:item_changed?, false, [:node_meta_info, @website.tree['/file.en.html']])
       @website.ext.item_tracker.expect(:item_changed?, false, [:node_meta_info, @website.tree['/file.de.html']])
     end
-    @website.ext.item_tracker.expect(:item_changed?, false, [:node_meta_info, @website.tree['/file.de.html#frag']])
 
     [@args1, @args2].each do |args|
       old_data = @obj.item_data(*args)

data/test/webgen/item_tracker/test_template_chain.rb

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+require 'minitest/autorun'
+require 'time'
+require 'webgen/item_tracker/template_chain'
+
+class TestItemTrackerTemplateChain < Minitest::Test
+
+  def setup
+    @website = Object.new
+    @node = node = Object.new
+    @node.define_singleton_method(:alcn) { 'alcn' }
+    @node.define_singleton_method(:template_chain) { [node] }
+    @website.define_singleton_method(:tree) { {'alcn' => node} }
+    @obj = Webgen::ItemTracker::TemplateChain.new(@website)
+  end
+
+  def test_item_id
+    assert_equal('alcn', @obj.item_id(@node))
+  end
+
+  def test_item_data
+    assert_equal(['alcn'], @obj.item_data('alcn'))
+  end
+
+  def test_item_changed?
+    assert(@obj.item_changed?('unknown', 'old'))
+    assert(@obj.item_changed?('alcn', ['old']))
+    refute(@obj.item_changed?('alcn', ['alcn']))
+  end
+
+  def test_referenced_nodes
+    assert_equal(['alcn'], @obj.referenced_nodes('alcn', 'data'))
+  end
+
+end

data/test/webgen/misc/test_dummy_index.rb

@@ -0,0 +1,83 @@
+# -*- encoding: utf-8 -*-
+
+require 'fileutils'
+require 'tmpdir'
+require 'webgen/test_helper'
+require 'webgen/misc/dummy_index'
+
+class TestMiscDummyIndex < Minitest::Test
+
+  class DummyDestination
+
+    attr_accessor :paths
+
+    def initialize(paths = {})
+      @paths = paths
+    end
+
+    def exists?(path)
+      @paths.has_key?(path)
+    end
+
+    def write(path, content)
+      @paths[path] = content
+    end
+
+  end
+
+  include Webgen::TestHelper
+
+  def setup
+    setup_website('misc.dummy_index.enabled' => true, 'misc.dummy_index.directory_indexes' => ['index.html'])
+    setup_default_nodes(@website.tree)
+    @website.ext.destination = DummyDestination.new('/' => nil, '/dir/' => nil, '/dir/dir/' => nil, '/dir2/' => nil)
+
+    @website.tree['/dir/'].meta_info['proxy_path'] = '../other.html'
+    @website.tree['/dir/dir/'].meta_info['proxy_path'] = 'my_other.html'
+    @website.tree['/dir2/'].meta_info['proxy_path'] = 'index.html'
+    @dummy_index = Webgen::Misc::DummyIndex.new(@website)
+  end
+
+  def test_initialize
+    @website.blackboard.dispatch_msg(:website_generated)
+    refute(@website.ext.destination.paths['/dir/index.html'])
+
+    @website.config['misc.dummy_index.enabled'] = false
+    @website.blackboard.dispatch_msg(:website_initialized)
+    @website.blackboard.dispatch_msg(:website_generated)
+    refute(@website.ext.destination.paths['/dir/index.html'])
+
+    @website.config['misc.dummy_index.enabled'] = true
+    @website.config['misc.dummy_index.directory_indexes'] = []
+    @website.blackboard.dispatch_msg(:website_initialized)
+    @website.blackboard.dispatch_msg(:website_generated)
+    refute(@website.ext.destination.paths['/dir/index.html'])
+
+    @website.config['misc.dummy_index.directory_indexes'] = ['index.html']
+    @website.blackboard.dispatch_msg(:website_initialized)
+    @website.blackboard.dispatch_msg(:website_generated)
+    assert(@website.ext.destination.paths['/dir/index.html'])
+  end
+
+  def test_create_dummy_indexes
+    paths = @website.ext.destination.paths
+
+    # without cache
+    @dummy_index.send(:create_dummy_indexes)
+    assert_match(/url=\.\.\/other.html"/, paths['/dir/index.html'])
+    assert_match(/url=my_other.html"/, paths['/dir/dir/index.html'])
+    refute(paths['/dir2/index.html'])
+
+    # with cache and destination paths exist
+    @logio.string = ''
+    @dummy_index.send(:create_dummy_indexes)
+    assert_log_match(/\A\z/)
+
+    # with cache, one destination path does not exist
+    paths.delete('/dir/index.html')
+    @dummy_index.send(:create_dummy_indexes)
+    assert(paths['/dir/index.html'])
+    assert_log_match(/\A.*\Z/)
+  end
+
+end

data/test/webgen/path_handler/test_api.rb

@@ -3,7 +3,7 @@
 require 'webgen/test_helper'
 require 'webgen/path_handler/api'
 
-class TestPathHandlerApi < MiniTest::Unit::TestCase
+class TestPathHandlerApi < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -14,11 +14,12 @@ class TestPathHandlerApi < MiniTest::Unit::TestCase
 
     root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
 
+    @page_file = File.dirname(__FILE__) + "/../../../API.rdoc"
     @path = Webgen::Path.new('/test.api', 'dest_path' => '<parent><basename><ext>',
                              'api_name' => 'my_api',
                              'dir_name' => 'my_dir',
-                             'prefix_for_link_defs' => true,
-                             'rdoc_options' => ['-t', 'Title', __FILE__])
+                             'prefix_link_defs' => true,
+                             'rdoc_options' => ['-t', 'Title', __FILE__, @page_file])
   end
 
   def teardown
@@ -39,6 +40,7 @@ class TestPathHandlerApi < MiniTest::Unit::TestCase
     assert(@website.tree['/my_dir/TestPathHandlerApi.en.html#method-i-setup'])
     assert_equal(['/my_dir/TestPathHandlerApi.en.html#method-i-setup', 'TestPathHandlerApi#setup'],
                  @website.ext.link_definitions['my_api:TestPathHandlerApi#setup'])
+    assert(@website.tree['/my_dir/API_rdoc.en.html'])
 
     cache_dir = @website.tmpdir(File.join('path_handler.api', 'my_api'))
     assert(File.directory?(cache_dir))
@@ -47,7 +49,7 @@ class TestPathHandlerApi < MiniTest::Unit::TestCase
   def test_rdoc_options
     data_methods = [:verbosity, :dry_run, :update_output_dir,
                     :force_output, :files]
-    result = [0, false, true, false, [__FILE__]]
+    result = [0, false, true, false, [__FILE__, @page_file]]
 
     options = @api.send(:rdoc_options, @path['rdoc_options'])
     assert_equal(result, data_methods.map {|m| options.send(m)})
@@ -66,46 +68,4 @@ class TestPathHandlerApi < MiniTest::Unit::TestCase
     assert_equal(result, data)
   end
 
-=begin
-  def create_nodes
-    @path['version'] = 'atom'
-    atom_node = @feed.create_nodes(@path.dup, @path_blocks)
-    @path['version'] = 'rss'
-    rss_node = @feed.create_nodes(@path.dup, @path_blocks)
-    [atom_node, rss_node]
-  end
-
-  def test_create_node
-    atom_node, rss_node = create_nodes
-
-    refute_nil(atom_node)
-    refute_nil(rss_node)
-    refute_nil(atom_node.node_info[:blocks])
-    assert_equal('atom', atom_node['version'])
-    assert_equal('rss', rss_node['version'])
-
-    assert_raises(Webgen::NodeCreationError) do
-      path = Webgen::Path.new('/test_feed_2') { StringIO.new("---\nunknow: yes") }
-      @feed.create_nodes(path, 'unused')
-    end
-  end
-
-  def test_content
-    @website.ext.content_processor = Webgen::ContentProcessor.new
-    @website.ext.content_processor.register('Erb')
-    @website.ext.content_processor.register('Blocks')
-
-    atom_node, rss_node = create_nodes
-    assert_equal("hallo\n", @feed.content(rss_node))
-    assert(@feed.content(atom_node) =~ /Thomas Leitner/)
-    assert(@feed.content(atom_node) =~ /RealContent/)
-  end
-
-  def test_feed_entries
-    atom_node, rss_node = create_nodes
-    assert_equal([@index_en, @file_en], atom_node.feed_entries)
-    assert_equal([@index_en, @file_en], rss_node.feed_entries)
-  end
-=end
-
 end