webgen 0.5.6 → 0.5.7

data/misc/default.css

@@ -20,7 +20,7 @@
 body {
   margin: 0;
   padding: 0;
-  font: normal .80em/1.5em Tahoma, 'Trebuchet MS', sans-serif;
+  font: normal .80em/1.5em 'Helvetica Neue', Tahoma, 'Trebuchet MS', sans-serif;
   color: #000;
   text-align: center;
   background-color: #FCFFF5;
@@ -40,7 +40,7 @@ a:hover {
 
 /* headers */
 h1, h2, h3, h4, h5, h6 {
-  font: bold 1.3em 'Trebuchet MS', Arial, Sans-serif;
+  font: bold 1.3em 'Helvetica Neue', 'Trebuchet MS', Arial, Sans-serif;
   color: #CE900A;
 }
 h1 { font-size: 1.6em; }
@@ -53,7 +53,7 @@ h3 { font-size: 1.3em; }
 }
 
 #sidebar h1 {
-  font: bold 1.4em 'Trebuchet MS', Arial, Sans-serif;
+  font: bold 1.4em 'Helvetica Neue', 'Trebuchet MS', Arial, Sans-serif;
   background: url(images/arrow.gif) no-repeat 0px .6em;
   padding: 7px 0 7px 25px;
   color: #193441;
@@ -98,28 +98,52 @@ acronym {
   border-bottom: 1px solid #777;
 }
 
-blockquote.exclamation, blockquote.error, blockquote.information {
+blockquote.warning, blockquote.error, blockquote.information, blockquote.important {
   margin: 10px 0px;
-  padding: 0 0 0 40px;
+  padding: 5px 0 0 50px;
   min-height: 40px;
   border: 1px solid #91AA9D;
-  font: 'Trebuchet MS', Sans-serif;
+  font: 'Helvetica Neue', 'Trebuchet MS', Sans-serif;
   background-color: #D1DBBD;
   background-image: url(images/quote.gif);
   background-repeat: no-repeat;
-  background-position: 5px 5px;
+  background-position: 9px 5px;
 }
 
-blockquote.exclamation {
-  background-image: url(images/exclamation.gif);
+blockquote.warning {
+  background-image: url(images/warning.png);
+}
+
+blockquote.warning:before {
+  content: 'Caution';
+  font: bold 1.3em 'Helvetica Neue', 'Trebuchet MS', Arial, Sans-serif;
 }
 
 blockquote.error {
-  background-image: url(images/error.gif);
+  background-image: url(images/error.png);
+}
+
+blockquote.error:before {
+  content: 'Warning';
+  font: bold 1.3em 'Helvetica Neue', 'Trebuchet MS', Arial, Sans-serif;
 }
 
 blockquote.information {
-  background-image: url(images/information.gif);
+  background-image: url(images/information.png);
+}
+
+blockquote.information:before {
+  content: 'Information';
+  font: bold 1.3em 'Helvetica Neue', 'Trebuchet MS', Arial, Sans-serif;
+}
+
+blockquote.important {
+  background-image: url(images/important.png);
+}
+
+blockquote.important:before {
+  content: 'Important';
+  font: bold 1.3em 'Helvetica Neue', 'Trebuchet MS', Arial, Sans-serif;
 }
 
 blockquote pre {
@@ -171,7 +195,7 @@ blockquote pre {
 #header-content ul {
   position: absolute;
   right: 20px; top: 75px;
-  font: bolder 1.3em 'Trebuchet MS', sans-serif;
+  font: bolder 1.3em 'Helvetica Neue', 'Trebuchet MS', sans-serif;
   color: #FCFFF5;
   list-style: none;
   margin: 0; padding: 0;

data/misc/default.template

@@ -60,7 +60,7 @@
         <p>
           &copy; 2008 Thomas Leitner | generated by <a href="http://webgen.rubyforge.org">webgen</a><br />
           Design based on Ablaze 2.1 by <a href="http://www.styleshout.com/">styleshout</a><br />
-          Block quote icons originally by <a href="http://fullahead.org/">Fullahead</a><br />
+          Block quote icons from the <a href="http://tango.freedesktop.org//">Tango Icon Theme</a><br />
           Valid <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> |
           <a href="http://validator.w3.org/check/referer">XHTML</a>
         </p>

data/test/helper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'webgen/blackboard'
 require 'webgen/website'
 
@@ -33,6 +35,8 @@ module Test
         :file21_en => Webgen::Node.new(dir2, '/dir2/file21.en.html', 'file21.html', {'lang' => 'en', 'in_menu' => false, 'kind' => 'other'}),
         :file1_de => Webgen::Node.new(root, '/file1.de.html', 'file1.html', {'lang' => 'de', 'in_menu' => true, 'kind' => 'page'}),
         :index_en => Webgen::Node.new(root, '/index.en.html', 'index.html', {'lang' => 'en', 'kind' => 'page'}),
+        :dir3 => dir3 = Webgen::Node.new(root, '/dir3/', 'dir3/', {'kind' => 'directory', 'index_path' => 'index.html'}),
+        :index3_en => Webgen::Node.new(dir3, '/dir3/index.en.html', 'index.html', {'lang' => 'en', 'kind' => 'page'})
       }
     end
 

data/test/test_blackboard.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/blackboard'
 

data/test/test_cache.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+require 'rubygems'
 require 'test/unit'
 require 'webgen/cache'
 

data/test/test_cli.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/cli'
 
@@ -11,4 +13,9 @@ class TestCLICommandParser < Test::Unit::TestCase
     assert_equal(Dir.pwd, cli.directory)
   end
 
+  def test_website_from_env
+    ENV['WEBGEN_WEBSITE'] = '/webgen/test/site'
+    cli = Webgen::CLI::CommandParser.new
+    assert_equal('/webgen/test/site', cli.directory)
+  end
 end

data/test/test_common.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+
+require 'test/unit'
+require 'webgen/common'
+
+class TestCommon < Test::Unit::TestCase
+
+  def test_absolute_path
+    assert_raise(ArgumentError) { Webgen::Common.absolute_path('test', 'test') }
+    assert_equal('/', Webgen::Common.absolute_path('/', '/'))
+    assert_equal('/dir', Webgen::Common.absolute_path('/dir', '/other'))
+    assert_equal('/other/dir', Webgen::Common.absolute_path('dir', '/other'))
+    assert_equal('/test/dir', Webgen::Common.absolute_path('../test/dir', '/other'))
+    assert_equal('/', Webgen::Common.absolute_path('/..', '/'))
+    assert_equal('/dir', Webgen::Common.absolute_path('/../dir/.', '/'))
+  end
+
+end

data/test/test_common_sitemap.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/tree'
@@ -25,24 +27,24 @@ class TestCommonSitemap < Test::Unit::TestCase
 
   def test_create_sitemap_and_node_chagned
     do_assert(@nodes[:file11_en], 'en', false, false, ['page'],
-              [:dir1, :file11_en, :index_en])
+              [:dir1, :file11_en, :index_en, :dir3])
     do_assert(@nodes[:file11_en], 'en', true, false, ['page'],
               [:dir1, :file11_en])
     do_assert(@nodes[:file11_en], 'en', false, false, ['page', 'other'],
-              [:dir1, :file11_en, :dir2, :file21_en, :index_en])
+              [:dir1, :file11_en, :dir2, :file21_en, :index_en, :dir3])
     do_assert(@nodes[:file11_en], 'en', false, false, [],
-              [:dir1, :file11_en, :file11_en_f1, :dir2, :file21_en, :index_en])
+              [:dir1, :file11_en, :file11_en_f1, :dir2, :file21_en, :index_en, :dir3])
     do_assert(@nodes[:file11_en], 'en', false, false, ['noone'],
               [])
     do_assert(@nodes[:file11_en], 'en', false, false, ['page', 'directory'],
-              [:dir1, :file11_en, :dir2, :index_en])
+              [:dir1, :file11_en, :dir2, :index_en, :dir3])
     do_assert(@nodes[:file11_en], 'en', true, false, ['page', 'directory'],
               [:dir1, :file11_en])
 
     do_assert(@nodes[:file1_de], 'de', false, false, ['page'],
               [:file1_de])
     do_assert(@nodes[:file1_de], 'de', false, true, ['page'],
-              [:dir1, :file11_en, :file1_de, :index_en])
+              [:dir1, :file11_en, :file1_de, :index_en, :dir3, :index3_en])
 
     @nodes[:file11_en].unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, @nodes[:file11_en])

data/test/test_configuration.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/configuration'
 require 'webgen/sourcehandler'

data/test/test_contentprocessor.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_blocks.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/tree'
 require 'webgen/page'
@@ -9,7 +11,7 @@ class TestContentProcessorBlocks < Test::Unit::TestCase
     obj = Webgen::ContentProcessor::Blocks.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'test', 'test')
-    node.node_info[:page] = Webgen::Page.from_data("--- name:content\ndata")
+    node.node_info[:page] = Webgen::Page.from_data("--- name:content\ndata\n--- name:other\nother")
     template = Webgen::Node.new(root, 'template', 'template')
     template.node_info[:page] = Webgen::Page.from_data("--- name:content pipeline:blocks\nbefore<webgen:block name='content' />after")
     processors = { 'blocks' => obj }
@@ -29,6 +31,25 @@ class TestContentProcessorBlocks < Test::Unit::TestCase
     obj.call(context)
     assert_equal('<webgen:block name="content" chain="invalid" />beforedataafter', context.content)
     assert_equal(Set.new([template.absolute_lcn, node.absolute_lcn]), node.node_info[:used_nodes])
+
+    context.content = 'bef<webgen:block name="other" chain="template;test" notfound="ignore" />aft'
+    obj.call(context)
+    assert_equal('befaft', context.content)
+
+    context.content = '<webgen:block name="other" chain="template" node="first" />'
+    assert_raise(RuntimeError) { obj.call(context) }
+
+    context.content = '<webgen:block name="other" chain="template;test" node="first" />'
+    obj.call(context)
+    assert_equal('other', context.content)
+
+    context.content = '<webgen:block name="other" chain="test" node="first" />'
+    obj.call(context)
+    assert_equal('other', context.content)
+
+    context.content = '<webgen:block name="invalid" node="first" notfound="ignore" /><webgen:block name="content" />'
+    obj.call(context)
+    assert_equal('beforedataafter', context.content)
   end
 
 end

data/test/test_contentprocessor_builder.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/tree'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_context.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_erb.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/tree'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_erubis.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'ostruct'
 require 'helper'
 require 'test/unit'

data/test/test_contentprocessor_fragments.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'test/helper'
 require 'webgen/page'

data/test/test_contentprocessor_haml.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/tree'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_maruku.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/node'
 require 'webgen/tree'

data/test/test_contentprocessor_rdiscount.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/node'
 require 'webgen/tree'

data/test/test_contentprocessor_rdoc.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/tree'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_redcloth.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/websiteaccess'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_sass.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/tree'
 require 'webgen/contentprocessor'

data/test/test_contentprocessor_tags.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/tree'

data/test/test_languages.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/languages'
 

data/test/test_loggable.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/loggable'

data/test/test_logger.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/logger'

data/test/test_node.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/node'

data/test/test_output_filesystem.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/output'

data/test/test_page.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/page'
 

data/test/test_path.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'webgen/path'
 require 'stringio'

data/test/test_source_filesystem.rb

@@ -1,6 +1,11 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/source'
+require 'tmpdir'
+require 'fileutils'
+require 'rbconfig'
 
 class TestSourceFileSystemPath < Test::Unit::TestCase
 
@@ -56,4 +61,16 @@ class TestSourceFileSystem < Test::Unit::TestCase
     assert(source.paths.include?(Webgen::Path.new('/source/filesystem.rb')))
   end
 
+  def test_handling_of_invalid_link
+    return if Config::CONFIG['arch'].include?('mswin32')
+    dir = File.join(Dir.tmpdir, 'webgen-link-test')
+    FileUtils.mkdir_p(dir)
+    FileUtils.touch(File.join(dir, 'test'))
+    File.symlink('non-existing-file', File.join(dir, 'invalid-link'))
+    source = Webgen::Source::FileSystem.new(dir, '/t*')
+    assert(source.paths.length == 1)
+  ensure
+    FileUtils.rm_rf(dir) if dir
+  end
+
 end

data/test/test_source_resource.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'test/unit'
 require 'helper'
 require 'webgen/source'