webby 0.2.0 → 0.3.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.0 / 2007-09-17
+
+* Added support for CodeRay syntax highlighting
+
 == 0.2.0 / 2007-08-28
 
 * Updated rake tasks for website deployment

data/Manifest.txt

@@ -19,6 +19,7 @@ data/content/css/blueprint/lib/reset.css
 data/content/css/blueprint/lib/typography.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/layouts/default.rhtml
@@ -30,6 +31,7 @@ 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/main.rb
 lib/webby/pages_db.rb
@@ -64,6 +66,8 @@ website/content/css/blueprint/screen.css
 website/content/css/site.css
 website/content/download.txt
 website/content/index.txt
+website/content/manual.txt
+website/content/tips_and_tricks.txt
 website/content/tutorial.txt
 website/layouts/default.rhtml
 website/tasks/create.rake

data/Rakefile

@@ -27,7 +27,8 @@ PROJ.rdoc_exclude << '^(\.\/|\/)?website'
 
 PROJ.spec_opts << '--color'
 
-PROJ.dependencies << ['rspec', ">= #{Spec::VERSION::STRING}"]
-PROJ.dependencies << ['directory_watcher', ">= #{DirectoryWatcher::VERSION}"]
+depend_on 'directory_watcher', '1.0.0'
+depend_on 'hpricot'
+depend_on 'rspec'
 
 # EOF

data/data/content/css/coderay.css

@@ -0,0 +1,111 @@
+.CodeRay {
+  padding: 0.5em;
+  margin-bottom: 1.3em;
+  background-color: #eee;
+  border: 1px solid black;
+  font: 1.1em Monaco, 'Courier New', 'Terminal', monospace;
+  color: #100;
+}
+.CodeRay pre {
+  padding: 0px;
+  margin: 0px;
+  overflow: auto;
+  background-color: transparent;
+  border: none;
+}
+
+div.CodeRay { }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
+
+.CodeRay .line_numbers, .CodeRay .no {
+  background-color: #def;
+  color: gray;
+  text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .no { padding: 0px 4px }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c  { color:#666; }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e  { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i  { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .idl { font-weight: bold; color: #888 }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .of { color:#000; font-weight:bold }
+.CodeRay .op { }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r  { color:#080; font-weight:bold }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s  { background-color:#fff0f0 }
+.CodeRay .s  .s { background-color:#ffe0e0 }
+.CodeRay .s  .s  .s { background-color:#ffd0d0 }
+.CodeRay .s  .k { color:#D20 }
+.CodeRay .s  .dl { color:#710 }
+
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v  { color:#036 }
+.CodeRay .xt { color:#444 }

data/data/layouts/default.rhtml

@@ -15,6 +15,9 @@ filter:    erb
    <link rel="stylesheet" href="css/blueprint/screen.css" type="text/css" media="screen, projection" />
    <link rel="stylesheet" href="css/blueprint/print.css" type="text/css" media="print" />
 
+   <!-- CodeRay syntax highlighting CSS -->
+   <link rel="stylesheet" href="css/coderay.css" type="text/css" />
+
    <!-- Homepage CSS -->
    <link rel="stylesheet" href="css/site.css" type="text/css" media="screen, projection" />
 </head>

data/lib/webby/coderay_filter.rb

@@ -0,0 +1,79 @@
+# $Id: coderay_filter.rb 24 2007-09-17 22:22:06Z tim_pease $
+
+require 'enumerator'
+require 'hpricot'
+try_require 'coderay'
+
+module Webby
+
+# The CodeRayFilter 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.
+#
+# Options can be passed to the CodeRay engine via attributes in the
+# <coderay> tag.
+#
+#    <coderay lang="ruby" line_numbers="inline">
+#    # Initializer for the class.
+#    def initialize( string )
+#      @str = stirng
+#    end
+#    </coderay>
+#    
+#  The supported CodeRay options are the following:
+#
+#    line_numbers       : include line nubers in 'table', 'linline',
+#                         or 'list'
+#    line_number_start  : where to start with line number counting
+#    bold_every         : make every n-th number appear bold
+#    tab_width          : convert tab characters to n spaces
+#     
+class CodeRayFilter
+
+  # call-seq:
+  #    CodeRayFilter.new( string )
+  #
+  # Creates a new CodeRay filter that will operate on the given _string_.
+  #
+  def initialize( str )
+    @str = str
+  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
+  # <coderay>...</coderay> tags will have syntax highlighting applied to the
+  # text via the CodeRay gem.
+  #
+  def to_html
+    doc = Hpricot(@str)
+    doc.search('//coderay') do |cr|
+      text = cr.inner_html.strip
+      lang = (cr['lang'] || 'ruby').to_sym
+
+      opts = {}
+      %w(line_numbers       to_sym
+         line_number_start  to_i
+         bold_every         to_i
+         tab_width          to_i).each_slice(2) do |key,convert|
+        next if cr[key].nil?
+        opts[key.to_sym] = cr[key].send(convert)
+      end
+
+      #cr.swap(CodeRay.scan(text, lang).html(opts).div)
+      out = "<div class=\"CodeRay\"><pre>\n"
+      out << CodeRay.scan(text, lang).html(opts)
+      out << "\n</pre></div>"
+      cr.swap out
+    end
+
+    doc.to_html
+  end
+
+end  # class CodeRayFilter
+end  # module Webby
+
+# EOF

data/lib/webby/renderer.rb

@@ -1,7 +1,6 @@
-# $Id: renderer.rb 19 2007-08-28 22:48:24Z tim_pease $
+# $Id: renderer.rb 22 2007-09-17 20:36:39Z tim_pease $
 
 require 'erb'
-
 try_require 'bluecloth'
 try_require 'redcloth'
 
@@ -85,6 +84,15 @@ class Renderer
     str
   end
 
+  #
+  #
+  def coderay_filter( str )
+    CodeRayFilter.new(str).to_html
+  rescue NameError
+    $stderr.puts "ERROR: coderay filter failed (CodeRay not installed?)"
+    exit
+  end
+
   # Render text via ERB using the built in ERB library.
   #
   def erb_filter( str )

data/lib/webby.rb

@@ -1,8 +1,8 @@
-# $Id: webby.rb 19 2007-08-28 22:48:24Z tim_pease $
+# $Id: webby.rb 25 2007-09-17 22:46:55Z tim_pease $
 
 module Webby
 
-  VERSION = '0.2.0'   # :nodoc:
+  VERSION = '0.3.0'   # :nodoc:
 
   # Path to the Webby package
   PATH = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..'))

data/tasks/setup.rb

@@ -1,4 +1,4 @@
-# $Id: setup.rb 13 2007-08-23 22:18:00Z tim_pease $
+# $Id: setup.rb 22 2007-09-17 20:36:39Z tim_pease $
 
 require 'rubygems'
 require 'ostruct'
@@ -106,4 +106,15 @@ def paragraphs_of(path, *paragraphs)
   File.read(path).delete("\r").split(/\n\n+/).values_at(*paragraphs)
 end
 
+# Adds the given gem _name_ to the current project's dependency list. An
+# optional gem _version_ can be given. If omitted, the newest gem version
+# will be used.
+#
+def depend_on( name, version = nil )
+  spec = Gem.source_index.find_name(name).last
+  version = spec.version.to_s if version.nil? and !spec.nil?
+
+  PROJ.dependencies << (version.nil? ? [name] : [name, ">= #{version}"])
+end
+
 # EOF

data/website/content/css/site.css

@@ -12,7 +12,7 @@ body { margin: 1.0em 0 }
 #footer hr { margin-bottom: 0.5em }
 #footer p { text-align: right }
 
-.code {
+pre.code {
   padding: 0.5em;
   margin-bottom: 1.3em;
   color: #fff;

data/website/content/manual.txt

@@ -0,0 +1,10 @@
+--- 
+title:      Manual
+created_at: Wed Aug 29 08:57:00 -0600 2007
+filter:
+  - coderay
+  - textile
+--- 
+h2. To-Do
+
+The Webby user's manual goes here.

data/website/content/tips_and_tricks.txt

@@ -0,0 +1,54 @@
+--- 
+title:      Tips & Tricks
+created_at: Wed Aug 29 08:57:11 -0600 2007
+filter:
+  - erb
+  - coderay
+  - textile
+--- 
+h2. To-Do
+
+The Webby tips & tricks page goes here.
+
+<notextile>
+<coderay line_numbers="inline">
+# call-seq:
+#    render_page    => string
+#
+# Apply the desired filters to the page. The filters to apply are
+# determined from the page's meta-data.
+#
+def render_page
+  ary = []
+  str = ::Webby::File.read(@page.path)
+
+  str << "and some more text"
+
+  @page.filter.to_a.each do |filter|
+    str = self.send(filter + '_filter', str)
+  end
+
+  str
+end
+</coderay>
+</notextile>
+
+And some more text.
+
+<pre class="code">
+--- 
+title:  Home Page
+filter:
+  - erb
+  - textile
+--- 
+h2. <%= @page.title %>
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc congue ipsum
+vestibulum libero. Aenean vitae justo. Nam eget tellus. Etiam convallis, est
+eu lobortis mattis, lectus tellus tempus felis, a ultricies erat ipsum at
+metus.
+
+h3. Litora Sociis
+...
+</pre>

data/website/layouts/default.rhtml

@@ -8,13 +8,16 @@ filter:    erb
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
 <head>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Webby :: <%= @page.title %></title>
-   <meta name="author" content="<%= @page.author %>" />
+   <title>Webby :: <%= h(@page.title) %></title>
+   <meta name="author" content="<%= h(@page.author) %>" />
 
    <!--- Blueprint CSS Framework -->
    <link rel="stylesheet" href="css/blueprint/screen.css" type="text/css" media="screen, projection" />
    <link rel="stylesheet" href="css/blueprint/print.css" type="text/css" media="print" />
 
+   <!-- CodeRay text highlighting CSS -->
+   <link rel="stylesheet" href="css/coderay.css" type="text/css" media="all" />
+
    <!-- Homepage CSS -->
    <link rel="stylesheet" href="css/site.css" type="text/css" media="screen, projection" />
 </head>
@@ -23,7 +26,7 @@ filter:    erb
 <div class="container">
 	
    <div class="column span-11 prepend-1 append-2 first last" id="header">
-      <h1>Webby &#9775; <%= @page.title %></h1>
+      <h1>Webby &#9775; <%= h(@page.title) %></h1>
       <hr />
       <ul id="navigation"
         ><li><a href="index.html">Home</a>&#8766;</li

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-08-28 00:00:00 -06:00
+  version: 0.3.0
+date: 2007-09-17 00:00:00 -06:00
 summary: static website creation and management
 require_paths: 
 - lib
@@ -50,6 +50,7 @@ files:
 - data/content/css/blueprint/lib/typography.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/layouts/default.rhtml
@@ -61,6 +62,7 @@ files:
 - lib/webby.rb
 - lib/webby/auto_builder.rb
 - lib/webby/builder.rb
+- lib/webby/coderay_filter.rb
 - lib/webby/file.rb
 - lib/webby/main.rb
 - lib/webby/pages_db.rb
@@ -95,6 +97,8 @@ files:
 - website/content/css/site.css
 - website/content/download.txt
 - website/content/index.txt
+- website/content/manual.txt
+- website/content/tips_and_tricks.txt
 - website/content/tutorial.txt
 - website/layouts/default.rhtml
 - website/tasks/create.rake
@@ -119,22 +123,31 @@ requirements: []
 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: directory_watcher
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: directory_watcher
+  name: hpricot
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: "0.6"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake