webgen 0.5.17 → 1.0.0.beta1

data/setup.rb

@@ -785,7 +785,7 @@ class ToplevelInstaller
     else
       require 'rbconfig'
     end
-    ::Config::CONFIG
+    ::RbConfig::CONFIG
   end
 
   def initialize(ardir_root, config)

data/test/test_documentation.rb

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+
+require 'minitest/autorun'
+require 'webgen/website'
+require 'tmpdir'
+require 'yaml'
+require 'set'
+
+class TestExtensionDocumentation < MiniTest::Unit::TestCase
+
+  def test_all_extensions_documented
+    ws = Webgen::Website.new(File.join(Dir.tmpdir, '/abcdefgh'))
+    documentation = YAML::load(File.read(ws.ext.bundles['built-in']))['extensions']
+    author = "Thomas Leitner <t_leitner@gmx.at>"
+    docu_keys = Set.new(documentation.keys)
+    ext_keys = Set.new(ws.ext.instance_eval { @table.keys })
+
+    check_docu = lambda do |key|
+      data = documentation.delete(key.to_s)
+      assert(data, "Missing documentation key '#{key}'")
+      assert(!data['summary'].to_s.empty?, "Missing summary for key '#{key}'")
+      assert(!data['author'].to_s.empty?, "Missing author for key '#{key}'")
+    end
+
+    ext_keys.each do |key|
+      check_docu.call(key.to_s)
+
+      if ws.ext.send(key).respond_to?(:registered_extensions)
+        ws.ext.send(key).registered_extensions.keys.each do |skey|
+          skey = "#{key}.#{skey}"
+          skey = "tag.meta_info" if skey == "tag.default"
+          next if %w[tag.r].include?(skey)
+
+          check_docu.call(skey)
+        end
+      end
+    end
+
+    check_docu.call('cli')
+    assert(documentation.empty?, "Superfluous documentation keys: #{documentation.keys.join(", ")}")
+  end
+
+end

data/test/webgen/cli/test_logger.rb

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+
+require 'minitest/autorun'
+require 'webgen/cli/logger'
+
+class TestLogger < MiniTest::Unit::TestCase
+
+  def test_initialize
+    l = Webgen::CLI::Logger.new
+    assert_equal(::Logger::INFO, l.level)
+  end
+
+  def test_log_output
+    original = Webgen::CLI::Utils.use_colors
+    Webgen::CLI::Utils.use_colors = false
+    out, err = capture_io do
+      l = Webgen::CLI::Logger.new
+      l.level = ::Logger::DEBUG
+      l.info { "information" }
+      l.info { "[create] information" }
+      l.info { "[update] information" }
+      l.info { "[delete] information" }
+      l.warn { "warning" }
+      l.error{ "error" }
+      l.debug('program') { "debug" }
+    end
+    expected = <<EOF
+INFO  information
+INFO  [create] information
+INFO  [update] information
+INFO  [delete] information
+WARN  warning
+ERROR error
+DEBUG (program) debug
+EOF
+    assert_equal(expected, out)
+  ensure
+    Webgen::CLI::Utils.use_colors = original
+  end
+
+end

data/test/{test_contentprocessor_blocks.rb → webgen/content_processor/test_blocks.rb}

@@ -1,31 +1,34 @@
 # -*- encoding: utf-8 -*-
 
-require 'test/unit'
-require 'helper'
-require 'webgen/tree'
-require 'webgen/page'
-require 'webgen/contentprocessor'
-
-class TestContentProcessorBlocks < Test::Unit::TestCase
-
-  include Test::WebsiteHelper
-
-  def test_call_and_render_node
-    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\n--- name:other\nother")
-    dnode = Webgen::Node.new(root, 'dtest', 'dtest')
-    dnode.node_info[:page] = Webgen::Page.from_data("--- name:content pipeline:erb\n<%= context.dest_node.alcn %>")
-    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, 'erb' => Webgen::ContentProcessor::Erb.new }
-
-    context = Webgen::Context.new(:chain => [node], :processors => processors)
+require 'webgen/test_helper'
+require 'webgen/content_processor/blocks'
+require 'webgen/context'
+
+class TestBlocks < MiniTest::Unit::TestCase
+
+  include Webgen::TestHelper
+
+  def test_static_call_and_render_block
+    setup_website
+    @website.ext.content_processor = Webgen::ContentProcessor.new
+    @website.ext.content_processor.register('Blocks')
+    @website.ext.content_processor.register('Erb')
+    obj = Webgen::ContentProcessor::Blocks
+
+    root = Webgen::Node.new(Webgen::Tree.new(@website).dummy_root, '/', '/')
+    node = RenderNode.new("--- name:content pipeline:erb\ndata\n--- name:other\nother",
+                          root, 'test', 'test')
+    dnode = RenderNode.new("--- name:content pipeline:erb\n<%= context.dest_node.alcn %>",
+                           root, 'dtest', 'dtest')
+    template = RenderNode.new("--- name:content pipeline:blocks\nbefore<webgen:block name='content' />after",
+                              root, 'template', 'template')
+
+    context = Webgen::Context.new(@website)
+
+    context[:chain] = [node]
     context.content = '<webgen:block name="content" /><webgen:block name="content" chain="template;test" />'
     obj.call(context)
     assert_equal('databeforedataafter', context.content)
-    assert_equal(Set.new([node.alcn, template.alcn]), node.node_info[:used_nodes])
 
     context.content = '<webgen:block name="content" node="next" /><webgen:block name="content" chain="template;test" />'
     obj.call(context)
@@ -34,15 +37,10 @@ class TestContentProcessorBlocks < Test::Unit::TestCase
     context.content = "\nsadfasdf<webgen:block name='nothing'/>"
     assert_error_on_line(Webgen::RenderError, 2) { obj.call(context) }
 
-    context.content = '<webgen:block name="content" chain="invalid" />'
-    assert_error_on_line(Webgen::RenderError, 1) { obj.call(context) }
-
     context.content = '<webgen:block name="content" />'
-    node.node_info[:used_nodes] = Set.new
     context[:chain] = [node, template, node]
     obj.call(context)
     assert_equal('beforedataafter', context.content)
-    assert_equal(Set.new([template.alcn, node.alcn]), node.node_info[:used_nodes])
 
     # Test correctly set dest_node
     context[:chain] = [node]
@@ -53,6 +51,10 @@ class TestContentProcessorBlocks < Test::Unit::TestCase
     context.content = '<webgen:block name="content" chain="dtest" />'
     assert_equal('/test', obj.render_block(context, :chain => [dnode], :name => 'content'))
 
+    context.content = '<webgen:block name="content" chain="dtest" />'
+    context[:dest_node] = dnode
+    assert_equal('/dtest', obj.render_block(context, :chain => [dnode], :name => 'content'))
+    context[:dest_node] = nil
 
     # Test options "node" and "notfound"
     context[:chain] = [node, template, node]

data/test/webgen/content_processor/test_builder.rb

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/test_helper'
+require 'webgen/content_processor/builder'
+
+class TestBuilder < MiniTest::Unit::TestCase
+
+  include Webgen::TestHelper
+
+  def test_static_call
+    setup_context
+    cp = Webgen::ContentProcessor::Builder
+
+    @context.content = "xml.div(:path => context.node.alcn) { xml.strong('test'); " +
+      "context.website; context; context.ref_node; context.dest_node }"
+    assert_equal("<div path=\"/test\">\n  <strong>test</strong>\n</div>\n", cp.call(@context).content)
+
+    @context.content = "xml.div do \n5+5\n+=+6\nend"
+    assert_error_on_line(SyntaxError, 3) { cp.call(@context) }
+
+    @context.content = "xml.div do \n5+5\nunknown\n++6\nend"
+    assert_error_on_line(NameError, 3) { cp.call(@context) }
+  end
+
+end

data/test/webgen/content_processor/test_erb.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/test_helper'
+require 'webgen/content_processor/erb'
+
+class TestErb < MiniTest::Unit::TestCase
+
+  include Webgen::TestHelper
+
+  def test_static_call
+    setup_context
+    cp = Webgen::ContentProcessor::Erb
+
+    @context.content = "<%= context[:doit] %>6\n<%= context.ref_node.alcn %>\n<%= context.node.alcn %>\n<%= context.dest_node.alcn %><% context.website %>"
+    assert_equal("hallo6\n/test\n/test\n/test", cp.call(@context).content)
+
+    @context.content = "\n<%= 5* %>"
+    assert_error_on_line(SyntaxError, 2) { cp.call(@context) }
+  end
+
+end

data/test/webgen/content_processor/test_erubis.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/test_helper'
+require 'webgen/content_processor/erubis'
+
+class TestErubis < MiniTest::Unit::TestCase
+
+  include Webgen::TestHelper
+
+  def test_static_call
+    setup_context
+    @website.config.merge!('content_processor.erubis.options' => {}, 'content_processor.erubis.use_pi' => false)
+    cp = Webgen::ContentProcessor::Erubis
+
+    @context.content = "<%= context[:doit] %>6\n<%= context.ref_node.alcn %>\n<%= context.node.alcn %>\n<%= context.dest_node.alcn %><% context.website %>"
+    assert_equal("hallo6\n/test\n/test\n/test", cp.call(@context).content)
+
+    @context.content = "\n<%= 5* %>"
+    assert_error_on_line(SyntaxError, 2) { cp.call(@context) }
+
+    @context.content = "\n\n<% unknown %>"
+    assert_error_on_line(NameError, 3) { cp.call(@context) }
+
+    @website.config['content_processor.erubis.options'][:trim] = true
+    @context.content = "<% for i in [1] %>\n<%= i %>\n<% end %>"
+    assert_equal("1\n", cp.call(@context).content)
+
+    @website.config['content_processor.erubis.use_pi'] = true
+    @context.content = "<?rb for i in [1] ?>\n@{i}@\n<?rb end ?>"
+    assert_equal("1\n", cp.call(@context).content)
+  end
+
+end

data/test/webgen/content_processor/test_fragments.rb

@@ -0,0 +1,96 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/test_helper'
+require 'webgen/content_processor/fragments'
+require 'yaml'
+
+class TestContentProcessorFragments < MiniTest::Unit::TestCase
+
+  include Webgen::TestHelper
+
+  TEST_CONTENT=<<EOF
+- data: |
+    <h1 id="test" style="test">Test</h1>
+    <h2 id="other">test</h2>
+    <h1>nothing</h1>
+    <h1 id="third">test</h1>
+  sections:
+    - [1, test, Test]
+    - [2, other, test]
+    - [1, third, test]
+
+- data: |
+    <h1 id="test">Test</h1>
+    <h2 id="other">test</h2>
+    <h3 id='non'>other</h3>
+    <h1 id="third">test</h1>
+    <h3 id='four'>fourth</h3>
+  sections:
+    - [1, test, Test]
+    - [2, other, test]
+    - [3, non, other]
+    - [1, third, test]
+    - [3, four, fourth]
+EOF
+
+  def setup
+    @cp = Webgen::ContentProcessor::Fragments
+  end
+
+  def test_static_parse_html_headers
+    YAML::load(TEST_CONTENT).each do |data|
+      sections = @cp.parse_html_headers(data['data'])
+      check_sections(sections, data['sections'])
+    end
+  end
+
+  def check_sections(sections, valid)
+    sections.each do |level, id, title, subsecs|
+      assert_equal(valid.shift, [level, id, title])
+      check_sections(subsecs, valid)
+    end
+  end
+
+  def test_static_call
+    setup_website
+    @website.ext.path_handler = Object.new
+    def (@website.ext.path_handler).create_secondary_nodes(path, body, source_node)
+      @proc.call(path, body, source_node)
+    end
+    create_secondary_nodes = lambda do |path, body, source_node|
+      assert_equal('', body)
+      assert_equal('copy', path['handler'])
+      assert_equal(@website.tree['/test.html'].alcn, source_node)
+      parent = @website.tree[path.meta_info['parent_alcn']]
+      [Webgen::Node.new(parent, path.cn, path.alcn, path.meta_info)]
+    end
+    @website.ext.path_handler.instance_variable_set(:@proc, create_secondary_nodes)
+
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    node = Webgen::Node.new(root, 'test.html', '/test.html')
+    node.node_info[:src] = '/test.html'
+
+    context = Webgen::Context.new(@website, :chain => [node])
+    context.content = YAML::load(TEST_CONTENT).first['data']
+    @cp.call(context)
+    refute_nil(root.tree['/test.html#test'])
+    refute_nil(root.tree['/test.html#other'])
+    refute_nil(root.tree['/test.html#third'])
+    assert_equal(node, node.resolve('#test').parent)
+    assert_equal(node.resolve('#test'), node.resolve('#other').parent)
+
+    assert_equal(6, root.tree.node_access[:alcn].length)
+    root.tree.delete_node('/test.html#test')
+
+    context[:block_name] = 'content'
+    context.content = '<h1 id="mytest">Test</h1>'
+    @cp.call(context)
+    refute_nil(root.tree['/test.html#mytest'])
+    root.tree.delete_node(root.tree['/test.html#mytest'])
+
+    context[:block_name] = 'other'
+    @cp.call(context)
+    assert_nil(root.tree['/test.html#mytest'])
+  end
+
+end

data/test/webgen/content_processor/test_haml.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/test_helper'
+require 'webgen/content_processor/haml'
+
+class TestHaml < MiniTest::Unit::TestCase
+
+  include Webgen::TestHelper
+
+  def test_static_call
+    setup_context
+    cp = Webgen::ContentProcessor::Haml
+
+    @context.content = "#content\n  %h1 Hallo\n  = [context.node.alcn, context.ref_node.alcn, context.dest_node.alcn].join"
+    assert_equal("<div id='content'>\n  <h1>Hallo</h1>\n  /test/test/test\n</div>\n", cp.call(@context).content)
+
+    @context.content = "#cont\n    % = + unknown"
+    assert_error_on_line(Webgen::RenderError, 2) { cp.call(@context) }
+
+    @context.content = "#cont\n  = unknown"
+    assert_error_on_line(NameError, 2) { cp.call(@context) }
+  end
+
+end

data/test/webgen/content_processor/test_html_head.rb

@@ -0,0 +1,78 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/test_helper'
+require 'webgen/content_processor/html_head'
+
+class TestHtmlHead < MiniTest::Unit::TestCase
+
+  include Webgen::TestHelper
+
+  def setup
+    setup_website
+    @obj = Webgen::ContentProcessor::HtmlHead
+    @root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    @node = Webgen::Node.new(@root, 'test', 'test.en', {'lang' => 'en'})
+  end
+
+  def test_call
+    context = Webgen::Context.new(@website, :chain => [@node])
+    context.content = "</head>"
+    de_node = Webgen::Node.new(@root, 'test', 'test.de', {'lang' => 'de'})
+    assert_equal("\n<link type=\"text/html\" rel=\"alternate\" hreflang=\"de\" href=\"test.de\" /></head>",
+                 @obj.call(context).content)
+  end
+
+  def test_tags_from_context_data
+    @node.meta_info['meta'] = {'other' => 'me'}
+    context = Webgen::Context.new(@website, :chain => [@node])
+    context.persistent[:cp_html_head] = {
+      :js_file => ['hallo.js', 'hallo2.js', 'hallo.js'],
+      :js_inline => ["somescript", "anotherscript"],
+      :css_file => ['hallo.css', 'hallo2.css', 'hallo.css'],
+      :css_inline => ["somestyle", "anotherstyle"],
+      :meta => {:lucky => 'me<"'}
+    }
+    assert_equal("\n<script type=\"text/javascript\" src=\"hallo.js\"></script>" +
+                 "\n<script type=\"text/javascript\" src=\"hallo2.js\"></script>" +
+                 "\n<script type=\"text/javascript\">//<![CDATA[\nsomescript\n//]]></script>" +
+                 "\n<script type=\"text/javascript\">//<![CDATA[\nanotherscript\n//]]></script>" +
+                 "\n<link rel=\"stylesheet\" href=\"hallo.css\" type=\"text/css\"/>" +
+                 "\n<link rel=\"stylesheet\" href=\"hallo2.css\" type=\"text/css\"/>" +
+                 "\n<style type=\"text/css\">/*<![CDATA[/*/\nsomestyle\n/*]]>*/</style>" +
+                 "\n<style type=\"text/css\">/*<![CDATA[/*/\nanotherstyle\n/*]]>*/</style>" +
+                 "\n<meta name=\"lucky\" content=\"me&lt;&quot;\" />" +
+                 "\n<meta name=\"other\" content=\"me\" />", @obj.tags_from_context_data(context))
+  end
+
+  def test_links_to_translations
+    context = Webgen::Context.new(@website, :chain => [@node])
+
+    de_node = Webgen::Node.new(@root, 'test', 'test.de', {'lang' => 'de'})
+    assert_equal("\n<link type=\"text/html\" rel=\"alternate\" hreflang=\"de\" href=\"test.de\" />",
+                 @obj.links_to_translations(context))
+
+    de_node.meta_info['title'] = 'Deutscher Titel'
+    assert_equal("\n<link type=\"text/html\" rel=\"alternate\" hreflang=\"de\" href=\"test.de\" " +
+                 "lang=\"de\" title=\"Deutscher Titel\" />", @obj.links_to_translations(context))
+  end
+
+  def test_links_from_link_meta_info
+    context = Webgen::Context.new(@website, :chain => [@node])
+
+    @node.meta_info['link'] = {'javascript' => 'http://example.org', 'css' => ['http://example.org', 'test', 'unknown']}
+    assert_equal("\n<script type=\"text/javascript\" src=\"http://example.org\"></script>" +
+                 "\n<link rel=\"stylesheet\" href=\"http://example.org\" type=\"text/css\" />" +
+                 "\n<link rel=\"stylesheet\" href=\"test.en\" type=\"text/css\" />",
+                 @obj.links_from_link_meta_info(context))
+
+    @node.meta_info['link'] = {'next' => 'test', 'start' => {'type' => 'text/xhtml', 'href' => 'http://example.org'},
+      'alternate' => ['test', {'type' => 'text/html', 'href' => 'test'}, {'href' => 'unknown'}, {'type' => 'text/html'}]
+    }
+    assert_equal("\n<link href=\"test.en\" rel=\"alternate\" />" +
+                 "\n<link href=\"test.en\" rel=\"alternate\" type=\"text/html\" />" +
+                 "\n<link href=\"test.en\" rel=\"next\" type=\"text/html\" />" +
+                 "\n<link href=\"http://example.org\" rel=\"start\" type=\"text/xhtml\" />",
+                 @obj.links_from_link_meta_info(context))
+  end
+
+end