webgen 0.5.1 → 0.5.2

data/lib/webgen/version.rb

@@ -1,6 +1,6 @@
 module Webgen
 
   # The version of webgen.
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 
 end

data/lib/webgen/website.rb

@@ -1,6 +1,7 @@
 # Standard lib requires
 require 'logger'
 require 'set'
+require 'fileutils'
 
 # Requirements for Website
 require 'webgen/loggable'
@@ -73,6 +74,7 @@ module Webgen
     def initialize(dir, logger=Webgen::Logger.new($stdout, false), &block)
       @blackboard = nil
       @cache = nil
+      @config = nil
       @logger = logger
       @config_block = block
       @directory = dir
@@ -165,7 +167,7 @@ module Webgen
       @tree = Tree.new
       data = if config['website.cache'].first == :file
                cache_file = File.join(@directory, config['website.cache'].last)
-               File.read(cache_file) if File.exists?(cache_file)
+               File.open(cache_file, 'rb') {|f| f.read} if File.exists?(cache_file)
              else
                config['website.cache'].last
              end

data/lib/webgen/websitemanager.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'fileutils'
 require 'webgen/website'
 
 module Webgen

data/man/man1/webgen.1

@@ -52,6 +52,9 @@ no command was issued.
 .TP
 \fBversion\fR
 Shows the version of the program and exit.
+.TP
+\fBwebgui\fR
+Starts the webgen webgui, a browser based graphical user interface for manging webgen websites.
 .SH SEE ALSO
 The webgen website, http://webgen.rubyforge.org/ for more information.
 .SH AUTHOR

data/misc/default.template

@@ -65,7 +65,7 @@
           <a href="http://validator.w3.org/check/referer">XHTML</a>
         </p>
 
-        <p>Page last changed at: {date:}</p>
+        <p>Page last changed at: {modified_at:}</p>
       </div>
 
     </div></div>

data/test/test_cache.rb

@@ -33,14 +33,15 @@ class TestCache < Test::Unit::TestCase
 
   def test_volatile_cache
     @cache.volatile[:key] = :value
+    assert_equal(:value, @cache.volatile[:key])
+    dump_and_restore
     assert_equal(nil, @cache.volatile[:key])
 
+    @cache.volatile[:key] = :value
     obj = @cache.instance('Hash')
+    @cache.reset_volatile_cache
+    assert_equal(nil, @cache.volatile[:key])
     assert_equal(obj, @cache.instance('Hash'))
-
-    @cache.enable_volatile_cache
-    @cache.volatile[:key] = :value
-    assert_equal(:value, @cache.volatile[:key])
   end
 
   def test_instance
@@ -50,7 +51,6 @@ class TestCache < Test::Unit::TestCase
     @cache.instance('Array')
     assert_equal(['Hash', 'Array'], @cache.permanent[:classes])
     dump_and_restore
-    @cache.enable_volatile_cache
     assert_not_nil(@cache.volatile[:classes]['Hash'])
   end
 

data/test/test_node.rb

@@ -41,7 +41,7 @@ class TestNode < Test::Unit::TestCase
       assert(node.dirty)
       assert(node.created)
       assert_equal(mi, node.meta_info)
-      assert_equal({:used_nodes => Set.new}, node.node_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])}
     end
 
@@ -159,6 +159,25 @@ class TestNode < Test::Unit::TestCase
     assert_equal(1, calls)
   end
 
+  def test_meta_info_changed
+    node = Webgen::Node.new(@tree.dummy_root, '/', '/')
+    node.dirty = node.created = false
+
+    calls = 0
+    @website.blackboard.add_listener(:node_meta_info_changed?) {|n| assert(node, n); node.dirty_meta_info = true; calls += 1}
+    assert(node.meta_info_changed?)
+    assert_equal(1, calls)
+    assert(node.meta_info_changed?)
+    assert_equal(1, calls)
+
+    node.dirty_meta_info = false
+    node.node_info[:used_meta_info_nodes] << node.absolute_lcn
+    node.node_info[:used_meta_info_nodes] << 'unknown alcn'
+    node.node_info[:used_meta_info_nodes] << @tree.dummy_root.absolute_lcn
+    assert(node.meta_info_changed?)
+    assert_equal(2, calls)
+  end
+
   def test_method_missing
     node = Webgen::Node.new(@tree.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
     assert_raise(NoMethodError) { node.unknown }

data/test/test_output_filesystem.rb

@@ -35,8 +35,9 @@ class TestOutputFileSystem < Test::Unit::TestCase
 
     output.write('/dir/hallo', 'content', :file)
     assert(File.file?(File.join(output.root, 'dir/hallo')))
-    assert_equal('content', File.read(File.join(output.root, 'dir/hallo')))
     assert(output.exists?('/dir/hallo'))
+    assert_equal('content', File.read(File.join(output.root, 'dir/hallo')))
+    assert_equal('content', output.read('/dir/hallo'))
 
     output.delete('/dir/hallo')
     assert(!output.exists?('/dir/hallo'))

data/test/test_page.rb

@@ -1,6 +1,18 @@
 require 'test/unit'
 require 'webgen/page'
 
+class TestBlock < Test::Unit::TestCase
+
+  def test_render
+    block = Webgen::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 }
+    assert_equal('some content'.reverse + 'content', block.render(context)[:content])
+  end
+
+end
+
 class TestPage < Test::Unit::TestCase
 
   VALID = <<EOF

data/test/test_path.rb

@@ -52,6 +52,20 @@ class TestPath < Test::Unit::TestCase
     assert_equal('/', p.directory)
     assert_equal('somedir', p.cn)
     assert_equal('Somedir', p.meta_info['title'])
+
+    p = Webgen::Path.new('/source/test.rb')
+    p = p.mount_at('/', '/source/')
+    assert_equal('/test.rb', p.path)
+    assert_equal('/', p.directory)
+    assert_equal('test.rb', p.cn)
+    assert_equal('Test', p.meta_info['title'])
+
+    p = Webgen::Path.new('/source/')
+    p = p.mount_at('/', '/source')
+    assert_equal('/', p.path)
+    assert_equal('/', p.directory)
+    assert_equal('/', p.cn)
+    assert_equal('/', p.meta_info['title'])
   end
 
   def test_dup

data/test/test_source_filesystem.rb

@@ -50,7 +50,7 @@ class TestSourceFileSystem < Test::Unit::TestCase
   end
 
   def test_paths
-    source = Webgen::Source::FileSystem.new('lib/webgen', '**/*')
+    source = Webgen::Source::FileSystem.new(File.join(File.dirname(__FILE__), '..', 'lib', 'webgen'), '/source/../**/*')
     assert(source.paths.length > 1)
     assert(source.paths.include?(Webgen::Path.new('/source/')))
     assert(source.paths.include?(Webgen::Path.new('/source/filesystem.rb')))

data/test/test_source_resource.rb

@@ -13,9 +13,14 @@ class TestSourceResource < Test::Unit::TestCase
 
   def test_paths
     @website.config['resources']['test-resource'] = ['Webgen::Source::FileSystem', '.', File.basename(__FILE__)]
+    @website.config['resources']['other-resource'] = ['Webgen::Source::FileSystem', '../lib']
+
     source = Webgen::Source::Resource.new('test-*')
     assert_equal(1, source.paths.length)
     assert(source.paths.include?(Webgen::Path.new('/test_source_resource.rb')))
+
+    source = Webgen::Source::Resource.new('other-*', '/webgen/**/*', '/webgen/')
+    assert(source.paths.include?(Webgen::Path.new('/source/resource.rb')))
   end
 
 end

data/test/test_sourcehandler_fragment.rb

@@ -43,15 +43,20 @@ EOF
   def test_create_fragment_nodes
     @obj = Webgen::SourceHandler::Fragment.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
-    node = @obj.create_node(root, path_with_meta_info('hallo.html') {StringIO.new('')})
-    @website.blackboard.add_service(:create_nodes) {|tree, alcn, path, sh| [sh.create_node(tree[alcn], path_with_meta_info(path.path))]}
+    path = path_with_meta_info('hallo.html') {StringIO.new('')}
+    node = @obj.create_node(root, path)
+    @website.blackboard.add_service(:create_nodes, method(:create_nodes_service))
 
-    section = @obj.parse_html_headers(YAML::load(TEST_CONTENT).first['data'])
-    @obj.create_fragment_nodes(section, node, 'true')
+    sections = @obj.parse_html_headers(YAML::load(TEST_CONTENT).first['data'])
+    @obj.create_fragment_nodes(sections, node, path, 'true')
     assert_equal(node, node.resolve('#test').parent)
     assert_equal(node.resolve('#test'), node.resolve('#other').parent)
   end
 
+  def create_nodes_service(tree, alcn, path, sh)
+    [yield(tree[alcn], path_with_meta_info(path.path))]
+  end
+
   def check_sections(sections, valid)
     sections.each do |level, id, title, subsecs|
       assert_equal(valid.shift, [level, id, title])

data/test/test_sourcehandler_page.rb

@@ -3,19 +3,6 @@ require 'helper'
 require 'webgen/sourcehandler/page'
 require 'stringio'
 
-class TestBlock < Test::Unit::TestCase
-
-  def test_render
-    block = Webgen::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 }
-    assert_equal('some content'.reverse + 'content', block.render(context)[:content])
-  end
-
-end
-
-
 class TestSourceHandlerPage < Test::Unit::TestCase
 
   include Test::WebsiteHelper
@@ -32,6 +19,7 @@ class TestSourceHandlerPage < Test::Unit::TestCase
     @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
     @path = path_with_meta_info('/index.page') {StringIO.new('content')}
     @path.meta_info.update({'lang'=>'eo', 'test'=>'yes', 'sort_info'=>6})
+    @website.blackboard.add_service(:source_paths) {{@path.path => @path}}
   end
 
   def test_create_node
@@ -67,4 +55,15 @@ class TestSourceHandlerPage < Test::Unit::TestCase
     assert_raise(RuntimeError) { @obj.render_node(node, 'other') }
   end
 
+  def test_meta_info_changed
+    node = @obj.create_node(@root, @path)
+    @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)
+    assert(node.meta_info_changed?)
+
+    node.dirty_meta_info = false
+    @website.cache.restore(@website.cache.dump)
+    @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)
+    assert(!node.meta_info_changed?)
+  end
+
 end

data/test/test_sourcehandler_template.rb

@@ -34,7 +34,6 @@ class TestSourceHandlerTemplate < Test::Unit::TestCase
     chained_template = Webgen::Node.new(root, 'chained.template', 'chained.template', {'template' => 'other.template'})
     german_file = Webgen::Node.new(root, 'german.html', 'german.page', {'lang' => 'de', 'template' => 'other.template'})
 
-    @website.cache.enable_volatile_cache
     assert_equal([], @obj.templates_for_node(default_template))
     assert_equal([], @obj.templates_for_node(stopped_template))
     assert_equal([default_template], @obj.templates_for_node(other_template))
@@ -42,7 +41,7 @@ class TestSourceHandlerTemplate < Test::Unit::TestCase
     assert_equal([default_template, other_template], @obj.templates_for_node(chained_template))
     assert_equal([default_de_template, other_template], @obj.templates_for_node(german_file))
 
-    @website.cache.volatile[:enabled] = false
+    @website.cache.reset_volatile_cache
     root.tree.delete_node(default_template)
     assert_equal([], @obj.templates_for_node(other_template))
   end

data/test/test_tag_breadcrumbtrail.rb

@@ -41,8 +41,9 @@ class TestTagBreadcrumbTrail < Test::Unit::TestCase
 
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <a href="index.html">Dir11</a> / <span>File111</span>',
                  call(context, ' / ', false, false))
-    assert_equal(Set.new([nodes[:file11_en], nodes[:index_en], nodes[:index11_en], nodes[:dir1], nodes[:dir11], nodes[:root]].map {|n| n.absolute_lcn}),
-                 nodes[:file11_en].node_info[:used_nodes])
+    assert_equal(Set.new([nodes[:file11_en], nodes[:index_en], nodes[:index11_en],
+                          nodes[:dir1], nodes[:dir11], nodes[:root]].map {|n| n.absolute_lcn}),
+                 nodes[:file11_en].node_info[:used_meta_info_nodes])
 
 
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <a href="index.html">Dir11</a> / <span>File111</span>',

data/test/test_tag_executecommand.rb

@@ -1,7 +1,6 @@
 require 'test/unit'
 require 'helper'
 require 'webgen/tag'
-require 'rbconfig'
 
 class TestTagExecuteCommand < Test::Unit::TestCase
 

data/test/test_tag_langbar.rb

@@ -33,6 +33,13 @@ class TestTagLangbar < Test::Unit::TestCase
 
     @obj.set_params('tag.langbar.show_single_lang'=>true, 'tag.langbar.show_own_lang'=>true, 'tag.langbar.separator' => ' --- ')
     assert_equal("#{de_link} --- #{en_link}", @obj.call('langbar', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index_en]])))
+
+    nodes[:index_en].dirty = false
+    @website.blackboard.dispatch_msg(:node_changed?, nodes[:index_en])
+    assert(!nodes[:index_en].dirty)
+    nodes[:index_en].tree.delete_node(nodes[:index_de])
+    @website.blackboard.dispatch_msg(:node_changed?, nodes[:index_en])
+    assert(nodes[:index_en].dirty)
   end
 
   def check_results(node, both_true, both_false, first_false, second_false)

data/test/test_tag_menu.rb

@@ -85,7 +85,7 @@ class TestTagMenu < Test::Unit::TestCase
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
     assert(!nodes[:file11_en].dirty)
 
-    nodes[:index11_en].dirty = true
+    nodes[:index11_en].dirty_meta_info = true
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
     assert(nodes[:file11_en].dirty)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webgen
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Thomas Leitner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-31 00:00:00 +02:00
+date: 2008-08-13 00:00:00 +02:00
 default_executable: webgen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ramaze
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: "2008.06"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rcov
   type: :development
@@ -112,6 +132,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: coderay
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.4.215
+    version: 
 description: webgen is used to generate static websites from templates and content files (which can be written in a markup language). It can generate dynamic content like menus on the fly and comes with many powerful extensions.
 email: t_leitner@gmx.at
 executables: 
@@ -131,6 +171,28 @@ files:
 - bin/webgen
 - data/webgen
 - data/webgen/resources.yaml
+- data/webgen/webgui
+- data/webgen/webgui/controller
+- data/webgen/webgui/controller/main.rb
+- data/webgen/webgui/overrides
+- data/webgen/webgui/overrides/win32console.rb
+- data/webgen/webgui/public
+- data/webgen/webgui/public/css
+- data/webgen/webgui/public/css/jquery.autocomplete.css
+- data/webgen/webgui/public/css/ramaze_error.css
+- data/webgen/webgui/public/css/style.css
+- data/webgen/webgui/public/img
+- data/webgen/webgui/public/img/headerbg.jpg
+- data/webgen/webgui/public/img/webgen_logo.png
+- data/webgen/webgui/public/js
+- data/webgen/webgui/public/js/jquery.autocomplete.js
+- data/webgen/webgui/public/js/jquery.js
+- data/webgen/webgui/view
+- data/webgen/webgui/view/create_website.xhtml
+- data/webgen/webgui/view/error.xhtml
+- data/webgen/webgui/view/index.xhtml
+- data/webgen/webgui/view/manage_website.xhtml
+- data/webgen/webgui/view/page.xhtml
 - data/webgen/website_skeleton
 - data/webgen/website_skeleton/config.yaml
 - data/webgen/website_skeleton/ext
@@ -308,6 +370,7 @@ files:
 - lib/webgen/cli/create_command.rb
 - lib/webgen/cli/run_command.rb
 - lib/webgen/cli/utils.rb
+- lib/webgen/cli/webgui_command.rb
 - lib/webgen/cli.rb
 - lib/webgen/configuration.rb
 - lib/webgen/contentprocessor/blocks.rb