webby 0.8.4 → 0.9.0

data/History.txt

@@ -1,3 +1,22 @@
+== 0.9.0 / 2008-08-25
+
+* 2 major enhancements
+  - The "rake" command line tool has been replaced by the "webby"
+    command line tool for day to day site tasks
+  - Now using the "rdiscount" gem for markdown syntax
+* 4 minor enhancements
+  - Layouts can exist in subdirectories of the layouts folder
+  - Addition of a "tumblog" template
+  - Addition of a sitemap file (Ana Nelson)
+  - Updated to version 6.4.2 of ImageMagick for tex2img conversions
+* 5 bug fixes
+  - Better error message when an unkonwn filter is given
+  - Table of contents generation bug
+  - Failing to clean out the "content_for" cache when doing a
+    multi-page render
+  - Explicitly loading the RedCloth gem
+  - Handling exceptions from system calls on the Windows platform
+
 == 0.8.4 / 2008-06-03
 
 * 1 minor improvement

data/Manifest.txt

@@ -3,113 +3,115 @@ Manifest.txt
 README.txt
 Rakefile
 bin/webby
-data/Rakefile
-data/content/css/blueprint/License.txt
-data/content/css/blueprint/Readme.txt
-data/content/css/blueprint/compressed/print.css
-data/content/css/blueprint/compressed/screen.css
-data/content/css/blueprint/lib/forms.css
-data/content/css/blueprint/lib/grid.css
-data/content/css/blueprint/lib/grid.png
-data/content/css/blueprint/lib/ie.css
-data/content/css/blueprint/lib/reset.css
-data/content/css/blueprint/lib/typography.css
-data/content/css/blueprint/plugins/buttons/Readme
-data/content/css/blueprint/plugins/buttons/buttons.css
-data/content/css/blueprint/plugins/buttons/icons/cross.png
-data/content/css/blueprint/plugins/buttons/icons/key.png
-data/content/css/blueprint/plugins/buttons/icons/tick.png
-data/content/css/blueprint/plugins/css-classes/Readme
-data/content/css/blueprint/plugins/css-classes/css-classes.css
-data/content/css/blueprint/plugins/fancy-type/Readme
-data/content/css/blueprint/plugins/fancy-type/fancy-type-compressed.css
-data/content/css/blueprint/plugins/fancy-type/fancy-type.css
-data/content/css/blueprint/print.css
-data/content/css/blueprint/screen.css
-data/content/css/coderay.css
-data/content/css/site.css
-data/content/index.txt
-data/content/s5/blank.gif
-data/content/s5/bodybg.gif
-data/content/s5/framing.css
-data/content/s5/iepngfix.htc
-data/content/s5/opera.css
-data/content/s5/outline.css
-data/content/s5/pretty.css
-data/content/s5/print.css
-data/content/s5/s5-core.css
-data/content/s5/slides.css
-data/content/s5/slides.js
-data/layouts/default.rhtml
-data/lib/breadcrumbs.rb
-data/tasks/blog.rake
-data/tasks/build.rake
-data/tasks/create.rake
-data/tasks/deploy.rake
-data/tasks/growl.rake
-data/tasks/heel.rake
-data/tasks/setup.rb
-data/tasks/validate.rake
-data/templates/_partial.erb
-data/templates/atom_feed.erb
-data/templates/blog/month.erb
-data/templates/blog/post.erb
-data/templates/blog/year.erb
-data/templates/page.erb
-data/templates/presentation.erb
-examples/presentation/Rakefile
-examples/presentation/content/_sample_code.txt
+bin/webby-gen
+examples/blog/Sitefile
+examples/blog/tasks/blog.rake
+examples/blog/templates/atom_feed.erb
+examples/blog/templates/blog/month.erb
+examples/blog/templates/blog/post.erb
+examples/blog/templates/blog/year.erb
+examples/presentation/Sitefile
 examples/presentation/content/css/uv/twilight.css
-examples/presentation/content/index.txt
-examples/presentation/content/s5/blank.gif
-examples/presentation/content/s5/bodybg.gif
-examples/presentation/content/s5/framing.css
-examples/presentation/content/s5/iepngfix.htc
-examples/presentation/content/s5/opera.css
-examples/presentation/content/s5/outline.css
-examples/presentation/content/s5/pretty.css
-examples/presentation/content/s5/print.css
-examples/presentation/content/s5/s5-core.css
-examples/presentation/content/s5/slides.css
-examples/presentation/content/s5/slides.js
-examples/presentation/layouts/presentation.rhtml
-examples/presentation/tasks/blog.rake
-examples/presentation/tasks/build.rake
-examples/presentation/tasks/create.rake
-examples/presentation/tasks/deploy.rake
-examples/presentation/tasks/growl.rake
-examples/presentation/tasks/heel.rake
-examples/presentation/tasks/setup.rb
-examples/presentation/tasks/validate.rake
-examples/presentation/templates/_partial.erb
+examples/presentation/content/presentation/_sample_code.txt
+examples/presentation/content/presentation/index.txt
+examples/presentation/content/presentation/s5/blank.gif
+examples/presentation/content/presentation/s5/bodybg.gif
+examples/presentation/content/presentation/s5/framing.css
+examples/presentation/content/presentation/s5/iepngfix.htc
+examples/presentation/content/presentation/s5/opera.css
+examples/presentation/content/presentation/s5/outline.css
+examples/presentation/content/presentation/s5/pretty.css
+examples/presentation/content/presentation/s5/print.css
+examples/presentation/content/presentation/s5/s5-core.css
+examples/presentation/content/presentation/s5/slides.css
+examples/presentation/content/presentation/s5/slides.js
+examples/presentation/layouts/presentation.txt
+examples/presentation/templates/_code_partial.erb
 examples/presentation/templates/presentation.erb
-examples/webby/Rakefile
+examples/tumblog/Sitefile
+examples/tumblog/content/css/tumblog.css
+examples/tumblog/content/images/tumblog/permalink.gif
+examples/tumblog/content/images/tumblog/rss.gif
+examples/tumblog/content/tumblog/200806/the-noble-chicken/index.txt
+examples/tumblog/content/tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/index.txt
+examples/tumblog/content/tumblog/200807/mad-city-chickens/index.txt
+examples/tumblog/content/tumblog/200807/the-wisdom-of-the-dutch/index.txt
+examples/tumblog/content/tumblog/200807/up-a-tree/index.txt
+examples/tumblog/content/tumblog/index.txt
+examples/tumblog/content/tumblog/rss.txt
+examples/tumblog/layouts/tumblog/default.txt
+examples/tumblog/layouts/tumblog/post.txt
+examples/tumblog/lib/tumblog_helper.rb
+examples/tumblog/tasks/tumblog.rake
+examples/tumblog/templates/atom_feed.erb
+examples/tumblog/templates/tumblog/conversation.erb
+examples/tumblog/templates/tumblog/link.erb
+examples/tumblog/templates/tumblog/photo.erb
+examples/tumblog/templates/tumblog/post.erb
+examples/tumblog/templates/tumblog/quote.erb
+examples/webby/Sitefile
+examples/webby/content/communicate/index.txt
+examples/webby/content/css/background.gif
 examples/webby/content/css/blueprint/print.css
 examples/webby/content/css/blueprint/screen.css
 examples/webby/content/css/coderay.css
 examples/webby/content/css/site.css
 examples/webby/content/css/uv/twilight.css
 examples/webby/content/index.txt
-examples/webby/content/manual/index.txt
+examples/webby/content/learn/index.txt
 examples/webby/content/reference/index.txt
+examples/webby/content/release-notes/rel-0-9-0/index.txt
 examples/webby/content/robots.txt
 examples/webby/content/script/jquery.corner.js
 examples/webby/content/script/jquery.js
+examples/webby/content/sitemap.txt
 examples/webby/content/tips_and_tricks/index.txt
 examples/webby/content/tutorial/index.txt
-examples/webby/layouts/default.rhtml
-examples/webby/tasks/blog.rake
-examples/webby/tasks/build.rake
-examples/webby/tasks/create.rake
-examples/webby/tasks/deploy.rake
-examples/webby/tasks/growl.rake
-examples/webby/tasks/heel.rake
-examples/webby/tasks/setup.rb
-examples/webby/tasks/validate.rake
+examples/webby/content/user-manual/index.txt
+examples/webby/layouts/default.txt
 examples/webby/templates/page.erb
+examples/website/Sitefile
+examples/website/content/css/blueprint/License.txt
+examples/website/content/css/blueprint/Readme.txt
+examples/website/content/css/blueprint/compressed/print.css
+examples/website/content/css/blueprint/compressed/screen.css
+examples/website/content/css/blueprint/lib/forms.css
+examples/website/content/css/blueprint/lib/grid.css
+examples/website/content/css/blueprint/lib/grid.png
+examples/website/content/css/blueprint/lib/ie.css
+examples/website/content/css/blueprint/lib/reset.css
+examples/website/content/css/blueprint/lib/typography.css
+examples/website/content/css/blueprint/plugins/buttons/Readme
+examples/website/content/css/blueprint/plugins/buttons/buttons.css
+examples/website/content/css/blueprint/plugins/buttons/icons/cross.png
+examples/website/content/css/blueprint/plugins/buttons/icons/key.png
+examples/website/content/css/blueprint/plugins/buttons/icons/tick.png
+examples/website/content/css/blueprint/plugins/css-classes/Readme
+examples/website/content/css/blueprint/plugins/css-classes/css-classes.css
+examples/website/content/css/blueprint/plugins/fancy-type/Readme
+examples/website/content/css/blueprint/plugins/fancy-type/fancy-type-compressed.css
+examples/website/content/css/blueprint/plugins/fancy-type/fancy-type.css
+examples/website/content/css/blueprint/print.css
+examples/website/content/css/blueprint/screen.css
+examples/website/content/css/coderay.css
+examples/website/content/css/site.css
+examples/website/content/index.txt
+examples/website/layouts/default.txt
+examples/website/lib/breadcrumbs.rb
+examples/website/templates/_partial.erb
+examples/website/templates/page.erb
+examples/website/templates/presentation.erb
 lib/webby.rb
+lib/webby/apps.rb
+lib/webby/apps/generator.rb
+lib/webby/apps/main.rb
 lib/webby/auto_builder.rb
 lib/webby/builder.rb
+lib/webby/core_ext/enumerable.rb
+lib/webby/core_ext/hash.rb
+lib/webby/core_ext/kernel.rb
+lib/webby/core_ext/string.rb
+lib/webby/core_ext/time.rb
 lib/webby/filters.rb
 lib/webby/filters/basepath.rb
 lib/webby/filters/erb.rb
@@ -129,7 +131,6 @@ lib/webby/helpers/tex_img_helper.rb
 lib/webby/helpers/ultraviolet_helper.rb
 lib/webby/helpers/url_helper.rb
 lib/webby/link_validator.rb
-lib/webby/main.rb
 lib/webby/renderer.rb
 lib/webby/resources.rb
 lib/webby/resources/db.rb
@@ -142,14 +143,26 @@ lib/webby/resources/static.rb
 lib/webby/stelan/mktemp.rb
 lib/webby/stelan/paginator.rb
 lib/webby/stelan/spawner.rb
-lib/webby/utils.rb
+lib/webby/tasks/build.rake
+lib/webby/tasks/create.rake
+lib/webby/tasks/deploy.rake
+lib/webby/tasks/growl.rake
+lib/webby/tasks/heel.rake
+lib/webby/tasks/validate.rake
+spec/core_ext/hash_spec.rb
+spec/core_ext/string_spec.rb
+spec/core_ext/time_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+spec/webby/apps/generator_spec.rb
+spec/webby/apps/main_spec.rb
 spec/webby/helpers/capture_helper_spec.rb
 spec/webby/resources/file_spec.rb
+spec/webby/resources_spec.rb
 tasks/ann.rake
 tasks/bones.rake
 tasks/gem.rake
+tasks/git.rake
 tasks/manifest.rake
 tasks/notes.rake
 tasks/post_load.rake

data/README.txt

@@ -6,50 +6,34 @@ Webby
 
 == DESCRIPTION:
 
-Webby is a super fantastic little website management system. It would be
-called a _content management system_ if it were a bigger kid. But, it's
-just a runt with a special knack for transforming text. And that's really
-all it does - manages the legwork of turning text into something else, an
-*ASCII Alchemist* if you will.
-
-Webby works by combining the contents of a *page* with a *layout* to
-produce HTML. The layout contains everything common to all the pages -
-HTML headers, navigation menu, footer, etc. - and the page contains just
-the information for that page. You can use your favorite markup language
-to write your pages; Webby supports quite a few.
+*Webby* is a fantastic little website management system. It would be called a _content management system_ if it were a bigger kid. But, it's just a runt with a special knack for transforming text. And that's really all it does - manages the legwork of turning text into something else, an *ASCII Alchemist* if you will.
+
+Webby works by combining the contents of a *page* with a *layout* to produce HTML. The layout contains everything common to all the pages - HTML headers, navigation menu, footer, etc. - and the page contains just the information for that page. You can use your favorite markup language to write your pages; Webby supports quite a few.
 
 Install Webby and try it out!
 
 == FEATURES:
 
-* choose your templating language: *eRuby*, *Textile*, *Markdown*, *HAML*
-* support for {CodeRay}[http://coderay.rubychan.de/] syntax highlighting
+* choose your templating language: *ERB*, *Textile*, *Markdown*, *HAML*, *SASS*
+* support for "UltraViolet":http://ultraviolet.rubyforge.org/ and "CodeRay":http://coderay.rubychan.de/ syntax highlighting
+* embeddable DOT scripts for "Graphviz":http://www.graphviz.org/ graphs
+* "LaTeX":http://www.latex-project.org/ snippets for mathematical formulas
+* 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
+* happy "rake":http://docs.rubyrake.org/ tasks for deploying your website to a server
 * build new pages from templates for quicker blog posts and news items
 
 But Wait! There's More!
 
-Webby has a great _autobuild_ feature that continuously generates HTML whenever
-the *pages* or *layouts* change. The HTML is served up via
-{heel}[http://copiousfreetime.rubyforge.org/heel/], a static file webserver
-based on mongrel. Whenever you change a page, you can immediately see those
-changes without having to run any commands.
-
-   $ rake autobuild
-   heel --root output --daemonize
-   -- starting autobuild (Ctrl-C to stop)
-   - started at 10:21:26
-   creating output/index.html
-   - started at 10:22:57
-   creating output/index.html
-
-Webby is not limited to producing HTML. By no means! Do you ever get tired of
-repeating the same color code <b>#D3C4A2</b> in your CSS files? Webby can help.
-Need some customized JavaScript for your website. Webby can help. Anytime you
-find yourself repeating the same bit of text over and over, then you should be
-using Webby.
+Webby has a great _autobuild_ feature that continuously generates HTML whenever the *pages* or *layouts* change. The HTML is served up via "heel":http://copiousfreetime.rubyforge.org/heel/, a static file webserver based on mongrel. Whenever you change a page, you can immediately see those changes without having to run any commands.
+
+   $ webby autobuild
+   [10:21:26]  INFO: starting autobuild (Ctrl-C to stop)
+   [10:21:26]  INFO: creating output/index.html
+   [10:22:57]  INFO: creating output/index.html
+
+Webby is not limited to producing HTML. By no means! Do you ever get tired of repeating the same color code *#D3C4A2* in your CSS files? Webby can help. Need some customized JavaScript for your website. Webby can help. Anytime you find yourself repeating the same bit of text over and over, then you should be using Webby.
 
 == INSTALL:
 
@@ -57,24 +41,22 @@ using Webby.
 
 == EXAMPLE:
 
-   $ webby my_site
+   $ webby-gen website my_site
    creating my_site
 
    $ cd my_site
 
-   $ rake create:page new_page.txt
-   creating content/new_page.txt
+   $ webby create:page 'new page'
+   creating content/new-page.txt
 
-   $ rake create:page another/new_page.txt
-   creating content/another/new_page.txt
+   $ webby create:page 'another/new page'
+   creating content/another/new-page.txt
 
-   $ rake autobuild
-   heel --root output --daemonize
-   -- starting autobuild (Ctrl-C to stop)
-   - started at 07:01:30
-   creating output/index.html
-   creating output/new_page.html
-   creating output/another/new_page.html
+   $ webby autobuild
+   [10:21:26]  INFO: starting autobuild (Ctrl-C to stop)
+   [10:21:26]  INFO: creating output/index.html
+   [10:21:26]  INFO: creating output/new-page.html
+   [10:21:26]  INFO: creating output/another/new-page.html
 
 == REQUIREMENTS:
 

data/Rakefile

@@ -15,16 +15,15 @@ PROJ.url = 'http://webby.rubyforge.org/'
 PROJ.description = paragraphs_of('README.txt', 3).join("\n\n")
 PROJ.rubyforge.name = 'webby'
 PROJ.version = Webby::VERSION
-PROJ.release_name = 'Forgetful Foobar'
+PROJ.release_name = 'Vegan Velociraptor'
 
 PROJ.ruby_opts = %w[-W0]
-PROJ.exclude << %w(^examples/[^/]+/output ^tasks/archive ^tags$)
+PROJ.exclude << %w(^examples/[^/]+/output ^tasks/archive ^tags$ ^webby.gemspec$)
 
 PROJ.rdoc.dir = 'doc/rdoc'
 PROJ.rdoc.remote_dir = 'rdoc'
-PROJ.rdoc.exclude << %w(^data ^examples)
+PROJ.rdoc.exclude << %w(^examples)
 
-PROJ.svn.path = ''
 PROJ.spec.opts << '--color'
 
 PROJ.ann.email[:to] << 'webby-forum@googlegroups.com'
@@ -43,7 +42,7 @@ ANN
 
 depend_on 'directory_watcher'
 depend_on 'heel'
-depend_on 'hpricot'
+depend_on 'hpricot', '= 0.6.0'
 depend_on 'logging'
 depend_on 'rake'
 depend_on 'rspec'

data/bin/webby

@@ -2,6 +2,7 @@
 
 require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib webby]))
-::Webby::Main.run ARGV
+
+::Webby::Apps::Main.run(ARGV)
 
 # EOF

data/bin/webby-gen

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. lib webby]))
+
+::Webby::Apps::Generator.run(ARGV)
+
+# EOF

data/{data/Rakefile → examples/blog/Sitefile}

@@ -1,6 +1,4 @@
 
-load 'tasks/setup.rb'
-
 task :default => :build
 
 desc 'deploy the site to the webserver'

data/examples/{webby → blog}/tasks/blog.rake

@@ -10,7 +10,7 @@ namespace :blog do
 
     desc "Create a new blog #{name}"
     task name => [:create_year_index, :create_month_index] do |t|
-      page, title, dir = Webby::Builder.new_page_info(t)
+      page, title, dir = Webby::Builder.new_page_info
 
       # if no directory was given use the default blog directory (underneath
       # the content directory)
@@ -27,7 +27,7 @@ namespace :blog do
   # this task is used to create the year index file (blog/2008/index.txt)
   task :create_year_index do |t|
     # parse out information about the page to create
-    _, _, dir = Webby::Builder.new_page_info(t)
+    _, _, dir = Webby::Builder.new_page_info
     year = Time.now.strftime '%Y'
 
     # if no directory was given use the default blog directory (underneath
@@ -48,8 +48,9 @@ namespace :blog do
   # this task is used to create the month index file (blog/2008/04/index.txt)
   task :create_month_index do |t|
     # parse out information about the page to create
-    _, _, dir = Webby::Builder.new_page_info(t)
+    _, _, dir = Webby::Builder.new_page_info
     now = Time.now
+    month = now.strftime '%m'
 
     # if no directory was given use the default blog directory (underneath
     # the content directory)
@@ -62,7 +63,7 @@ namespace :blog do
 
     if test(?f, tmpl) and not test(?f, File.join(Webby.site.content_dir, fn))
       Webby::Builder.create(fn, :from => tmpl,
-          :locals => {:title => year, :directory => dir})
+          :locals => {:title => month, :directory => dir})
     end
   end
 

data/{data → examples/blog}/templates/atom_feed.erb

@@ -1,14 +1,13 @@
 ---
-title: A New Atom Feed
-subtitle: A really swell blog built with Webby
-site: fake-n-site.org
-author: Author's Name
-email: author@fake-n-site.org
+title:     A New Atom Feed
+subtitle:  A really swell blog built with Webby
+site:      fake-n-site.org
+author:    Author's Name
+email:     author@fake-n-site.org
 extension: xml
-layout: nil
-dirty: true
-filter:
-- erb
+layout:    nil
+dirty:     true
+filter:    erb
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
@@ -24,7 +23,7 @@ filter:
   </author>
   <id>http://<%%= @page.site %>/</id>
   <%% @pages.find(:limit => 10,
-                 :in_directory => 'blog',
+                 :in_directory => '<%= directory %>',
                  :recursive => true,
                  :sort_by => 'mtime',
                  :reverse => true).each do |article|
@@ -35,7 +34,7 @@ filter:
     <link href="<%%= article.url %>" />
     <id>tag:<%%= @page.site %>,<%%= article.created_at.strftime('%Y-%m-%d') %>:<%%= article.created_at.to_i %></id>
     <updated><%%= article.created_at.xmlschema %></updated>
-    <content type="html"><%%= h(article.render) %></content>
+    <content type="html"><%%= h(render(article)) %></content>
   </entry>
   <%% end %>
 </feed>

data/{data → examples/blog}/templates/blog/month.erb

@@ -8,7 +8,7 @@ dirty:      true
 
 <%%
   articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true,
-    :sort_by => "created_at", :reverse => true)
+      :sort_by => "created_at", :reverse => true, :blog_post => true)
   articles.delete(@page)
   paginate(articles, 10) do |page|
 -%>

data/{data → examples/blog}/templates/blog/post.erb

@@ -1,6 +1,7 @@
 --- 
 title:      <%= title %>
 created_at: <%= Time.now.to_y %>
+blog_post:  true
 filter:
   - textile
 --- 

data/{data → examples/blog}/templates/blog/year.erb

@@ -8,7 +8,7 @@ dirty:      true
 
 <%%
   articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true,
-                         :sort_by => "created_at", :reverse => true)
+      :sort_by => "created_at", :reverse => true, :blog_post => true)
   articles.delete(@page)
   paginate(articles, 10) do |page|
 -%>

data/examples/presentation/{Rakefile → Sitefile}

@@ -1,13 +1,9 @@
 
-load 'tasks/setup.rb'
-
 task :default => :build
 
 desc 'deploy the site to the webserver'
 task :deploy => [:build, 'deploy:rsync']
 
-task :autobuild => :growl
-
 SITE.uv[:theme] = 'twilight'
 SITE.uv[:line_numbers] = false
 

data/examples/presentation/layouts/{presentation.rhtml → presentation.txt}

@@ -17,12 +17,12 @@ filter:
    <meta name="defaultView" content="slideshow" />
    <meta name="controlVis" content="hidden" />
 
-   <link rel="stylesheet" href="s5/slides.css" type="text/css" media="projection" id="slideProj" />
-   <link rel="stylesheet" href="s5/outline.css" type="text/css" media="screen" id="outlineStyle" />
+   <link rel="stylesheet" href="/presentation/s5/slides.css" type="text/css" media="projection" id="slideProj" />
+   <link rel="stylesheet" href="/presentation/s5/outline.css" type="text/css" media="screen" id="outlineStyle" />
    <link rel="stylesheet" href="/css/uv/twilight.css" type="text/css" media="screen, projection" />
 
    <!-- S5 JS -->
-   <script src="s5/slides.js" type="text/javascript"></script>
+   <script src="/presentation/s5/slides.js" type="text/javascript"></script>
 </head>
 <body>
 

data/examples/tumblog/Sitefile

@@ -0,0 +1,9 @@
+
+task :default => :build
+
+desc 'deploy the site to the webserver'
+task :deploy => [:build, 'deploy:rsync']
+
+SITE.create_mode = 'directory'
+
+# EOF