webgen 0.5.7 → 0.5.8

data/Rakefile

@@ -7,6 +7,8 @@ begin
 rescue LoadError
 end
 
+require 'rdoc/task'
+
 begin
   require 'rubyforge'
 rescue LoadError
@@ -17,16 +19,10 @@ begin
 rescue LoadError
 end
 
-begin
-  require 'dcov'
-rescue LoadError
-end
-
 require 'fileutils'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/rdoctask'
 
 $:.unshift('lib')
 require 'webgen/webgentask'
@@ -60,16 +56,23 @@ Webgen::WebgenTask.new('htmldoc') do |site|
                          ['/', "Webgen::Source::FileSystem", 'misc', 'htmldoc.metainfo'],
                          ['/', "Webgen::Source::FileSystem", 'misc', 'htmldoc.virtual'],
                          ['/', "Webgen::Source::FileSystem", 'misc', 'images/**/*']]
+    prefix = "webgen-website-bundle-"
+    config['resources'].select {|name, data| name =~ /^#{prefix}style/}.each do |name, data|
+      config['sources'] <<
+        ["/website_styles/#{name.sub(prefix, '')}", "Webgen::Source::FileSystem", 'misc', 'style.page']
+      config['sources'] <<
+        ["/website_styles/#{name.sub(prefix, '')}", 'Webgen::Source::Resource', name, '/src/**', '/src']
+    end
     config['output'] = ['Webgen::Output::FileSystem', 'htmldoc']
   end
 end
 
-rd = Rake::RDocTask.new do |rdoc|
+rd = RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'htmldoc/rdoc'
   rdoc.title = 'webgen'
-  rdoc.main = 'Webgen'
-  rdoc.options << '--line-numbers' << '--inline-source' << '--promiscuous'
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.main = 'lib/webgen/website.rb'
+  rdoc.options << '--line-numbers' << '--all'
+  rdoc.rdoc_files.include('lib')
 end
 
 tt = Rake::TestTask.new do |test|
@@ -156,23 +159,23 @@ EOF
       #### Dependencies, requirements and files
 
       s.files = PKG_FILES.to_a
-      s.add_dependency('cmdparse', '2.0.2')
+      s.add_dependency('cmdparse', '>= 2.0.2')
       s.add_dependency('maruku', '0.5.9')
-      s.add_dependency('facets', '2.4.3')
-      s.add_dependency('rake', '0.8.3')
-      s.add_dependency('ramaze', '2008.06')
-      s.add_dependency('launchy', '0.3.2')
-      s.add_development_dependency('rcov', '0.8.1.2.0')
-      s.add_development_dependency('dcov', '0.2.2')
-      s.add_development_dependency('rubyforge', '1.0.0')
-      s.add_development_dependency('RedCloth', '3.0.0')
-      s.add_development_dependency('haml', '2.0.1')
-      s.add_development_dependency('builder', '2.1.2')
-      s.add_development_dependency('rdoc', '2.0.0')
-      s.add_development_dependency('coderay', '0.7.4.215')
-      s.add_development_dependency('feedtools', '0.2.29')
-      s.add_development_dependency('erubis', '2.6.2')
-      s.add_development_dependency('rdiscount', '1.2.9')
+      s.add_dependency('facets', '2.4.5')
+      s.add_development_dependency('rake', '>= 0.8.3')
+      s.add_development_dependency('ramaze', '>= 2009.04')
+      s.add_development_dependency('launchy', '>= 0.3.2')
+      s.add_development_dependency('rcov', '>= 0.8.1.2.0')
+      s.add_development_dependency('rubyforge', '>= 1.0.0')
+      s.add_development_dependency('RedCloth', '>= 4.1.9')
+      s.add_development_dependency('haml', '>= 2.0.9')
+      s.add_development_dependency('builder', '>= 2.1.0')
+      s.add_development_dependency('rdoc', '>= 2.4.2')
+      s.add_development_dependency('coderay', '>= 0.7.4.214')
+      s.add_development_dependency('feedtools', '>= 0.2.29')
+      s.add_development_dependency('erubis', '>= 2.6.2')
+      s.add_development_dependency('rdiscount', '>= 1.2.9')
+      s.add_development_dependency('archive-tar-minitar', '>= 0.5.2')
 
       s.require_path = 'lib'
 
@@ -182,7 +185,7 @@ EOF
       #### Documentation
 
       s.has_rdoc = true
-      s.rdoc_options = ['--line-numbers', '--inline-source', '--promiscuous', '--main', 'Webgen']
+      s.rdoc_options = ['--line-numbers', '--all', '--main', 'lib/webgen/website.rb']
 
       #### Author and project details
 
@@ -273,6 +276,13 @@ The official version is called 'webgen' and can be installed via
                             ['/', "Webgen::Source::FileSystem", '../misc', 'default.css'],
                             ['/documentation/', "Webgen::Source::FileSystem", '../misc', 'htmldoc.virtual'],
                             ['/', "Webgen::Source::FileSystem", '../misc', 'images/**/*']]
+      prefix = "webgen-website-bundle-"
+      config['resources'].select {|name, data| name =~ /^#{prefix}style/}.each do |name, data|
+        config['sources'] <<
+          ["/documentation/website_styles/#{name.sub(prefix, '')}", "Webgen::Source::FileSystem", '../misc', 'style.page']
+        config['sources'] <<
+          ["/documentation/website_styles/#{name.sub(prefix, '')}", 'Webgen::Source::Resource', name, '/src/**', '/src']
+      end
     end
   end
 
@@ -302,15 +312,6 @@ The official version is called 'webgen' and can be installed via
     end
   end
 
-  if defined? Dcov
-    desc "Analyze documentation coverage"
-    task :dcov do
-      class Dcov::Analyzer; def generate; end; end
-      class NilClass; def file_absolute_name; nil; end; end
-      Dcov::Analyzer.new(:path => Dir.getwd, :files => Dir.glob('lib/**'))
-    end
-  end
-
   EXCLUDED_FOR_TESTS=FileList.new(['lib/webgen/cli{*,**/*}', 'lib/webgen/version.rb',
                                    'lib/webgen/output.rb', 'lib/webgen/source.rb',
                                    'lib/webgen/tag.rb', 'lib/webgen/default_config.rb',

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/data/webgen/resources.yaml

@@ -1,3 +1,3 @@
 website_skeleton:    webgen-website-skeleton
-website_styles/*:    webgen-website-style-$basename
-website_templates/*: webgen-website-template-$basename
+website_bundles/style/*: webgen-website-bundle-style-$basename
+website_bundles/default: webgen-website-bundle-default

data/data/webgen/webgui/app.rb

@@ -0,0 +1,11 @@
+# This file contains your application, it requires dependencies and necessary
+# parts of the application.
+#
+# It will be required from either `config.ru` or `start.rb`
+
+# Add the directory this file resides in to the load path, so you can run the
+# app from any other working directory
+$LOAD_PATH.unshift(__DIR__)
+
+# Initialize controllers and models
+require 'controller/main'

data/data/webgen/webgui/controller/main.rb

@@ -34,19 +34,26 @@ class MemoryOutput
 
 end
 
+
 class MainController < Ramaze::Controller
 
-  layout '/page'
+  layout(:default) {|name, wish| !["path_autocomplete", "preview_website", "preview_website_bundles"].include?(name)}
+  helper :xhtml
+  engine :Etanni
+
+  def initialize
+    @title = 'webgen webgui'
+  end
 
   def site_ops
     session['website_dir'] = request['website_dir'].to_s
 
     if File.directory?(session['website_dir'])
-      redirect R(:manage_website)
+      redirect r(:manage_website)
     elsif session['website_dir']
-      redirect R(:create_website)
+      redirect r(:create_website)
     else
-      redirect R('/')
+      redirect r('/')
     end
   end
 
@@ -57,7 +64,6 @@ class MainController < Ramaze::Controller
       ''
     end
   end
-  deny_layout :path_autocomplete
 
   def manage_website
     if request['render_site'] && session['website_dir']
@@ -77,37 +83,29 @@ class MainController < Ramaze::Controller
     ws = Webgen::Website.new(session['website_dir'])
     ws.init
     ws.execute_in_env do
-      oi = ws.blackboard.invoke(:output_instance)
-      path = File.join(*args)
-      response.header["Content-Type"] =  Ramaze::Tool::MIME.trait[:types][File.extname(path)].to_s
-      response.header['Cache-Control'] = 'no-store'
-      response.header['Pragma'] = 'no-cache'
-      response.body = (oi.read(path) rescue '')
-      throw(:respond)
+      send_preview_file(args, ws.blackboard.invoke(:output_instance))
     end
   end
 
   def create_website
-    @cur_style = request['website_style'] || @cur_style || '1024px'
-    @cur_template = request['website_template'] || @cur_template || 'default'
+    @cur_bundle = request['website_bundle'] || @cur_bundle || 'style-andreas07'
 
     if request['create_site']
       wm = Webgen::WebsiteManager.new(session['website_dir'])
       wm.create_website
-      wm.apply_template(@cur_template)
-      wm.apply_style(@cur_style)
+      wm.apply_bundle('default')
+      wm.apply_bundle(@cur_bundle)
 
-      redirect R(:manage_website)
+      redirect r(:manage_website)
     else
       wm = Webgen::WebsiteManager.new(session['website_dir'])
-      @templates = wm.templates.keys.sort
-      @styles = wm.styles.keys.select {|k| k =~ /^website-|[^-]+/ }.sort
+      @bundles = wm.bundles.keys.sort
 
-      if !@cur_style.nil? && !@cur_template.nil?
+      if !@cur_bundle.nil?
         ws = Webgen::Website.new('unknown', nil) do |config|
           config['sources'] = [
-                               ['/', 'Webgen::Source::Resource', 'webgen-website-template-' + @cur_template, '/src/**', '/src'],
-                               ['/', 'Webgen::Source::Resource', 'webgen-website-style-' + @cur_style, '/src/**', '/src']
+                               ['/', 'Webgen::Source::Resource', 'webgen-website-bundle-default', '/src/**', '/src'],
+                               ['/', 'Webgen::Source::Resource', 'webgen-website-bundle-' + @cur_bundle, '/src/**', '/src']
                               ]
           config['output'] = ['MemoryOutput']
           config['website.cache'] = [:memory, '']
@@ -118,14 +116,20 @@ class MainController < Ramaze::Controller
     end
   end
 
-  def preview_style_and_template(*args)
+  def preview_website_bundles(*args)
     throw(:respond) unless session['create_website_preview']
+    send_preview_file(args, session['create_website_preview'])
+  end
+
+  def send_preview_file(args, oi)
     path = File.join(*args)
-    response.header["Content-Type"] = Ramaze::Tool::MIME.trait[:types][File.extname(path)].to_s
+    path += ".html" if path !~ /\.\w+$/
+    response.header["Content-Type"] = Rack::Mime.mime_type(File.extname(path)).to_s
     response.header['Cache-Control'] = 'no-store'
     response.header['Pragma'] = 'no-cache'
-    response.body = session['create_website_preview'].read(path)
-    throw(:respond)
+    response.body = [(oi.read(path) rescue '')]
+    throw(:respond, response)
   end
+  private :send_preview_file
 
 end

data/data/webgen/webgui/{view/page.xhtml → layout/default.xhtml}

@@ -7,24 +7,24 @@
     <meta http-equiv="Content-Style-Type" content="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <link href="#{R '/css/style.css'}" rel="stylesheet" type="text/css" />
-    <link href="#{R '/css/jquery.autocomplete.css'}" rel="stylesheet" type="text/css" />
+    <link href="#{r '/css/style.css'}" rel="stylesheet" type="text/css" />
+    <link href="#{r '/css/jquery.autocomplete.css'}" rel="stylesheet" type="text/css" />
 
-    <script type='text/javascript' src="#{R '/js/jquery.js'}"></script>
-    <script type='text/javascript' src="#{R '/js/jquery.autocomplete.js'}"></script>
+    <script type='text/javascript' src="#{r '/js/jquery.js'}"></script>
+    <script type='text/javascript' src="#{r '/js/jquery.autocomplete.js'}"></script>
     <script type='text/javascript'>
       $(document).ready(function() {
-      $("#website_dir").autocomplete('#{R MainController, :path_autocomplete}');
+      $("#website_dir").autocomplete('#{r :path_autocomplete}');
       });
     </script>
   </head>
   <body>
     <div id="header">
-      <img src="#{R '/img/webgen_logo.png'}" alt='logo' />
-      <h2><a href="#{R '/'}">webgen <span>webgui</span></a></h2>
+      <img src="#{r '/img/webgen_logo.png'}" alt='logo' />
+      <h2><a href="#{r '/'}">webgen <span>webgui</span></a></h2>
 
       <div id='site-select-form'>
-        <form method='post' action='#{R MainController, :site_ops}'>
+        <form method='post' action='#{r :site_ops}'>
           <p>
             <input type='text' id='website_dir' name='website_dir' value='#{session["website_dir"]}' size="70" />
             <input type='submit' id='set_site' name='set_site' value='Set website directory' />

data/data/webgen/webgui/start.rb

@@ -0,0 +1,9 @@
+# Use this file directly like `ruby start.rb` if you don't want to use the
+# `ramaze start` command.
+# All application related things should go into `app.rb`, this file is simply
+# for options related to running the application locally.
+
+require 'ramaze'
+require File.expand_path('app', File.dirname(__FILE__))
+
+Ramaze.start(:adapter => :webrick, :port => 7000, :file => __FILE__)

data/data/webgen/webgui/view/create_website.xhtml

@@ -1,22 +1,14 @@
-<form method='post' action='#{R :create_website}'>
+<form method='post' action='#{r :create_website}'>
   <p>
-    Choose a <label for="website_style">style:</label>
-    <select name="website_style" id="website_style">
-      <?r for style in @styles ?>
-      <option #{style == @cur_style ? selected='selected' : ''}>#{style}</option>
+    Choose a <label for="website_style">website bundle:</label>
+    <select name="website_bundle" id="website_bundle">
+      <?r for bundle in @bundles ?>
+      <option #{bundle == @cur_bundle ? selected='selected' : ''}>#{bundle}</option>
       <?r end ?>
     </select>
-
-    and a <label for="website_template">template:</label>
-    <select name="website_template" id="website_template">
-      <?r for template in @templates ?>
-      <option #{template == @cur_template ? selected='selected' : ''}>#{template}</option>
-      <?r end ?>
-    </select>
-
     <input type='submit' id='preview_site' name='preview_site' value='Preview website' />
     <input type='submit' id='create_site' name='create_site' value='Create website' />
   </p>
 </form>
 
-<object type='text/html' data='#{R :preview_style_and_template, "/index.html"}' width='100%' height='600px' style='border: 1px solid black' />
+<object type='text/html' data='#{r :preview_website_bundles, "/index.html"}' width='100%' height='600px' style='border: 1px solid black' />

data/data/webgen/webgui/view/manage_website.xhtml

@@ -1,4 +1,4 @@
-<form method='post' action='#{R :manage_website}'>
+<form method='post' action='#{r :manage_website}'>
   <p>
     <label for='verbosity'>Verbosity:
     <select id='verbosity' name='verbosity'>
@@ -15,4 +15,4 @@
   <pre>#{CGI::escapeHTML(@log.to_s)}</pre>
 </div>
 
-<object id='website_preview' type='text/html' data='#{R :preview_website, "/index.html"}' width='100%' height='600px' style='border: 1px solid black' />
+<object id='website_preview' type='text/html' data='#{r :preview_website, "/index.html"}' width='100%' height='600px' style='border: 1px solid black' />

data/data/webgen/website_bundles/default/README

@@ -0,0 +1,6 @@
+description:
+  This is the default website bundle. It only contains a sample index page sothat something is shown
+  after a new website is created.
+
+author:
+  Thomas Leitner

data/data/webgen/website_bundles/default/src/index.page

@@ -0,0 +1,15 @@
+---
+title: Empty Index Page
+in_menu: true
+routed_title: New webgen Website
+---
+## Welcome to *webgen*!
+
+This is just a place holder for the start page for your new website!
+
+You can start by adjusting the meta information for this page file and adding some real content and
+then adding some more page files!
+
+For more information about webgen have a look at the [documentation]!
+
+[documentation]: http://webgen.rubyforge.org/documentation/index.html