webgen 0.5.8 → 0.5.9

data/test/test_tag_menu.rb

@@ -111,12 +111,12 @@ class TestTagMenu < Test::Unit::TestCase
     expected = [nodes[:dir1], nodes[:dir11], nodes[:file111_en], nodes[:index11_en],
                 nodes[:file11_en], nodes[:file11_en_f1], nodes[:file11_en_f11], nodes[:file11_en_f2],
                 nodes[:dir2], nodes[:file21_en],
-                nodes[:dir3], nodes[:file31_en], nodes[:file31_en_f1]].collect {|n| n.absolute_lcn}
+                nodes[:dir3], nodes[:file31_en], nodes[:file31_en_f1]].collect {|n| n.alcn}
 
     assert_equal(expected, tree_en.to_lcn_list.flatten)
 
     tree_de = @obj.send(:menu_tree_for_lang, 'de', nodes[:root])
-    expected = [nodes[:dir1], nodes[:dir11], nodes[:file111_de], nodes[:file1_de]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir11], nodes[:file111_de], nodes[:file1_de]].collect {|n| n.alcn}
 
     assert_equal(expected, tree_de.to_lcn_list.flatten)
   end
@@ -126,26 +126,26 @@ class TestTagMenu < Test::Unit::TestCase
 
     # testing min_levels and max_levels
     output = build_menu(nodes[:index_en], [1, 1, 1, true])
-    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:index_en], [1, 2, 1, true])
-    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:index_en], [1, 2, 2, true])
     expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:file21_en],
-                nodes[:dir3], nodes[:file31_en]].collect {|n| n.absolute_lcn}
+                nodes[:dir3], nodes[:file31_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing show_current_subtree_only
     output = build_menu(nodes[:file11_en], [1, 1, 2, true])
-    expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:dir3]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:dir3]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [1, 1, 2, false])
     expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:file21_en],
-                nodes[:dir3], nodes[:file31_en]].collect {|n| n.absolute_lcn}
+                nodes[:dir3], nodes[:file31_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing start_level
@@ -153,38 +153,38 @@ class TestTagMenu < Test::Unit::TestCase
     assert_equal([], output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [2, 1, 2, true])
-    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [2, 1, 2, false])
-    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [2, 2, 2, false])
     expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en],
-                nodes[:file11_en], nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.absolute_lcn}
+                nodes[:file11_en], nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file111_en], [2, 1, 2, true])
-    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing used_nodes=files setting
     output = build_menu(nodes[:file11_en], [2, 2, 2, false, 'files'])
-    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [1, 1, 1, true, 'files'])
-    expected = [nodes[:dir1], nodes[:dir2]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing used_nodes=fragments setting
     output = build_menu(nodes[:file11_en], [1, 1, 2, false, 'fragments'])
-    expected = [nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [1, 2, 2, false, 'fragments'])
-    expected = [nodes[:file11_en_f1], nodes[:file11_en_f11], nodes[:file11_en_f2]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:file11_en_f1], nodes[:file11_en_f11], nodes[:file11_en_f2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
   end
 

data/test/test_tag_metainfo.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require 'test/unit'
+require 'helper'
 require 'webgen/tree'
 require 'webgen/contentprocessor'
 require 'webgen/tag'

data/test/test_tag_relocatable.rb

@@ -20,7 +20,7 @@ class TestTagRelocatable < Test::Unit::TestCase
   end
 
   def test_call
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     node = Webgen::Node.new(root, '/file.html', 'file.html', {'lang' => 'en'})
     dir = Webgen::Node.new(root, '/dir/', 'dir/', 'index_path' => "index.html")
     file = Webgen::Node.new(dir, '/dir/file.html', 'file.html', {'lang' => 'en'})
@@ -34,6 +34,7 @@ class TestTagRelocatable < Test::Unit::TestCase
     # basic node resolving
     @obj.set_params('tag.relocatable.path' => 'dir/file.html')
     assert_equal('dir/file.html', call(context))
+    assert(context.dest_node.node_info[:used_meta_info_nodes].include?(file.alcn))
     @obj.set_params('tag.relocatable.path' => 'dir/other.html')
     assert_equal('', call(context))
 
@@ -53,7 +54,7 @@ class TestTagRelocatable < Test::Unit::TestCase
 
     # invalid paths
     @obj.set_params('tag.relocatable.path' => ':/asdf=-)')
-    assert_equal('', call(context))
+    assert_raise(Webgen::RenderError) { call(context) }
   end
 
 end

data/test/test_tag_tikz.rb

@@ -25,7 +25,7 @@ class TestTagTikZ < Test::Unit::TestCase
   end
 
   def test_call
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     node = Webgen::Node.new(root, '/file.html', 'file.page')
     context = Webgen::Context.new(:chain => [node])
 
@@ -38,7 +38,7 @@ class TestTagTikZ < Test::Unit::TestCase
     output = call(context, '\tikz \asdfasdfasf', 'test.png', [], '', '72 72', false, {})
     assert_equal('<img src="test.png" />', output)
     assert(root.tree['/test.png'])
-    assert_nil(root.tree['/test.png'].content)
+    assert_raise(Webgen::RenderError) { root.tree['/test.png'].content }
     root.tree.delete_node('/test.png')
 
     output = call(context, '\tikz \draw (0,0) -- (0,1);', '/images/test.gif', ['arrows'], '->', '72 72', true, {'alt' => 'title'})
@@ -55,14 +55,14 @@ class TestTagTikZ < Test::Unit::TestCase
   end
 
   def test_run_command
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     context = Webgen::Context.new(:chain => [root])
     assert_equal("hallo\n", @obj.send(:run_command, echo_cmd('hallo'), context))
-    assert_nil(@obj.send(:run_command, 'unknown_command 2>&1', context))
+    assert_raise(Webgen::RenderError) { @obj.send(:run_command, 'unknown_command 2>&1', context) }
   end
 
   def echo_cmd(data)
-    (Config::CONFIG['arch'].include?('mswin32') ?  "echo #{data}" : "echo '#{data}'")
+    (Config::CONFIG['host_os'] =~ /mswin|mingw/ ?  "echo #{data}" : "echo '#{data}'")
   end
 
 

data/test/test_tree.rb

@@ -15,24 +15,24 @@ class TestTree < Test::Unit::TestCase
 
   def test_initialize
     assert_not_nil(@tree.dummy_root)
-    assert_equal('', @tree.dummy_root.absolute_lcn)
+    assert_equal('', @tree.dummy_root.alcn)
   end
 
   def test_root
     root = Webgen::Node.new(@tree.dummy_root, '/', '/')
     assert_equal(root, @tree.root)
-    assert_equal('/', root.absolute_lcn)
+    assert_equal('/', root.alcn)
   end
 
   def test_register_node_and_register_path
     # Tree#register_node/_path is called when creating a node
-    node = Webgen::Node.new(@tree.dummy_root, 'dummy/', 'dummy')
-    assert_equal(node, @tree['/dummy', :alcn])
-    assert_equal(node, @tree['/dummy', :acn])
-    assert_equal(node, @tree['dummy/', :path])
+    node = Webgen::Node.new(@tree.dummy_root, '/', '/')
+    assert_equal(node, @tree['/', :alcn])
+    assert_equal(node, @tree['/', :acn])
+    assert_equal(node, @tree['/', :path])
     assert_raise(RuntimeError) { Webgen::Node.new(@tree.dummy_root, '/', 'dummy') }
-    assert_raise(RuntimeError) { Webgen::Node.new(@tree.dummy_root, 'dummy/', 'other') }
-    assert_nothing_raised { Webgen::Node.new(@tree.dummy_root, 'dummy/', 'unknown', {'no_output' => true}) }
+    assert_raise(RuntimeError) { Webgen::Node.new(@tree.dummy_root, 'dummy', '/') }
+    assert_nothing_raised { Webgen::Node.new(@tree.dummy_root, '/', 'unknown', {'no_output' => true}) }
     Webgen::Node.new(@tree.dummy_root, 'new', 'new', {'no_output' => true})
     assert(!@tree['new', :path])
   end

data/test/test_website.rb

@@ -57,6 +57,19 @@ class TestWebsite < Test::Unit::TestCase
     assert(ws.config['website.cache'][1].length == 0)
   end
 
+  def test_render
+    dir = File.join(Dir.tmpdir, 'webgen-' + Process.pid.to_s)
+    FileUtils.mkdir_p(dir)
+    FileUtils.mkdir_p(File.join(dir, 'src'))
+    FileUtils.touch(File.join(dir, 'src', 'test.jpg'))
+
+    ws = Webgen::Website.new(dir, nil)
+    assert_equal(:success, ws.render)
+    assert_equal(:success, ws.render)
+  ensure
+    FileUtils.rm_rf(dir)
+  end
+
   def test_execute_in_env
     ws = Webgen::Website.new('hallo')
     assert_nil(Webgen::WebsiteAccess.website)
@@ -110,6 +123,8 @@ class TestWebsite < Test::Unit::TestCase
     assert(File.directory?(File.join(dir, 'out')))
     ws.clean(true)
     assert(!File.directory?(File.join(dir, 'out')))
+  ensure
+    FileUtils.rm_rf(dir)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webgen
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Thomas Leitner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 +02:00
+date: 2009-07-25 00:00:00 +02:00
 default_executable: webgen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,17 +140,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.4.214
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: feedtools
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.29
+        version: 0.8.312
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -205,6 +195,12 @@ files:
 - COPYING
 - GPL
 - bin/webgen
+- data/webgen/passive_sources/images/generated_by_webgen.png
+- data/webgen/passive_sources/images/webgen_logo.png
+- data/webgen/passive_sources/stylesheets/coderay-default.css
+- data/webgen/passive_sources/templates/atom_feed.template
+- data/webgen/passive_sources/templates/rss_feed.template
+- data/webgen/passive_sources/templates/sitemap.template
 - data/webgen/resources.yaml
 - data/webgen/webgui/app.rb
 - data/webgen/webgui/controller/main.rb
@@ -315,12 +311,14 @@ files:
 - doc/contentprocessor/erubis.page
 - doc/contentprocessor/fragments.page
 - doc/contentprocessor/haml.page
+- doc/contentprocessor/head.page
 - doc/contentprocessor/maruku.page
 - doc/contentprocessor/rdiscount.page
 - doc/contentprocessor/rdoc.page
 - doc/contentprocessor/redcloth.page
 - doc/contentprocessor/sass.page
 - doc/contentprocessor/tags.page
+- doc/contentprocessor/tidy.page
 - doc/contentprocessor.template
 - doc/extensions.metainfo
 - doc/extensions.page
@@ -376,18 +374,23 @@ files:
 - lib/webgen/contentprocessor/erubis.rb
 - lib/webgen/contentprocessor/fragments.rb
 - lib/webgen/contentprocessor/haml.rb
+- lib/webgen/contentprocessor/head.rb
 - lib/webgen/contentprocessor/maruku.rb
 - lib/webgen/contentprocessor/rdiscount.rb
 - lib/webgen/contentprocessor/rdoc.rb
 - lib/webgen/contentprocessor/redcloth.rb
 - lib/webgen/contentprocessor/sass.rb
 - lib/webgen/contentprocessor/tags.rb
+- lib/webgen/contentprocessor/tidy.rb
 - lib/webgen/contentprocessor.rb
 - lib/webgen/context/nodes.rb
+- lib/webgen/context/render.rb
+- lib/webgen/context/tags.rb
 - lib/webgen/context.rb
 - lib/webgen/coreext.rb
 - lib/webgen/default_config.rb
 - lib/webgen/deprecated.rb
+- lib/webgen/error.rb
 - lib/webgen/languages.rb
 - lib/webgen/loggable.rb
 - lib/webgen/logger.rb
@@ -445,11 +448,11 @@ files:
 - misc/images/information.png
 - misc/images/quote.gif
 - misc/images/warning.png
+- misc/logo.svg
 - misc/style.page
 - test/test_blackboard.rb
 - test/test_cache.rb
 - test/test_cli.rb
-- test/test_common.rb
 - test/test_common_sitemap.rb
 - test/test_configuration.rb
 - test/test_contentprocessor.rb
@@ -459,13 +462,16 @@ files:
 - test/test_contentprocessor_erubis.rb
 - test/test_contentprocessor_fragments.rb
 - test/test_contentprocessor_haml.rb
+- test/test_contentprocessor_head.rb
 - test/test_contentprocessor_maruku.rb
 - test/test_contentprocessor_rdiscount.rb
 - test/test_contentprocessor_rdoc.rb
 - test/test_contentprocessor_redcloth.rb
 - test/test_contentprocessor_sass.rb
 - test/test_contentprocessor_tags.rb
+- test/test_contentprocessor_tidy.rb
 - test/test_context.rb
+- test/test_error.rb
 - test/test_languages.rb
 - test/test_loggable.rb
 - test/test_logger.rb
@@ -482,6 +488,7 @@ files:
 - test/test_sourcehandler_directory.rb
 - test/test_sourcehandler_feed.rb
 - test/test_sourcehandler_fragment.rb
+- test/test_sourcehandler_main.rb
 - test/test_sourcehandler_memory.rb
 - test/test_sourcehandler_metainfo.rb
 - test/test_sourcehandler_page.rb

data/test/test_common.rb

@@ -1,18 +0,0 @@
-# -*- 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