webby 0.5.1 → 0.6.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.6.0 / 
+
+* Added support for embedded graphviz images and image maps
+* Tidy can be used as a filter to format HTML and check for errors
+* Simplified coderay when used with textile
+
 == 0.5.1 / 2007-11-29
 
 * Growl notifications now work on Leopard / Tiger

data/Manifest.txt

@@ -30,8 +30,10 @@ data/templates/page.erb
 lib/webby.rb
 lib/webby/auto_builder.rb
 lib/webby/builder.rb
-lib/webby/coderay_filter.rb
 lib/webby/file.rb
+lib/webby/filters/coderay.rb
+lib/webby/filters/graphviz.rb
+lib/webby/filters/tidy.rb
 lib/webby/main.rb
 lib/webby/pages_db.rb
 lib/webby/renderer.rb

data/data/Rakefile

@@ -1,5 +1,4 @@
 
-require 'webby'
 load 'tasks/setup.rb'
 
 task :default => :build

data/data/tasks/create.rake

@@ -1,13 +1,4 @@
 
-require 'webby'
-
-Rake::WebbyTask.new do |webby|
-  webby.content_dir   = SITE.content_dir
-  webby.output_dir    = SITE.output_dir
-  webby.layout_dir    = SITE.layout_dir
-  webby.template_dir  = SITE.template_dir
-  webby.exclude       = SITE.exclude
-  webby.page_defaults = SITE.page_defaults
-end
+Rake::WebbyTask.new
 
 # EOF

data/data/tasks/setup.rb

@@ -1,8 +1,9 @@
 
-require 'ostruct'
+require 'webby'
 
-SITE = OpenStruct.new
+SITE = Webby.site
 
+# Webby defaults
 SITE.content_dir   = 'content'
 SITE.output_dir    = 'output'
 SITE.layout_dir    = 'layouts'
@@ -14,12 +15,18 @@ SITE.page_defaults = {
   'layout'    => 'default'
 }
 
+# Items used to deploy the webiste
 SITE.host       = 'user@hostname.tld'
 SITE.remote_dir = '/not/a/valid/dir'
 SITE.rsync_args = %w(-av --delete)
 
+# Options passed to the 'tidy' program when the tidy filter is used
+SITE.tidy_options = '-indent -wrap 80'
+
+# Load up the other rake tasks
 FileList['tasks/*.rake'].each {|task| import task}
 
+# Conditional dependencies
 %w(heel).each do |lib|
   Object.instance_eval {const_set "HAVE_#{lib.upcase}", try_require(lib)}
 end

data/lib/webby.rb

@@ -1,6 +1,7 @@
-# $Id: webby.rb 51 2007-11-29 06:01:26Z tim_pease $
+# $Id: webby.rb 60 2007-12-04 05:05:50Z tim_pease $
 
 require 'logging'
+require 'ostruct'
 
 # Configure Webby to log to STDOUT at the 'info' level
 Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
@@ -13,7 +14,7 @@ Logging::Logger['Webby'].level = :info
 
 module Webby
 
-  VERSION = '0.5.1'   # :nodoc:
+  VERSION = '0.6.0'   # :nodoc:
 
   # Path to the Webby package
   PATH = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..'))
@@ -37,30 +38,27 @@ module Webby
   end
 
   # call-seq:
-  #    Webby.config    => hash
+  #    Webby.site    => struct
   #
-  # Returns the configuration hash for the Webby application.
+  # Returns a struct containing the configuration parameters for the 
+  # Webby site. These defaults should be overridden as needed in the
+  # site specific Rakefile.
   #
-  def self.config
-    @config ||= {
-      'output_dir'    => 'output',
-      'content_dir'   => 'content',
-      'layout_dir'    => 'layouts',
-      'template_dir'  => 'templates',
-      'exclude'       => %w(tmp$ bak$ ~$ CVS \.svn)
-    }
-  end
-
-  # call-seq:
-  #    Webby.page_defaults    => hash
-  #
-  # Returns the page defaults hash used for page resource objects.
-  #
-  def self.page_defaults
-    @page_defaults ||= {
+  def self.site
+    return @site if defined? @site
+
+    @site = OpenStruct.new
+    @site.output_dir    = 'output'
+    @site.content_dir   = 'content'
+    @site.layout_dir    = 'layouts'
+    @site.template_dir  = 'templates'
+    @site.exclude       = %w(tmp$ bak$ ~$ CVS \.svn)
+    @site.page_defaults = {
       'extension' => 'html',
       'layout'    => 'default'
     }
+
+    @site
   end
 
   # call-seq
@@ -71,7 +69,7 @@ module Webby
   # also used to exclude layouts.
   #
   def self.exclude
-    @exclude ||= Regexp.new(config['exclude'].join('|'))
+    @exclude ||= Regexp.new(site.exclude.join('|'))
   end
 
   # call-seq:
@@ -82,7 +80,7 @@ module Webby
   # modification time of the file is important.
   #
   def self.cairn
-    @cairn ||= File.join(config['output_dir'], '.cairn')
+    @cairn ||= File.join(site.output_dir, '.cairn')
   end
 
 end  # module Webby

data/lib/webby/auto_builder.rb

@@ -1,4 +1,4 @@
-# $Id: auto_builder.rb 40 2007-10-14 03:54:36Z tim_pease $
+# $Id: auto_builder.rb 60 2007-12-04 05:05:50Z tim_pease $
 
 require 'directory_watcher'
 
@@ -34,8 +34,8 @@ class AutoBuilder
     @watcher.add_observer self
 
     glob = []
-    glob << File.join(::Webby.config['layout_dir'], '**', '*')
-    glob << File.join(::Webby.config['content_dir'], '**', '*')
+    glob << File.join(::Webby.site.layout_dir, '**', '*')
+    glob << File.join(::Webby.site.content_dir, '**', '*')
     @watcher.glob = glob
   end
 

data/lib/webby/builder.rb

@@ -1,4 +1,4 @@
-# $Id: builder.rb 46 2007-11-27 03:31:29Z tim_pease $
+# $Id: builder.rb 60 2007-12-04 05:05:50Z tim_pease $
 
 require 'find'
 require 'fileutils'
@@ -150,7 +150,7 @@ class Builder
 
   %w(output_dir layout_dir content_dir).each do |key|
     self.class_eval <<-CODE
-      def #{key}( ) ::Webby.config['#{key}'] end
+      def #{key}( ) ::Webby.site.#{key} end
     CODE
   end
 

data/lib/webby/{coderay_filter.rb → filters/coderay.rb}

@@ -1,12 +1,13 @@
-# $Id: coderay_filter.rb 27 2007-09-18 18:09:25Z tim_pease $
+# $Id: coderay.rb 58 2007-12-02 23:59:27Z tim_pease $
 
 require 'enumerator'
 require 'hpricot'
 try_require 'coderay'
 
 module Webby
+module Filters  
 
-# The CodeRayFilter applies syntax highlighting to source code embedded in a
+# The CodeRay applies syntax highlighting to source code embedded in a
 # webpage. The CodeRay highlighting engine is used for the HTML markup of
 # the source code. A set of <coderay>...</coderay> tags is used to denote
 # which sections of the page should be highlighted.
@@ -21,7 +22,7 @@ module Webby
 #    end
 #    </coderay>
 #    
-#  The supported CodeRay options are the following:
+# The supported CodeRay options are the following:
 #
 #    lang               : the language to highlight (ruby, c, html, ...)
 #    line_numbers       : include line nubers in 'table', 'inline',
@@ -30,15 +31,16 @@ module Webby
 #    bold_every         : make every n-th number appear bold
 #    tab_width          : convert tab characters to n spaces
 #     
-class CodeRayFilter
+class CodeRay
 
   # call-seq:
-  #    CodeRayFilter.new( string )
+  #    CodeRay.new( string, filters = nil )
   #
   # Creates a new CodeRay filter that will operate on the given _string_.
   #
-  def initialize( str )
+  def initialize( str, filters = nil )
     @str = str
+    @filters = filters
   end
 
   # call-seq:
@@ -66,15 +68,25 @@ class CodeRayFilter
 
       #cr.swap(CodeRay.scan(text, lang).html(opts).div)
       out = "<div class=\"CodeRay\"><pre>\n"
-      out << CodeRay.scan(text, lang).html(opts)
+      out << ::CodeRay.scan(text, lang).html(opts)
       out << "\n</pre></div>"
+
+      @filters.each do |f|
+        case f
+        when 'textile'
+          out.insert 0, "<notextile>\n"
+          out << "\n</notextile>"
+        end
+      end unless @filters.nil?
+
       cr.swap out
     end
 
     doc.to_html
   end
 
-end  # class CodeRayFilter
+end  # class CodeRay
+end  # module Filters
 end  # module Webby
 
 # EOF

data/lib/webby/filters/graphviz.rb

@@ -0,0 +1,175 @@
+# $Id: graphviz.rb 61 2007-12-04 05:48:23Z tim_pease $
+
+require 'hpricot'
+require 'fileutils'
+require 'tempfile'
+
+module Webby
+module Filters
+
+# The Graphviz filter processes DOT scripts in a webpage and replaces them
+# with generated image files. A set of <graphviz>...</graphviz> tags is
+# used to denote which section(s) of the page contains DOT scripts.
+#
+# Options can be passed to the Graphviz filter using attributes in the
+# <graphviz> tag.
+#
+#     <graphviz path="images" type="gif" cmd="dot">
+#     digraph graph_1 {
+#       graph [URL="default.html"]
+#       a [URL="a.html"]
+#       b [URL="b.html"]
+#       c [URL="c.html"]
+#       a -> b -> c
+#       a -> c
+#     }
+#     </graphviz>
+#
+# If the DOT script contains *URL* or *href* statements on any of the nodes
+# or edges, then an image map will be generated and the image will be
+# "clikcable" in the webpage. If *URL* or *href* statements do not appear in
+# the DOT script, then a regular image will be inserted into the webpage.
+#
+# The image is inserted into the page using an HTML <img /> tag. A
+# corresponding <map>...</map> element will be inserted if needed.
+#
+# The supported Graphviz options are the following:
+#
+#    path     : where generated images will be stored
+#               [default is "/"]
+#    type     : the type of image to generate (png, jpeg, gif)
+#               [default is png]
+#    cmd      : the Graphviz command to use when generating images
+#               (dot, neato, twopi, circo, fdp) [default is dot]
+#
+#    the following options are passed as-is to the generated <img /> tag
+#    style    : CSS styles to apply to the <img />
+#    class    : CSS class to apply to the <img />
+#    id       : HTML identifier
+#    alt      : alternate text for the <img />
+#
+class Graphviz
+
+  class Error < StandardError; end    # :nodoc:
+
+  # call-seq:
+  #    Graphviz.new( string, filters = nil )
+  #
+  # Creates a new Graphviz filter that will operate on the given _string_.
+  # The optional _filters_ describe filters that will be applied to the
+  # output string returned by the Graphviz filter.
+  #
+  def initialize( str, filters = nil )
+    @log = ::Logging::Logger[self]
+    @str = str
+    @filters = filters
+
+    # create a temporary file for holding any error messages
+    # from the graphviz program
+    @err = Tempfile.new('graphviz_err')
+    @err.close
+  end
+
+  # call-seq:
+  #    to_html    => string
+  #
+  # Process the original text string passed to the filter when it was
+  # created and output HTML formatted text. Any text between
+  # <graphviz>...</graphviz> tags will have the contained DOT syntax
+  # converted into an image and then included into the resulting HTML text.
+  #
+  def to_html
+    doc = Hpricot(@str)
+    doc.search('//graphviz') do |gviz|
+      
+      text = gviz.inner_html.strip   # the DOT script to process
+      path = gviz['path']
+      cmd  = gviz['cmd'] || 'dot'
+      type = gviz['type'] || 'png'
+
+      %x[#{cmd} -V 2>&1]
+      unless 0 == $?.exitstatus
+        raise NameError, "'#{cmd}' not found on the path"
+      end
+
+      # pull the name of the graph|digraph out of the DOT script
+      name = text.match(%r/\A\s*(?:strict\s+)?(?:di)?graph\s+([A-Za-z_][A-Za-z0-9_]*)\s+\{/o)[1]
+
+      # see if the user includes any URL or href attributes
+      # if so, then we need to create an imagemap
+      usemap = text.match(%r/(?:URL|href)\s*=/o) != nil
+
+      # generate the image filename based on the path, graph name, and type
+      # of image to generate
+      image_fn = path.nil? ? name.dup : File.join(path, name)
+      image_fn << '.' << type
+
+      # create the HTML img tag
+      out = "<img src=\"#{image_fn}\""
+
+      %w[class style id alt].each do |attr|
+        next if gviz[attr].nil?
+        out << " %s=\"%s\"" % [attr, gviz[attr]]
+      end
+
+      out << " usemap=\"#{name}\"" if usemap
+      out << " />\n"
+
+      # generate the image map if needed
+      if usemap
+        IO.popen("#{cmd} -Tcmapx 2> #{@err.path}", 'r+') do |io|
+          io.write text
+          io.close_write
+          out << io.read
+        end
+        error_check
+      end
+
+      # generate the image using graphviz -- but first ensure that the
+      # path exists
+      out_dir = ::Webby.site.output_dir
+      out_file = File.join(out_dir, image_fn)
+      FileUtils.mkpath(File.join(out_dir, path)) unless path.nil?
+      cmd = "#{cmd} -T#{type} -o #{out_file} 2> #{@err.path}"
+
+      IO.popen(cmd, 'w') {|io| io.write text}
+      error_check
+
+      # see if we need to put some guards around the output
+      # (specifically for textile)
+      @filters.each do |f|
+        case f
+        when 'textile'
+          out.insert 0, "<notextile>\n"
+          out << "\n</notextile>"
+        end
+      end unless @filters.nil?
+
+      gviz.swap out
+    end
+
+    doc.to_html
+  end
+
+
+  private
+
+  # call-seq:
+  #    error_check
+  #
+  # Check the temporary error file to see if it contains any error messages
+  # from the graphviz program. If it is not empty, then read the contents
+  # and log an error message and raise an exception.
+  #
+  def error_check
+    if File.size(@err.path) != 0
+      @log.error File.read(@err.path).strip
+      raise Error
+    end
+  end
+
+end  # class Graphviz
+end  # module Filters
+end  # module Webby
+
+# EOF

data/lib/webby/filters/tidy.rb

@@ -0,0 +1,71 @@
+# $Id: tidy.rb 61 2007-12-04 05:48:23Z tim_pease $
+
+require 'fileutils'
+require 'tempfile'
+
+module Webby
+module Filters
+
+# The Tidy filter is used to process HTML (or XHTML) through the _tidy_
+# program and outpu nicely formatted and correct HTML (or XHTML).
+#
+# Options can be passed to the _tidy_ program via the
+# <code>Webby.site</code> struct. Setting the +tidy_options+ to the string
+# of desired options will do the trick.
+#
+# From a project's Rakefile, include the following line (or one that's more
+# to your liking):
+#
+#    SITE.tidy_options = "-indent -wrap 80 -utf8"
+#
+class Tidy
+
+  class Error < StandardError; end    # :nodoc:
+
+  # call-seq:
+  #    Tidy.new( html )
+  #
+  # Create a new filter that will process the given _html_ through the tidy
+  # program.
+  #
+  def initialize( str )
+    @log = ::Logging::Logger[self]
+    @str = str
+
+    # create a temporary file for holding any error messages
+    # from the tidy program
+    @err = Tempfile.new('tidy_err')
+    @err.close
+  end
+
+  # call-seq:
+  #    process    => formatted html
+  #
+  # Process the original HTML text string passed to the filter when it was
+  # created and output Tidy formatted HTML or XHTML.
+  #
+  def process
+    %x[tidy -v 2>&1]
+    unless 0 == $?.exitstatus
+      raise NameError, "'tidy' not found on the path"
+    end
+
+    cmd = "tidy %s -q -f #{@err.path}" % ::Webby.site.tidy_options
+    out = IO.popen(cmd, 'r+') do |tidy|
+      tidy.write @str
+      tidy.close_write
+      tidy.read
+    end
+
+    if File.size(@err.path) != 0
+      @log.warn File.read(@err.path).strip
+    end
+
+    return out
+  end
+
+end  # class Tidy
+end  # module Filters
+end  # module Webby
+
+# EOF

data/lib/webby/renderer.rb

@@ -1,4 +1,4 @@
-# $Id: renderer.rb 51 2007-11-29 06:01:26Z tim_pease $
+# $Id: renderer.rb 61 2007-12-04 05:48:23Z tim_pease $
 
 require 'erb'
 try_require 'bluecloth'
@@ -160,8 +160,9 @@ class Renderer
   #
   def markdown_filter( str )
     BlueCloth.new(str).to_html
-  rescue NameError
+  rescue NameError => err
     @log.error 'markdown filter failed (BlueCloth not installed?)'
+    @log.debug err
     exit
   end
 
@@ -169,17 +170,57 @@ class Renderer
   #
   def textile_filter( str )
     RedCloth.new(str).to_html
-  rescue NameError
+  rescue NameError => err
     @log.error 'textile filter failed (RedCloth not installed?)'
+    @log.debug err
     exit
   end
 
   # Render text via the CodeRay syntax highlighter library.
   #
   def coderay_filter( str )
-    CodeRayFilter.new(str).to_html
-  rescue NameError
+    filters = nil
+
+    if Array === @page.filter
+      idx = @page.filter.index('coderay') + 1
+      filters = @page.filter.slice(idx..-1)
+    end
+
+    Filters::CodeRay.new(str, filters).to_html
+  rescue NameError => err
     @log.error 'coderay filter failed (CodeRay not installed?)'
+    @log.debug err
+    exit
+  end
+
+  # Render text into iamges via the Graphviz programs.
+  #
+  def graphviz_filter( str )
+    filters = nil
+
+    if Array === @page.filter
+      idx = @page.filter.index('graphviz') + 1
+      filters = @page.filter.slice(idx..-1)
+    end
+
+    Filters::Graphviz.new(str, filters).to_html
+  rescue NameError => err
+    @log.error 'graphviz filter failed (Graphviz not installed?)'
+    @log.debug err
+    exit
+  rescue Filters::Graphviz::Error
+    exit
+  end
+
+  # Render html into html/xhtml via the Tidy program
+  #
+  def tidy_filter( str )
+    Filters::Tidy.new(str).process
+  rescue NameError => err
+    @log.error 'tidy filter failed (Tidy not installed?)'
+    @log.debug err
+    exit
+  rescue Filters::Tidy::Error
     exit
   end
 
@@ -190,8 +231,9 @@ class Renderer
     opts[:locals] ||= {}
     opts[:locals].merge!({:page => @page, :pages => @pages})
     Haml::Engine.new(str, opts).to_html
-  rescue NameError
+  rescue NameError => err
     @log.error 'haml filter failed (Haml not installed?)'
+    @log.debug err
     exit
   end
 
@@ -200,8 +242,9 @@ class Renderer
   def sass_filter( str )
     opts = @page.sass_options || {}
     Sass::Engine.new(str, opts).render
-  rescue NameError
+  rescue NameError => err
     @log.error 'sass filter failed (Haml not installed?)'
+    @log.debug err
     exit
   end
 

data/lib/webby/resource.rb

@@ -1,4 +1,4 @@
-# $Id: resource.rb 51 2007-11-29 06:01:26Z tim_pease $
+# $Id: resource.rb 61 2007-12-04 05:48:23Z tim_pease $
 
 module Webby
 
@@ -77,7 +77,7 @@ class Resource
     @have_mdata = !@mdata.nil?
 
     @mdata ||= {}
-    @mdata = ::Webby.page_defaults.merge(@mdata) if is_page?
+    @mdata = ::Webby.site.page_defaults.merge(@mdata) if is_page?
     @mdata.sanitize!
 
     self.class.pages << self if is_page? or is_static?
@@ -147,7 +147,7 @@ class Resource
     @dest = if @mdata.has_key? 'destination' then @mdata['destination']
             else File.join(dir, filename) end
 
-    @dest = File.join(::Webby.config['output_dir'], @dest)
+    @dest = File.join(::Webby.site.output_dir, @dest)
     @dest << @number.to_s if @number
     @dest << '.'
     @dest << extension
@@ -155,17 +155,17 @@ class Resource
   end
 
   # call-seq
-  #    href    => string or nil
+  #    url    => string or nil
   #
-  # Returns a string suitable for use as an href linking to this page. Nil
+  # Returns a string suitable for use as a URL linking to this page. Nil
   # is returned for layouts.
   #
-  def href
+  def url
     return nil if is_layout?
-    return @href if defined? @href and @href
+    return @url if defined? @url and @url
 
-    @href = destination.sub(::Webby.config['output_dir'], '')
-    @href
+    @url = destination.sub(::Webby.site.output_dir, '')
+    @url
   end
 
   # call-seq:
@@ -212,7 +212,7 @@ class Resource
   #
   def is_layout?
     @is_layout ||=
-        !(%r/\A(?:\.\/|\/)?#{::Webby.config['layout_dir']}\//o =~ @path).nil?
+        !(%r/\A(?:\.\/|\/)?#{::Webby.site.layout_dir}\//o =~ @path).nil?
   end
 
   # call-seq:

data/lib/webby/webby_task.rb

@@ -1,4 +1,4 @@
-# $Id: webby_task.rb 15 2007-08-25 19:05:39Z tim_pease $
+# $Id: webby_task.rb 60 2007-12-04 05:05:50Z tim_pease $
 
 begin
   require 'rake'
@@ -33,24 +33,6 @@ module Rake
 #
 class WebbyTask < TaskLib
 
-  # Define a setter and getter for each key in the Webby configuration hash
-  ::Webby.config.keys.each do |key|
-    self.class_eval do
-      define_method(key) {::Webby.config[key]}
-      define_method(key+'=') {|val| ::Webby.config[key] = val}
-    end
-  end
-
-  # Global page attributes
-  def page_defaults
-    ::Webby.page_defaults
-  end
-
-  # Merge the given _hash_ with the page defaults hash
-  def page_defaults=( hash )
-    ::Webby.page_defaults.merge! hash
-  end
-
   # call-seq:
   #    WebbyTask.new {|self| block}
   #
@@ -92,15 +74,15 @@ class WebbyTask < TaskLib
   # task for creating a new page based on that template.
   #
   def define_create_tasks
-    FileList["#{template_dir}/*"].each do |template|
+    FileList["#{::Webby.site.template_dir}/*"].each do |template|
       name = template.pathmap '%n'
 
-      desc "create a new #{name} page"
+      desc "create a new #{name}"
       task name do |t|
         raise "Usage:  rake #{t.name} path" unless ARGV.length == 2
 
         page = t.application.top_level_tasks.pop
-        page = File.join(content_dir, page)
+        page = File.join(::Webby.site.content_dir, page)
         page << '.txt' if File.extname(page).empty?
 
         ::Webby::Builder.create page, :from => template

data/website/Rakefile

@@ -1,5 +1,4 @@
 
-require 'webby'
 load 'tasks/setup.rb'
 
 task :default => :build

data/website/content/index.txt

@@ -15,8 +15,10 @@ gem install webby
 
 h2. Features
 
-* choose your templating language: *eRuby*, *Textile*, *Markdown*, *HAML*
+* choose your templating language: *eRuby*, *Textile*, *Markdown*, *HAML*, *SASS*
 * support for "CodeRay":http://coderay.rubychan.de/ syntax highlighting
+* embeddable DOT scripts for "Graphviz":http://www.graphviz.org/ graphs
+* automatically clean up generated content using "Tidy":http://tidy.sourceforge.net/
 * quick and speedy - only builds pages that have changed
 * deploy anywhere - it's just HTML, no special server stuff required
 * happy "rake":http://docs.rubyrake.org/ tasks for deploying your website to a server

data/website/content/manual.txt

@@ -3,19 +3,46 @@ title:      Manual
 created_at: Wed Aug 29 08:57:00 -0600 2007
 filter:
   - coderay
+  - graphviz
   - textile
 --- 
+<graphviz path="images" alt="test image">
+digraph my_graph {
+   // order all the nodes from Left to Right
+   rankdir=LR;
+
+   // defaults for each node in the graph
+   node [shape=rect,
+         style=filled,
+         fillcolor="#99CCCC",
+         fontname="Verdana",
+         fontsize=10];
+
+   // defaults for each edge in the graph
+   edge [fontname="Verdana", fontsize=8];
+
+   // the graph
+   a [URL="/index.html", label="Home"];
+   b [URL="/download.html", label="Download"];
+   c [URL="/tutorial.html", label="Tutorial"];
+   d [label="Manual", fillcolor="#6699CC"];
+   e [URL="/tips_and_tricks.html", label="Tips &\nTricks"];
+
+   a -> b -> c;
+   c -> d -> e;
+   a -> c [URL="http://www.google.com" label="skipping\ndownload"];
+}
+</graphviz>
+
 h2. To-Do
 
 The Webby user's manual goes here.
 
-<notextile>
 <coderay lang="ruby">
 def method( blah )
   blah.upcase
 end
 </coderay>
-</notextile>
 
 directory structure
 * content

data/website/content/tips_and_tricks.txt

@@ -15,8 +15,6 @@ h2(#toc_cr){clear:none}. CodeRay
 
 To include "CodeRay":http://coderay.rubychan.de/ syntax highlighting support in a page you need to have the @coderay@ gem installed, and you need to include the CodeRay stylesheet in your layout. The following example shows a page that uses CodeRay syntax highlighting combined with Textile markup.
 
-Note how the @coderay@ block is enclosed by a @notextile@ block. This ensures that the Textile filter does not clobber the generated syntax highlighting.
-
 <pre class="code">
 ---
 title:  CodeRay Example
@@ -30,8 +28,7 @@ h2. <%= h(@page.title) %>
 This is the @render_page@ function from the Webby static website generation
 system. It is used to render a page by applying the specified filters in
 succession to the page contents.
-
-<notextile>&lt;notextile&gt;
+<notextile>
 &lt;coderay lang="ruby" line_numbers="inline"&gt;
 # call-seq:
 #    render_page    => string
@@ -50,7 +47,6 @@ def render_page
   str
 end
 &lt;/coderay&gt;
-&lt;/notextile&gt;</notextile>
-</pre>
+</notextile></pre>
 
-There are more options that can be passed to the CodeRay syntax highlighter than those shown in the example above. Take a look at the RDoc documentation for the "CodeRayFilter":http://webby.rubyforge.org/rdoc/classes/Webby/CodeRayFilter.html class for more information.
+There are more options that can be passed to the CodeRay syntax highlighter than those shown in the example above. Take a look at the RDoc documentation for the "CodeRay Filter":http://webby.rubyforge.org/rdoc/classes/Webby/CodeRayFilter.html class for more information.

data/website/layouts/default.rhtml

@@ -3,7 +3,7 @@ extension: html
 filter:    erb
 --- 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
 <head>

data/website/tasks/create.rake

@@ -1,13 +1,4 @@
 
-require 'webby'
-
-Rake::WebbyTask.new do |webby|
-  webby.content_dir   = SITE.content_dir
-  webby.output_dir    = SITE.output_dir
-  webby.layout_dir    = SITE.layout_dir
-  webby.template_dir  = SITE.template_dir
-  webby.exclude       = SITE.exclude
-  webby.page_defaults = SITE.page_defaults
-end
+Rake::WebbyTask.new
 
 # EOF

data/website/tasks/setup.rb

@@ -1,8 +1,9 @@
 
-require 'ostruct'
+require 'webby'
 
-SITE = OpenStruct.new
+SITE = Webby.site
 
+# Webby defaults
 SITE.content_dir   = 'content'
 SITE.output_dir    = 'output'
 SITE.layout_dir    = 'layouts'
@@ -14,12 +15,18 @@ SITE.page_defaults = {
   'layout'    => 'default'
 }
 
+# Items used to deploy the webiste
 SITE.host       = 'user@hostname.tld'
 SITE.remote_dir = '/not/a/valid/dir'
 SITE.rsync_args = %w(-av --delete)
 
+# Options passed to the 'tidy' program when the tidy filter is used
+SITE.tidy_options = '-indent -wrap 80'
+
+# Load up the other rake tasks
 FileList['tasks/*.rake'].each {|task| import task}
 
+# Conditional dependencies
 %w(heel).each do |lib|
   Object.instance_eval {const_set "HAVE_#{lib.upcase}", try_require(lib)}
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2007-11-29 00:00:00 -07:00
+  version: 0.6.0
+date: 2007-12-04 00:00:00 -07:00
 summary: static website creation and management
 require_paths: 
 - lib
@@ -61,8 +61,10 @@ files:
 - lib/webby.rb
 - lib/webby/auto_builder.rb
 - lib/webby/builder.rb
-- lib/webby/coderay_filter.rb
 - lib/webby/file.rb
+- lib/webby/filters/coderay.rb
+- lib/webby/filters/graphviz.rb
+- lib/webby/filters/tidy.rb
 - lib/webby/main.rb
 - lib/webby/pages_db.rb
 - lib/webby/renderer.rb