TwP-webby 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.4 / 2008-12-
+
+* 2 minor enhancements
+  - Added a Maruku filter (thanks to Martyn Loughran)
+  - Updated to version 0.8.0 of Blueprint css
+* 1 bug fix
+  - Editor launching now handles switches passed to the editor
+
 == 0.9.3 / 2008-10-08
 
 * 4 minor enhancements

data/Manifest.txt

@@ -1,6 +1,6 @@
 History.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/webby
 bin/webby-gen
@@ -75,28 +75,35 @@ 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/ie.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/plugins/buttons/readme.txt
+examples/website/content/css/blueprint/plugins/buttons/screen.css
+examples/website/content/css/blueprint/plugins/fancy-type/readme.txt
+examples/website/content/css/blueprint/plugins/fancy-type/screen.css
+examples/website/content/css/blueprint/plugins/link-icons/icons/doc.png
+examples/website/content/css/blueprint/plugins/link-icons/icons/email.png
+examples/website/content/css/blueprint/plugins/link-icons/icons/external.png
+examples/website/content/css/blueprint/plugins/link-icons/icons/feed.png
+examples/website/content/css/blueprint/plugins/link-icons/icons/im.png
+examples/website/content/css/blueprint/plugins/link-icons/icons/pdf.png
+examples/website/content/css/blueprint/plugins/link-icons/icons/visited.png
+examples/website/content/css/blueprint/plugins/link-icons/icons/xls.png
+examples/website/content/css/blueprint/plugins/link-icons/readme.txt
+examples/website/content/css/blueprint/plugins/link-icons/screen.css
+examples/website/content/css/blueprint/plugins/rtl/readme.txt
+examples/website/content/css/blueprint/plugins/rtl/screen.css
 examples/website/content/css/blueprint/print.css
 examples/website/content/css/blueprint/screen.css
+examples/website/content/css/blueprint/src/forms.css
+examples/website/content/css/blueprint/src/grid.css
+examples/website/content/css/blueprint/src/grid.png
+examples/website/content/css/blueprint/src/ie.css
+examples/website/content/css/blueprint/src/print.css
+examples/website/content/css/blueprint/src/reset.css
+examples/website/content/css/blueprint/src/typography.css
 examples/website/content/css/coderay.css
 examples/website/content/css/site.css
 examples/website/content/index.txt
@@ -120,6 +127,7 @@ lib/webby/filters/basepath.rb
 lib/webby/filters/erb.rb
 lib/webby/filters/haml.rb
 lib/webby/filters/markdown.rb
+lib/webby/filters/maruku.rb
 lib/webby/filters/outline.rb
 lib/webby/filters/sass.rb
 lib/webby/filters/slides.rb
@@ -157,6 +165,12 @@ spec/core_ext/string_spec.rb
 spec/core_ext/time_spec.rb
 spec/data/hooligans/bad_meta_data_1.txt
 spec/data/hooligans/bad_meta_data_2.txt
+spec/data/html/anchor.html
+spec/data/html/external.html
+spec/data/html/invalid-relative.html
+spec/data/html/relative-anchor.html
+spec/data/html/relative-invalid-anchor.html
+spec/data/html/relative.html
 spec/data/outline/basic.out
 spec/data/outline/basic.txt
 spec/data/outline/no_clobber.out
@@ -201,9 +215,11 @@ spec/spec_helper.rb
 spec/webby/apps/generator_spec.rb
 spec/webby/apps/main_spec.rb
 spec/webby/filters/basepath_spec.rb
+spec/webby/filters/maruku_spec.rb
 spec/webby/filters/outline_spec.rb
 spec/webby/filters/textile_spec.rb
 spec/webby/helpers/capture_helper_spec.rb
+spec/webby/link_validator_spec.rb
 spec/webby/renderer_spec.rb
 spec/webby/resources/db_spec.rb
 spec/webby/resources/layout_spec.rb
@@ -213,15 +229,5 @@ spec/webby/resources/partial_spec.rb
 spec/webby/resources/resource_spec.rb
 spec/webby/resources/static_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
-tasks/rdoc.rake
-tasks/rubyforge.rake
-tasks/setup.rb
-tasks/spec.rake
+tasks/mswin32.rake
 tasks/website.rake

data/{README.txt → README.rdoc}

@@ -1,4 +1,4 @@
-Webby
+= Webby
 
 * {Homepage}[http://webby.rubyforge.org/]
 * {Rubyforge Project}[http://rubyforge.org/projects/webby]
@@ -6,7 +6,7 @@ Webby
 
 == DESCRIPTION:
 
-*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* 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.
 
@@ -15,18 +15,18 @@ Install Webby and try it out!
 == FEATURES:
 
 * 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/
+* 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.
+Webby has a great _autobuild_ feature that continuously generates HTML whenever the *pages* or *layouts* change. The HTML is served up via _WebBrick_, a simple webserver that comes with Ruby. 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)
@@ -61,11 +61,11 @@ Webby is not limited to producing HTML. By no means! Do you ever get tired of re
 == REQUIREMENTS:
 
 * directory_watcher
-* heel
 * hpricot
 * logging
 * rake
 * rspec
+* bones
 
 == LICENSE:
 

data/Rakefile

@@ -1,5 +1,10 @@
 
-load 'tasks/setup.rb'
+begin
+  require 'bones'
+  Bones.setup
+rescue LoadError
+  load 'tasks/setup.rb'
+end
 
 ensure_in_path 'lib'
 require 'webby'
@@ -11,10 +16,10 @@ PROJ.summary = 'static website creation and management'
 PROJ.authors = 'Tim Pease'
 PROJ.email = 'tim.pease@gmail.com'
 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 = 'Bill Gates Alien Love Child'
+PROJ.readme_file = 'README.rdoc'
 
 PROJ.ruby_opts = %w[-W0]
 PROJ.exclude << %w(^examples/[^/]+/output ^tasks/archive ^tags$ ^webby.gemspec$)
@@ -22,12 +27,14 @@ PROJ.exclude << %w(^examples/[^/]+/output ^tasks/archive ^tags$ ^webby.gemspec$)
 PROJ.rdoc.dir = 'doc/rdoc'
 PROJ.rdoc.remote_dir = 'rdoc'
 PROJ.rdoc.exclude << %w(^examples)
+PROJ.rdoc.include << PROJ.readme_file
 
 PROJ.spec.opts << '--color'
 
 PROJ.ann.email[:to] << 'webby-forum@googlegroups.com'
 PROJ.ann.email[:server] = 'smtp.gmail.com'
 PROJ.ann.email[:port] = 587
+PROJ.ann.email[:from] = 'Tim Pease'
 
 PROJ.ann.text = <<-ANN
 == POST SCRIPT

data/examples/webby/content/communicate/index.txt

@@ -13,9 +13,9 @@ p(pull). *<%= link_to('Forum', 'http://groups.google.com/group/webby-forum') %>*
 
 p(pulltext). The Google group dedicated to Webby and _ASCII Alchemy_.
 
-p(pull). *Reporting Bugs*
+p(pull). *<%= link_to('Reporting Bugs', 'http://webby.lighthouseapp.com') %>*
 
-p(pulltext). The occasional bug does rear its ugly head from time to time. If this happens please report it either by e-mailing the author or in a post to the discussion group. %(quiet)Note to self: look into a real bug tracking system.%
+p(pulltext). The occasional bug does rear its ugly head from time to time. If this happens please report it using the Lighthouse bug tracker.
 
 h2. Elsewhere
 

data/examples/webby/content/index.txt

@@ -25,7 +25,7 @@ h2. Features
 
 h2. 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.
+Webby has a great _autobuild_ feature that continuously generates HTML whenever the *pages* or *layouts* change. The HTML is served up using Webrick, a simple webserver that is bundled with Ruby. Whenever you change a page, you can immediately see those changes without having to run any commands.
 
 pre. $ webby autobuild
 [10:21:26]  INFO: starting autobuild (Ctrl-C to stop)

data/examples/website/content/css/blueprint/ie.css

@@ -0,0 +1,26 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.8
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {overflow-x:hidden;}
+* html legend {margin:-18px -8px 16px 0;padding:0;}
+ol {margin-left:2em;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}

data/examples/website/content/css/blueprint/plugins/buttons/{Readme → readme.txt}

@@ -1,4 +1,5 @@
 Buttons
+
 * Gives you great looking CSS buttons, for both <a> and <button>.
 * Demo: particletree.com/features/rediscovering-the-button-element
 
@@ -13,8 +14,8 @@ Credits
 Usage
 ----------------------------------------------------------------
 
-1) Add this line to "blueprint/screen.css":
-	 @import 'plugins/buttons/buttons.css';
+1) Add this plugin to lib/settings.yml.
+   See compress.rb for instructions.
 
 2) Use the following HTML code to place the buttons on your site:
 

data/examples/website/content/css/blueprint/plugins/buttons/{buttons.css → screen.css}

@@ -13,7 +13,7 @@
 a.button, button {
   display:block;
   float:left;
-  margin:0 0.583em 0.667em 0;
+  margin: 0.7em 0.5em 0.7em 0;
   padding:5px 10px 5px 7px;   /* Links */
   
   border:1px solid #dedede;

data/examples/website/content/css/blueprint/plugins/fancy-type/readme.txt

@@ -0,0 +1,14 @@
+Fancy Type
+
+* Gives you classes to use if you'd like some 
+  extra fancy typography. 
+
+Credits and instructions are specified above each class
+in the fancy-type.css file in this directory.
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+   See compress.rb for instructions.

data/examples/website/content/css/blueprint/plugins/fancy-type/{fancy-type.css → screen.css}

@@ -1,74 +1,71 @@
-/* -------------------------------------------------------------- 
-  
-   fancy-type.css
-   * Lots of pretty advanced classes for manipulating text.
-   
-   See the Readme file in this folder for additional instructions.
-
--------------------------------------------------------------- */
-
-/* Indentation instead of line shifts for sibling paragraphs. */
-   p + p { text-indent:2em; margin-top:-1.5em; }
-
-/* Ornaments on first paragraph.
-   Commented out by default. Use with care.
-   p:before { content: "\2767"; padding-right: 0.4em; }
-   p + p:before { content: ""; padding:0; } */
-
-/* For great looking type, use this code instead of asdf: 
-   <span class="alt">asdf</span>  
-   Best used on prepositions and ampersands. */
-  
-.alt { 
-  color: #666; 
-  font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif; 
-  font-style: italic;
-  font-weight: normal;
-}
-
-
-/* For great looking quote marks in titles, replace "asdf" with:
-   <span class="dquo">&#8220;</span>asdf&#8221;
-   (That is, when the title starts with a quote mark). 
-   (You may have to change this value depending on your font size). */  
-   
-.dquo { margin-left: -.5em; } 
-
-
-/* Reduced size type with incremental leading
-   (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
-
-   This could be used for side notes. For smaller type, you don't necessarily want to 
-   follow the 1.5x vertical rhythm -- the line-height is too much. 
-   
-   Using this class, it reduces your font size and line-height so that for 
-   every four lines of normal sized type, there is five lines of the sidenote. eg:
-
-   New type size in em's:
-     10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems)
-
-   New line-height value:
-     12px x 1.5 = 18px (old line-height)
-     18px x 4 = 72px 
-     72px / 5 = 14.4px (new line height)
-     14.4px / 10px = 1.44 (new line height in em's) */
-
-p.incr, .incr p {
-	font-size: 10px;
-	line-height: 1.44em;  
-	margin-bottom: 1.5em;
-}
-
-
-/* Surround uppercase words and abbreviations with this class.
-   Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/] */
-   
-.caps { 
-  font-variant: small-caps; 
-  letter-spacing: 1px; 
-  text-transform: lowercase; 
-  font-size:1.2em;
-  line-height:1%;
-  font-weight:bold;
-  padding:0 2px;
-}
+/* -------------------------------------------------------------- 
+  
+   fancy-type.css
+   * Lots of pretty advanced classes for manipulating text.
+   
+   See the Readme file in this folder for additional instructions.
+
+-------------------------------------------------------------- */
+
+/* Indentation instead of line shifts for sibling paragraphs. */
+   p + p { text-indent:2em; margin-top:-1.5em; }
+   form p + p  { text-indent: 0; } /* Don't want this in forms. */
+   
+
+/* For great looking type, use this code instead of asdf: 
+   <span class="alt">asdf</span>  
+   Best used on prepositions and ampersands. */
+  
+.alt { 
+  color: #666; 
+  font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif; 
+  font-style: italic;
+  font-weight: normal;
+}
+
+
+/* For great looking quote marks in titles, replace "asdf" with:
+   <span class="dquo">&#8220;</span>asdf&#8221;
+   (That is, when the title starts with a quote mark). 
+   (You may have to change this value depending on your font size). */  
+   
+.dquo { margin-left: -.5em; } 
+
+
+/* Reduced size type with incremental leading
+   (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
+
+   This could be used for side notes. For smaller type, you don't necessarily want to 
+   follow the 1.5x vertical rhythm -- the line-height is too much. 
+   
+   Using this class, it reduces your font size and line-height so that for 
+   every four lines of normal sized type, there is five lines of the sidenote. eg:
+
+   New type size in em's:
+     10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems)
+
+   New line-height value:
+     12px x 1.5 = 18px (old line-height)
+     18px x 4 = 72px 
+     72px / 5 = 14.4px (new line height)
+     14.4px / 10px = 1.44 (new line height in em's) */
+
+p.incr, .incr p {
+	font-size: 10px;
+	line-height: 1.44em;  
+	margin-bottom: 1.5em;
+}
+
+
+/* Surround uppercase words and abbreviations with this class.
+   Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/] */
+   
+.caps { 
+  font-variant: small-caps; 
+  letter-spacing: 1px; 
+  text-transform: lowercase; 
+  font-size:1.2em;
+  line-height:1%;
+  font-weight:bold;
+  padding:0 2px;
+}

data/examples/website/content/css/blueprint/plugins/link-icons/readme.txt

@@ -0,0 +1,18 @@
+Link Icons
+* Icons for links based on protocol or file type.
+
+This is not supported in IE versions < 7.
+
+
+Credits
+----------------------------------------------------------------
+
+* Marc Morgan
+* Olav Bjorkoy  [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to your HTML:
+	 <link rel="stylesheet" href="css/blueprint/plugins/link-icons/screen.css" type="text/css" media="screen, projection">	

data/examples/website/content/css/blueprint/plugins/link-icons/screen.css

@@ -0,0 +1,40 @@
+/* -------------------------------------------------------------- 
+  
+   link-icons.css
+   * Icons for links based on protocol or file type.
+   
+   See the Readme file in this folder for additional instructions.
+
+-------------------------------------------------------------- */
+
+/* Use this class if a link gets an icon when it shouldn't. */
+body a.noicon { 
+	background:transparent none !important; 
+	padding:0 !important; 
+	margin:0 !important; 
+}
+
+/* Make sure the icons are not cut */
+a[href^="http:"], a[href^="mailto:"], a[href^="http:"]:visited, 
+a[href$=".pdf"], a[href$=".doc"], a[href$=".xls"], a[href$=".rss"], 
+a[href$=".rdf"], a[href^="aim:"] {
+  padding:2px 22px 2px 0;
+  margin:-2px 0;
+  background-repeat: no-repeat;
+  background-position: right center;
+}
+
+/* External links */
+a[href^="http:"]          { background-image: url(icons/external.png); } 
+a[href^="mailto:"]        { background-image: url(icons/email.png); }
+a[href^="http:"]:visited  { background-image: url(icons/visited.png); }
+
+/* Files */
+a[href$=".pdf"]   { background-image: url(icons/pdf.png); }  
+a[href$=".doc"]   { background-image: url(icons/doc.png); }  
+a[href$=".xls"]   { background-image: url(icons/xls.png); }  
+ 
+/* Misc */
+a[href$=".rss"], 
+a[href$=".rdf"]   { background-image: url(icons/feed.png); }
+a[href^="aim:"]   { background-image: url(icons/im.png); }

data/examples/website/content/css/blueprint/plugins/rtl/readme.txt

@@ -0,0 +1,10 @@
+RTL
+* Mirrors Blueprint, so it can be used with Right-to-Left languages.
+
+By Ran Yaniv Hartstein, ranh.co.il
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to your HTML:
+   <link rel="stylesheet" href="css/blueprint/plugins/rtl/screen.css" type="text/css" media="screen, projection">