gettalong-webgen 0.5.7.20090227 → 0.5.8.20090507

data/test/test_common_sitemap.rb

@@ -48,11 +48,11 @@ class TestCommonSitemap < Test::Unit::TestCase
 
     @nodes[:file11_en].unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, @nodes[:file11_en])
-    assert(!@nodes[:file11_en].flagged(:dirty))
+    assert(!@nodes[:file11_en].flagged?(:dirty))
 
     @nodes[:file11_en].flag(:dirty_meta_info)
     @website.blackboard.dispatch_msg(:node_changed?, @nodes[:file11_en])
-    assert(@nodes[:file11_en].flagged(:dirty))
+    assert(@nodes[:file11_en].flagged?(:dirty))
   end
 
 end

data/test/test_contentprocessor_blocks.rb

@@ -16,12 +16,16 @@ class TestContentProcessorBlocks < Test::Unit::TestCase
     template.node_info[:page] = Webgen::Page.from_data("--- name:content pipeline:blocks\nbefore<webgen:block name='content' />after")
     processors = { 'blocks' => obj }
 
-    context = Webgen::ContentProcessor::Context.new(:chain => [node], :processors => processors)
+    context = Webgen::Context.new(:chain => [node], :processors => processors)
     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.absolute_lcn, template.absolute_lcn]), node.node_info[:used_nodes])
 
+    context.content = '<webgen:block name="content" node="next" /><webgen:block name="content" chain="template;test" />'
+    obj.call(context)
+    assert_equal('databeforedataafter', context.content)
+
     context.content = '<webgen:block name="nothing"/>'
     assert_raise(RuntimeError) { obj.call(context) }
 
@@ -50,6 +54,15 @@ class TestContentProcessorBlocks < Test::Unit::TestCase
     context.content = '<webgen:block name="invalid" node="first" notfound="ignore" /><webgen:block name="content" />'
     obj.call(context)
     assert_equal('beforedataafter', context.content)
+
+    context[:chain] = [node, template]
+    context.content = '<webgen:block name="other" node="current" />'
+    obj.call(context)
+    assert_equal('other', context.content)
+
+    context.content = '<webgen:block name="other" node="current" chain="template"/>'
+    obj.call(context)
+    assert_equal('other', context.content)
   end
 
 end

data/test/test_contentprocessor_builder.rb

@@ -10,7 +10,9 @@ class TestContentProcessorBuilder < Test::Unit::TestCase
     obj = Webgen::ContentProcessor::Builder.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:content => "xml.div(:path => node.absolute_lcn) { xml.strong('test') }",
+    content = "xml.div(:path => context.node.absolute_lcn) { xml.strong('test'); " +
+      "context.website; context; context.ref_node; context.dest_node }"
+    context = Webgen::Context.new(:content => content,
                                                     :chain => [node])
     assert_equal("<div path=\"/test\">\n  <strong>test</strong>\n</div>\n", obj.call(context).content)
 

data/test/test_contentprocessor_erb.rb

@@ -10,10 +10,11 @@ class TestContentProcessorErb < Test::Unit::TestCase
     obj = Webgen::ContentProcessor::Erb.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:content => '<%= context[:doit] %>6', :doit => 'hallo',
+    content = "<%= context[:doit] %>6\n<%= context.ref_node.absolute_lcn %>\n<%= context.node.absolute_lcn %>\n<%= context.dest_node.absolute_lcn %><% website %>"
+    context = Webgen::Context.new(:content => content, :doit => 'hallo',
                                                     :chain => [node])
     obj.call(context)
-    assert_equal('hallo6', context.content)
+    assert_equal("hallo6\n/test\n/test\n/test", context.content)
 
     context.content = '<%= 5* %>'
     assert_raise(RuntimeError) { obj.call(context) }

data/test/test_contentprocessor_erubis.rb

@@ -15,10 +15,10 @@ class TestContentProcessorErubis < Test::Unit::TestCase
     obj = Webgen::ContentProcessor::Erubis.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:doit => 'hallo', :chain => [node])
+    context = Webgen::Context.new(:doit => 'hallo', :chain => [node])
 
-    context.content = '<%= context[:doit] %>6'
-    assert_equal('hallo6', obj.call(context).content)
+    context.content = "<%= context[:doit] %>6\n<%= context.ref_node.absolute_lcn %>\n<%= context.node.absolute_lcn %>\n<%= context.dest_node.absolute_lcn %><% context.website %>"
+    assert_equal("hallo6\n/test\n/test\n/test", obj.call(context).content)
 
     context.content = '<%= 5* %>'
     assert_raise(RuntimeError) { obj.call(context) }

data/test/test_contentprocessor_fragments.rb

@@ -20,20 +20,20 @@ class TestContentProcessorFragments < Test::Unit::TestCase
     root.node_info[:src] = '/'
     processors = { 'fragments' => obj }
 
-    context = Webgen::ContentProcessor::Context.new(:chain => [root], :processors => processors)
+    context = Webgen::Context.new(:chain => [root], :processors => processors)
     context.content = '<h1 id="test">Test</h1><h1>Test2</h1>'
     obj.call(context)
     assert(root.tree['/#test'])
     assert_equal(3, root.tree.node_access[:alcn].length)
     root.tree.delete_node('/#test')
 
-    context[:block] = Webgen::Block.new('content', '', {})
+    context[:block] = Webgen::Page::Block.new('content', '', {})
     obj.call(context)
     assert(root.tree['/#test'])
     assert_equal(3, root.tree.node_access[:alcn].length)
     root.tree.delete_node('/#test')
 
-    context[:block] = Webgen::Block.new('other', '', {})
+    context[:block] = Webgen::Page::Block.new('other', '', {})
     obj.call(context)
     assert(!root.tree['/#test'])
     assert_equal(2, root.tree.node_access[:alcn].length)

data/test/test_contentprocessor_haml.rb

@@ -10,10 +10,11 @@ class TestContentProcessorHaml < Test::Unit::TestCase
     obj = Webgen::ContentProcessor::Haml.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:content => "#content\n  %h1 Hallo\n  = node.absolute_lcn",
+    content = "#content\n  %h1 Hallo\n  = [context.node.absolute_lcn, context.ref_node.absolute_lcn, context.dest_node.absolute_lcn, context.website, context.dest_node.absolute_lcn].join"
+    context = Webgen::Context.new(:content => content,
                                                     :chain => [node])
     obj.call(context)
-    assert_equal("<div id='content'>\n  <h1>Hallo</h1>\n  /test\n</div>\n", context.content)
+    assert_equal("<div id='content'>\n  <h1>Hallo</h1>\n  /test/test/test/test\n</div>\n", context.content)
 
     context.content = "#cont\n  = unknown"
     assert_raise(RuntimeError) { obj.call(context) }

data/test/test_contentprocessor_maruku.rb

@@ -10,7 +10,7 @@ class TestContentProcessorMaruku < Test::Unit::TestCase
   def test_call
     @obj = Webgen::ContentProcessor::Maruku.new
     node = Webgen::Node.new(Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/'), 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:content => '# header', :chain => [node])
+    context = Webgen::Context.new(:content => '# header', :chain => [node])
     assert_equal('<h1 id=\'header\'>header</h1>', @obj.call(context).content)
 
     context.content = "# head*d* {#das .dsaf "
@@ -19,10 +19,10 @@ class TestContentProcessorMaruku < Test::Unit::TestCase
 
   def test_call_fix_for_invalid_id
     @obj = Webgen::ContentProcessor::Maruku.new
-    context = Webgen::ContentProcessor::Context.new(:content => '# `test`')
+    context = Webgen::Context.new(:content => '# `test`')
     assert_equal('<h1 id=\'id1\'><code>test</code></h1>', @obj.call(context).content)
 
-    context = Webgen::ContentProcessor::Context.new(:content => '# `test`')
+    context = Webgen::Context.new(:content => '# `test`')
     assert_equal('<h1 id=\'id1\'><code>test</code></h1>', @obj.call(context).content)
   end
 

data/test/test_contentprocessor_rdiscount.rb

@@ -10,7 +10,7 @@ class TestContentProcessorRDiscount < Test::Unit::TestCase
   def test_call
     @obj = Webgen::ContentProcessor::RDiscount.new
     node = Webgen::Node.new(Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/'), 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:content => '# header', :chain => [node])
+    context = Webgen::Context.new(:content => '# header', :chain => [node])
     assert_equal("<h1>header</h1>\n", @obj.call(context).content)
   end
 

data/test/test_contentprocessor_rdoc.rb

@@ -10,7 +10,7 @@ class TestContentProcessorRDoc < Test::Unit::TestCase
     obj = Webgen::ContentProcessor::RDoc.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:content => "* hello",
+    context = Webgen::Context.new(:content => "* hello",
                                                     :chain => [node])
     assert_equal("<ul>\n<li>hello\n\n</li>\n</ul>\n", obj.call(context).content)
   end

data/test/test_contentprocessor_redcloth.rb

@@ -1,15 +1,22 @@
 # -*- encoding: utf-8 -*-
 
 require 'test/unit'
+require 'helper'
 require 'webgen/websiteaccess'
 require 'webgen/contentprocessor'
 
 class TestContentProcessorRedCloth < Test::Unit::TestCase
 
+  include Test::WebsiteHelper
+
   def test_call
     @obj = Webgen::ContentProcessor::RedCloth.new
-    context = Webgen::ContentProcessor::Context.new(:content => 'h1. header')
-    assert_equal('<h1>header</h1>', @obj.call(context).content)
+    context = Webgen::Context.new(:content => "h1. header\n\nthis\nis\nsome\ntext")
+    assert_equal("<h1>header</h1>\n<p>this\nis\nsome\ntext</p>", @obj.call(context).content)
+
+    context.content = "h1. header\n\nthis\nis\nsome\ntext"
+    @website.config['contentprocessor.redcloth.hard_breaks'] = true
+    assert_equal("<h1>header</h1>\n<p>this<br />\nis<br />\nsome<br />\ntext</p>", @obj.call(context).content)
   end
 
 end

data/test/test_contentprocessor_sass.rb

@@ -10,7 +10,7 @@ class TestContentProcessorSass < Test::Unit::TestCase
     obj = Webgen::ContentProcessor::Sass.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'test', 'test')
-    context = Webgen::ContentProcessor::Context.new(:content => "#main\n  :background-color #000",
+    context = Webgen::Context.new(:content => "#main\n  :background-color #000",
                                                     :chain => [node])
     obj.call(context)
     assert_equal("#main {\n  background-color: #000; }\n", context.content)

data/test/test_contentprocessor_tags.rb

@@ -35,7 +35,7 @@ class TestContentProcessorTags < Test::Unit::TestCase
   end
 
   def test_call
-    context = Webgen::ContentProcessor::Context.new(:chain => [Webgen::Tree.new.dummy_root])
+    context = Webgen::Context.new(:chain => [Webgen::Tree.new.dummy_root])
     context.content = "{test: }"
     assert_equal('', @obj.call(context).content)
 

data/test/{test_contentprocessor_context.rb → test_context.rb}

@@ -2,16 +2,16 @@
 
 require 'test/unit'
 require 'helper'
-require 'webgen/contentprocessor'
+require 'webgen/context'
 
-class TestContentProcessorContext < Test::Unit::TestCase
+class TestContext < Test::Unit::TestCase
 
   def setup
-    @context = Webgen::ContentProcessor::Context.new(:content => 'test', :key => :value, :chain => [:first, :last])
+    @context = Webgen::Context.new(:content => 'test', :key => :value, :chain => [:first, :last])
   end
 
   def test_initialize
-    context = Webgen::ContentProcessor::Context.new
+    context = Webgen::Context.new
     assert_equal('', context.content)
     assert_kind_of(Webgen::ContentProcessor::AccessHash, context[:processors])
   end
@@ -27,11 +27,13 @@ class TestContentProcessorContext < Test::Unit::TestCase
     assert_equal(:value, @context[:key])
     assert_equal([:first, :last], @context[:chain])
     assert_equal('test', @context.content)
-    assert_equal(:first, @context.ref_node)
-    assert_equal(:last, @context.content_node)
-    assert_equal(:value, @context[:key])
     @context[:key] = :newvalue
     assert_equal(:newvalue, @context[:key])
+  end
+
+  def test_node_methods
+    assert_equal(:first, @context.ref_node)
+    assert_equal(:last, @context.content_node)
     assert_equal(:last, @context.dest_node)
     @context[:dest_node] = :other
     assert_equal(:other, @context.dest_node)

data/test/test_node.rb

@@ -42,8 +42,8 @@ class TestNode < Test::Unit::TestCase
       assert_equal(alcn, node.absolute_lcn)
       assert_equal(lang, node.lang)
       assert_kind_of(Webgen::Language, node.lang) if node.lang
-      assert(node.flagged(:dirty))
-      assert(node.flagged(:created))
+      assert(node.flagged?(:dirty))
+      assert(node.flagged?(:created))
       assert_equal(mi, node.meta_info)
       assert_equal({:used_nodes => Set.new, :used_meta_info_nodes => Set.new}, node.node_info)
       mi.each {|k,v| assert_equal(v, node[k])}
@@ -86,18 +86,18 @@ class TestNode < Test::Unit::TestCase
 
   def test_flags
     node = Webgen::Node.new(@tree.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
-    assert(node.flagged(:created))
-    assert(node.flagged(:dirty))
+    assert(node.flagged?(:created))
+    assert(node.flagged?(:dirty))
     node.unflag(:dirty)
-    assert(!node.flagged(:dirty))
+    assert(!node.flagged?(:dirty))
     node.flag(:a, :b, :c)
-    assert(node.flagged(:a))
-    assert(node.flagged(:b))
-    assert(node.flagged(:c))
+    assert(node.flagged?(:a))
+    assert(node.flagged?(:b))
+    assert(node.flagged?(:c))
     node.unflag(:a, :b, :c)
-    assert(!node.flagged(:a))
-    assert(!node.flagged(:b))
-    assert(!node.flagged(:c))
+    assert(!node.flagged?(:a))
+    assert(!node.flagged?(:b))
+    assert(!node.flagged?(:c))
   end
 
   def test_in_lang
@@ -166,22 +166,34 @@ class TestNode < Test::Unit::TestCase
 
   def test_changed
     node = Webgen::Node.new(@tree.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
-    node.unflag(:dirty, :created)
+    node.unflag(:dirty, :dirty_meta_info, :created)
 
     calls = 0
     @website.blackboard.add_listener(:node_changed?) {|n| assert(node, n); node.flag(:dirty); calls += 1}
-    node.changed?
+    assert(node.changed?)
     assert_equal(1, calls)
-    node.changed?
+    assert(node.changed?)
     assert_equal(1, calls)
 
+    # Test :used_nodes array checking
     node.unflag(:dirty)
     node.node_info[:used_nodes] << node.absolute_lcn
     node.node_info[:used_nodes] << 'unknown alcn'
     node.node_info[:used_nodes] << @tree.dummy_root.absolute_lcn
-    node.changed?
+    assert(node.changed?)
     assert_equal(1, calls)
 
+    # Test :used_nodes array checking
+    node.unflag(:dirty)
+    node.node_info[:used_nodes] = Set.new
+    node.node_info[:used_meta_info_nodes] << node.absolute_lcn
+    assert(node.changed?)
+    assert_equal(2, calls)
+    node.unflag(:dirty)
+    node.node_info[:used_meta_info_nodes] << 'unknown alcn'
+    assert(node.changed?)
+    assert_equal(2, calls)
+
     # Test circular depdendence
     other_node = Webgen::Node.new(@tree.dummy_root, '/other', 'test.l', {'lang' => 'de', :test => :value})
     other_node.flag(:dirty, :created)
@@ -201,12 +213,6 @@ class TestNode < Test::Unit::TestCase
     assert_equal(1, calls)
     assert(node.meta_info_changed?)
     assert_equal(1, calls)
-
-    node.unflag(:dirty_meta_info)
-    node.node_info[:used_meta_info_nodes] << node.absolute_lcn
-    node.node_info[:used_meta_info_nodes] << 'unknown alcn'
-    assert(node.meta_info_changed?)
-    assert_equal(1, calls)
   end
 
   def test_method_missing

data/test/test_page.rb

@@ -6,7 +6,7 @@ require 'webgen/page'
 class TestBlock < Test::Unit::TestCase
 
   def test_render
-    block = Webgen::Block.new('content', 'some content', {'pipeline' => 'test'})
+    block = Webgen::Page::Block.new('content', 'some content', {'pipeline' => 'test'})
     context = {:processors => {}}
     assert_raise(RuntimeError) { block.render(context) }
     context[:processors]['test'] = lambda {|context| context[:content] = context[:content].reverse + context[:block].name }
@@ -161,12 +161,12 @@ EOF
   def test_invalid_pagefiles
     testdata = YAML::load(INVALID_MI)
     testdata.each_with_index do |data, index|
-      assert_raise(Webgen::WebgenPageFormatError, "test mi item #{index}") { Webgen::Page.from_data(data) }
-      assert_raise(Webgen::WebgenPageFormatError, "test mi item #{index}") { Webgen::Page.meta_info_from_data(data) }
+      assert_raise(Webgen::Page::FormatError, "test mi item #{index}") { Webgen::Page.from_data(data) }
+      assert_raise(Webgen::Page::FormatError, "test mi item #{index}") { Webgen::Page.meta_info_from_data(data) }
     end
     testdata = YAML::load(INVALID_BLOCKS)
     testdata.each_with_index do |data, index|
-      assert_raise(Webgen::WebgenPageFormatError, "test blocks item #{index}") { Webgen::Page.from_data(data) }
+      assert_raise(Webgen::Page::FormatError, "test blocks item #{index}") { Webgen::Page.from_data(data) }
     end
   end
 

data/test/test_source_tararchive.rb

@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+
+require 'test/unit'
+require 'helper'
+require 'webgen/source'
+
+class TestSourceTarArchive < Test::Unit::TestCase
+
+  class FakeStream
+
+    def open
+      require 'stringio'
+      sio = StringIO.new
+      stream = Archive::Tar::Minitar::Writer.new(sio)
+      stream.mkdir('/test', :mtime => (Time.now - 5).to_i, :mode => 0100755)
+      stream.add_file('/test/hallo.page', :mtime => (Time.now - 4).to_i, :mode => 0100644) do |os, opts|
+        os.write('This is the contents!')
+      end
+      stream.add_file('/other.page', :mtime => (Time.now - 4).to_i, :mode => 0100644) do |os, opts|
+        os.write('This is other content!')
+      end
+      sio.rewind
+      sio
+    end
+
+  end
+
+  include Test::WebsiteHelper
+
+  def setup
+    super
+    @website = Webgen::Website.new(File.join(File.dirname(__FILE__), '..'), nil)
+    @website.init
+    Thread.current[:webgen_website] = @website
+    @stream = FakeStream.new
+  end
+
+  def test_initialize
+    source = Webgen::Source::TarArchive.new(@stream)
+    assert_equal(@stream, source.uri)
+  end
+
+  def test_paths
+    source = Webgen::Source::TarArchive.new(@stream)
+    assert_equal(3, source.paths.length)
+    assert(source.paths.include?(Webgen::Path.new('/test/')))
+    assert(source.paths.include?(Webgen::Path.new('/test/hallo.page')))
+    assert_equal('This is the contents!', source.paths.find {|p| p.path == '/test/hallo.page'}.io.data)
+
+    source = Webgen::Source::TarArchive.new(@stream, '/test/*')
+    assert_equal(1, source.paths.length)
+    assert(source.paths.include?(Webgen::Path.new('/test/hallo.page')))
+  end
+
+  def test_path_changed?
+    stream = @stream
+    source = Webgen::Source::TarArchive.new(stream)
+    source.paths.each do |path|
+      assert(!path.changed?)
+      @website.cache.instance_eval { @old_data[[:tararchive_path, stream, path.path]] = Time.now - 60 }
+      assert(path.changed?)
+    end
+  end
+
+end

data/test/test_sourcehandler_fragment.rb

@@ -11,7 +11,7 @@ class TestSourceHandlerFragment < Test::Unit::TestCase
 
   TEST_CONTENT=<<EOF
 - data: |
-    <h1 id="test">Test</h1>
+    <h1 id="test" style="test">Test</h1>
     <h2 id="other">test</h2>
     <h1>nothing</h1>
     <h1 id="third">test</h1>