staticmatic 0.8.1 → 0.8.4

data/lib/staticmatic/base.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module StaticMatic
   class Base
     # Directories generated for a new site setup
@@ -26,7 +28,7 @@ module StaticMatic
       @templates_dir = File.dirname(__FILE__) + '/templates'
       @layout = "application"
       @scope = Object.new
-      @scope.instance_variable_set("@base_dir", @base_dir)
+      @scope.instance_variable_set("@staticmatic", self)
     end
     
     
@@ -79,17 +81,16 @@ module StaticMatic
     end
   
     def save_page(filename, content)
-      filename = "#{filename}"
       generate_site_file(filename, 'html', content)
     end
   
     def save_stylesheet(filename, content)
-      filename = "stylesheets/#{filename}"
-      generate_site_file(filename, 'css', content)
+      generate_site_file(File.join('stylesheets', filename), 'css', content)
     end
   
     def generate_site_file(filename, extension, content)
       path = File.join(@site_dir,"#{filename}.#{extension}")
+      FileUtils.mkdir_p(File.dirname(path))
       File.open(path, 'w+') do |f|
         f << content
       end
@@ -98,43 +99,38 @@ module StaticMatic
     end
     
     def source_for_layout
-      layout_template = "#{@src_dir}/layouts/#{@layout}.haml"
-      if File.exists?(layout_template)
-        File.read(layout_template)
+      if layout_exists?(@layout)
+        File.read(full_layout_path(@layout))
       else
-        raise StaticMatic::Error.new("", layout_template, "Layout not found")
+        raise StaticMatic::Error.new("", full_layout_path(@layout), "Layout not found")
       end
     end
     
     # Generate html from source file:
     # generate_html("index.haml")
-    def generate_html(source_file)
-      full_file_path = "#{@src_dir}/pages/#{source_file}.haml"
-      begin
-        page = Haml::Engine.new(File.read(full_file_path), :locals => {:base_dir => base_dir})
-        html = page.render(@scope)
-        
-        # TODO: DRY this up
-        if @scope.instance_variable_get("@layout")
-          @layout = @scope.instance_variable_get("@layout")
-        end
-        
-        html
-      rescue Haml::Error => haml_error
-        raise StaticMatic::Error.new(haml_error.haml_line, full_file_path, haml_error.message)
+    def generate_html(source_file, source_dir = '')
+      full_file_path = File.join(@src_dir, 'pages', source_dir, "#{source_file}.haml")
+      
+      html = generate_html_from_template_source(File.read(full_file_path)) {}
+      
+      # TODO: DRY this up
+      if @scope.instance_variable_get("@layout")
+        @layout = @scope.instance_variable_get("@layout")
       end
+      
+      html
     end
     
-    def generate_html_with_layout(source)
-      begin
-        generated_content = generate_html(source)
-        Haml::Engine.new(source_for_layout, :locals => {:base_dir => base_dir}).render(@scope) { generated_content }
-      rescue StaticMatic::Error => staticmatic_error
-        # Catch any errors from the actual template - otherwise the error will be assumed to be from the
-        # layout
-        raise staticmatic_error
-      rescue Haml::Error => haml_error
-        raise StaticMatic::Error.new(haml_error.haml_line, "Layout: #{@layout}", haml_error.message)
+    def generate_html_with_layout(source, source_dir = '')
+      @layout = layout_from_source_dir(source_dir)
+      generate_html_from_template_source(source_for_layout) { generate_html(source, source_dir) }
+    end
+    
+    def generate_partial(name)
+      partial_path = File.join(@src_dir, 'partials', "#{name}.haml")
+      
+      if File.exists?(partial_path)
+        generate_html_from_template_source(File.read(partial_path))
       end
     end
 
@@ -143,39 +139,91 @@ module StaticMatic
       begin
         stylesheet = Sass::Engine.new(File.read(full_file_path))
         stylesheet.to_css
-      rescue Sass::Error => sass_error
+      rescue Sass::SyntaxError => sass_error
         raise StaticMatic::Error.new(sass_error.sass_line, full_file_path, sass_error.message)
       end
     end
+    
+    # Generates html from the passed source string
+    #
+    # generate_html_from_template_source("%h1 Welcome to My Site") -> "<h1>Welcome to My Site</h1>"
+    #
+    # Pass a block containing a string to yield within in the passed source:
+    #
+    # generate_html_from_template_source("content:\n= yield") { "blah" } -> "content: blah"
+    #
+    def generate_html_from_template_source(source)
+      
+      html = Haml::Engine.new(source)
+      
+      begin
+        html.render(@scope) { yield }
+      rescue StaticMatic::Error => staticmatic_error
+        # Catch any errors from the actual template - otherwise the error will be assumed to be from the
+        # layout
+        raise staticmatic_error
+      rescue Haml::Error => haml_error
+        raise StaticMatic::Error.new(haml_error.haml_line, "Layout: #{@layout}", haml_error.message)
+      end        
+    end
+    
+    def layout_from_source_dir(dir)
+      layout_name = "application"
 
+      if dir
+        dirs = dir.split("/")
+        dir_layout_name = dirs[1]
+        
+        if layout_exists?(dir_layout_name)
+          layout_name = dir_layout_name
+        end
+      end
+      
+      layout_name
+    end
   
-    def template_exists?(name)
-      File.exists?("#{@src_dir}/pages/#{name}.haml") || File.exists?("#{@src_dir}/stylesheets/#{name}.sass")
-     end
+    # TODO: DRY this _exists? section up
+    def template_exists?(name, dir = '')
+      File.exists?(File.join(@src_dir, 'pages', dir, "#{name}.haml")) || File.exists?(File.join(@src_dir, 'stylesheets', "#{name}.sass"))
+    end
+    
+    def layout_exists?(name)
+      File.exists? full_layout_path(name)
+    end
+    
+    def template_directory?(path)
+      File.directory?(File.join(@src_dir, 'pages', path))
+    end
+    
+    def full_layout_path(name)
+      "#{@src_dir}/layouts/#{name}.haml"
+    end
     
     # Build HTML from the source files
     def build_html
       Dir["#{@src_dir}/pages/**/*.haml"].each do |path|
-        template = source_template_from_path(path)
-        save_page(template, generate_html_with_layout(template))
+        file_dir, template = source_template_from_path(path.sub(/^#{@src_dir}\/pages/, ''))
+        save_page(File.join(file_dir, template), generate_html_with_layout(template, file_dir))
         
         # reset the layout for the next page
-        @scope.instance_variable_set("@layout", "application")
+        @scope.instance_variable_set("@layout", nil)
       end
     end
   
     # Build CSS from the source files
     def build_css
       Dir["#{@src_dir}/stylesheets/**/*.sass"].each do |path|
-        template = source_template_from_path(path)
-        save_stylesheet(template, generate_css(template))
+        file_dir, template = source_template_from_path(path.sub(/^#{@src_dir}\/stylesheets/, ''))
+        save_stylesheet(File.join(file_dir, template), generate_css(template, file_dir))
       end
     end
     
     # Returns a raw template name from a source file path:
     # source_template_from_path("/path/to/site/src/stylesheets/application.sass")  ->  "application"
     def source_template_from_path(path)
-      File.basename(path).chomp(File.extname(path))
+      file_dir, file_name = File.split(path)
+      file_name.chomp!(File.extname(file_name))
+      [ file_dir, file_name ]
     end
   
     class << self

data/lib/staticmatic/helpers.rb

@@ -3,13 +3,13 @@ module StaticMatic
     self.extend self
     
     # Generates links to all stylesheets in the source directory
-    def stylesheets
-      stylesheet_dir = "#{@base_dir}/src/stylesheets"
+    def stylesheets(options = {})
+      stylesheet_dir = "#{@staticmatic.base_dir}/src/stylesheets"
       
       stylesheet_directories = Dir["#{stylesheet_dir}/**/*.sass"]
       
       # Bit of a hack here - adds any stylesheets that exist in the site/ dir that haven't been generated from source sass
-      Dir["#{@base_dir}/site/stylesheets/*.css"].each do |filename|
+      Dir["#{@staticmatic.base_dir}/site/stylesheets/*.css"].each do |filename|
         search_filename = File.basename(filename).chomp(File.extname(filename))
         already_included = false
         stylesheet_directories.each do |path|
@@ -25,7 +25,12 @@ module StaticMatic
       output = ""
       stylesheet_directories.each do |path|
         filename_without_extension = File.basename(path).chomp(File.extname(path))
-        output << tag(:link, :href => "/stylesheets/#{filename_without_extension}.css", :rel => 'stylesheet', :media => 'all')
+        href = "stylesheets/#{filename_without_extension}.css"
+        
+        if !options[:relative]
+          href = "/#{href}"
+        end
+        output << tag(:link, :href => href, :rel => 'stylesheet', :media => 'all')
       end
       
       output
@@ -68,7 +73,9 @@ module StaticMatic
     
     # Generates an image tag
     def img(name, options = {})
-      tag :img, options.merge!({:src => "images/#{name}"})
+      options[:src] = "images/#{name}"
+      options[:alt] ||= name.split('.').first.capitalize.gsub(/_|-/, ' ')
+      tag :img, options
     end
   
     # Generates HTML tags:
@@ -106,5 +113,10 @@ module StaticMatic
              sub(/_{2,}/, "_").
              downcase
     end
+    
+    # Include a partial template
+    def partial(name)
+      @staticmatic.generate_partial(name)
+    end
   end
 end

data/lib/staticmatic/server.rb

@@ -11,28 +11,23 @@ module StaticMatic
       path_info = request.params[Mongrel::Const::PATH_INFO]
       get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
       
-      file_to_serve = path_info
-      
-      file_name, file_ext = path_info.split('.')
-      
-      if file_name == "/"
-        file_name = "index"
-        file_ext = "html"
-      end
-      
+      file_dir, file_name, file_ext = expand_path(path_info)
+
       # remove stylesheets/ directory if applicable
-      file_name.gsub!("/stylesheets/", "")
-      
+      file_dir.gsub!(/^\/stylesheets\/?/, "")
+
       if file_ext && file_ext.match(/html|css/)
         response.start(200) do |head, out|
+          head["Content-Type"] = "text/html"
           output = ""
           
-          if @staticmatic.template_exists?(file_name)
+          if @staticmatic.template_exists?(file_name, file_dir)
+
             begin
-              if file_ext == "html"
-                output = @staticmatic.generate_html_with_layout("#{file_name}")
-              elsif file_ext == "css"
-                output = @staticmatic.generate_css("#{file_name}")
+              if file_ext == "css"
+                output = @staticmatic.generate_css(file_name, file_dir)
+              else
+                output = @staticmatic.generate_html_with_layout(file_name, file_dir)
               end
             rescue StaticMatic::Error => e
               output = e.message
@@ -53,6 +48,24 @@ module StaticMatic
         end
       end
     end
+
+    def expand_path(path_info)
+      dirname, basename = File.split(path_info)
+      extname = File.extname(path_info).sub(/^\./, '')
+      filename = basename.chomp(".#{extname}")
+
+      if extname.empty?
+        dir = File.join(dirname, filename)
+        is_dir = path_info[-1, 1] == '/' || (@staticmatic.template_directory?(dir) && !@staticmatic.template_exists?(filename, dirname))
+        if is_dir
+          dirname = dir
+          filename = 'index'
+        end
+        extname = 'html'
+      end
+
+      [ dirname, filename, extname ]
+    end
     
     class << self
       # Starts the StaticMatic preview server

data/test/base_test.rb

@@ -43,6 +43,10 @@ class StaticMaticBaseTest < Test::Unit::TestCase
   end
   
   def test_should_find_source_filename_from_path
-    assert_equal "application", @staticmatic.source_template_from_path("@base_dir/src/stylesheets/application.css")
+    assert_equal "application", @staticmatic.source_template_from_path("@base_dir/src/stylesheets/application.css")[1]
+  end
+  
+  def test_should_find_layout_from_passed_path
+    assert_equal "projects", @staticmatic.layout_from_source_dir("test/projects")
   end
 end

data/test/helpers_test.rb

@@ -5,11 +5,15 @@ class HelpersTest < Test::Unit::TestCase
   include StaticMatic::Helpers
   
   def setup
-    @base_dir = File.dirname(__FILE__) + '/sandbox/test_site'
+    @staticmatic = StaticMatic::Base.new(File.dirname(__FILE__) + '/sandbox/test_site')
   end
   
   def test_should_generate_stylesheet_links
-    assert_match "href=\"stylesheets\/application.css\"", stylesheets
+    assert_match "href=\"/stylesheets\/application.css\"", stylesheets
+  end
+  
+  def test_should_generate_stylesheet_links_with_relative_path
+    assert_match "href=\"stylesheets\/application.css\"", stylesheets(:relative => true)
   end
   
   def test_should_autolink_page
@@ -40,4 +44,10 @@ class HelpersTest < Test::Unit::TestCase
     expected_output = %q{src="javascripts/test.js"}
     assert_match expected_output, javascripts('test')
   end
+  
+  # Soon...
+  def test_should_include_partial_template
+    expected_output = "My Menu"
+    assert_match expected_output, partial("menu")
+  end
 end

data/test/sandbox/test_site/src/layouts/projects.haml

@@ -0,0 +1 @@
+%h1 Sub dir test

data/test/sandbox/test_site/src/partials/menu.haml

@@ -0,0 +1 @@
+My Menu

data/website/site/download.html

@@ -1,14 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
   <head>
+    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <title>StaticMatic</title>
-    <link media="all" href="/stylesheets/application.css" rel="stylesheet"/>
+    <link href="/stylesheets/application.css" media="all" rel="stylesheet"/>
   </head>
   <body>
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -27,24 +28,22 @@
           <li><a href="faq.html">FAQ</a></li>
         </ul>
       </div>
-      <div id='content'>
-        <div id='side'>
-          <strong>News</strong>
-          <a href="staticmatic_08.html">StaticMatic 0.8</a>
-        </div>
-        <h1>Download</h1>
-        <p>
-          The simplest way to get StaticMatic is via RubyGems:
-        </p>
-        <div class='code'>gem install staticmatic</div>
-        <h3>Source Code</h3>
-        <p>
-          You can get the source code from
-          <a href="http://rubyforge.org/projects/staticmatic/">RubyForge</a>
-          :
-        </p>
-        <div class='code'>
-          svn checkout svn://rubyforge.org/var/svn/staticmatic/trunk staticmatic
+      <div id='content_wrapper'>
+        <div id='content'>
+          <h1>Download</h1>
+          <p>
+            The simplest way to get StaticMatic is via RubyGems:
+          </p>
+          <div class='code'>gem install staticmatic</div>
+          <h3>Source Code</h3>
+          <p>
+            You can get the source code from
+            <a href="http://rubyforge.org/projects/staticmatic/">RubyForge</a>
+            :
+          </p>
+          <div class='code'>
+            svn checkout svn://rubyforge.org/var/svn/staticmatic/trunk staticmatic
+          </div>
         </div>
       </div>
       <div id='footer'>

data/website/site/faq.html

@@ -1,14 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
   <head>
+    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <title>StaticMatic</title>
-    <link media="all" href="/stylesheets/application.css" rel="stylesheet"/>
+    <link href="/stylesheets/application.css" media="all" rel="stylesheet"/>
   </head>
   <body>
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -27,18 +28,16 @@
           <li><a href="faq.html">FAQ</a></li>
         </ul>
       </div>
-      <div id='content'>
-        <div id='side'>
-          <strong>News</strong>
-          <a href="staticmatic_08.html">StaticMatic 0.8</a>
+      <div id='content_wrapper'>
+        <div id='content'>
+          <h1>FAQ</h1>
+          <h3>
+            I hate Haml.  Can I use a different template language?
+          </h3>
+          <p>
+            No. At least not at the moment.  Haml is perfect for our needs so we've had no reason to investigate using other languages.  However, StaticMatic is open source so patches are always welcome.
+          </p>
         </div>
-        <h1>FAQ</h1>
-        <h3>
-          I hate Haml.  Can I use a different template language?
-        </h3>
-        <p>
-          No. At least not at the moment.  Haml is perfect for our needs so we've had no reason to investigate using other languages.  However, StaticMatic is open source so patches are always welcome.
-        </p>
       </div>
       <div id='footer'>
         <p>

data/website/site/how_to_use.html

@@ -1,14 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
   <head>
+    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <title>StaticMatic</title>
-    <link media="all" href="/stylesheets/application.css" rel="stylesheet"/>
+    <link href="/stylesheets/application.css" media="all" rel="stylesheet"/>
   </head>
   <body>
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -27,120 +28,118 @@
           <li><a href="faq.html">FAQ</a></li>
         </ul>
       </div>
-      <div id='content'>
-        <div id='side'>
-          <strong>News</strong>
-          <a href="staticmatic_08.html">StaticMatic 0.8</a>
+      <div id='content_wrapper'>
+        <div id='content'>
+          <h1>How to Use</h1>
+          <p>
+            StaticMatic is very easy to work with.  It aims to provide just the tools you need and not get in your way.
+          </p>
+          <ul>
+            <li><a href="#developing">Developing a site</a></li>
+            <li>
+              <a href="#templates">Templates</a>
+              <ul>
+                <li><a href="#layouts">Layouts</a></li>
+                <li><a href="#helpers">Helpers</a></li>
+              </ul>
+            </li>
+          </ul>
+          <h2 id='developing'>Developing a site with StaticMatic</h2>
+          <h3>Setting up a site</h3>
+          <p>
+            The first thing to do with a StaticMatic site is to set up the folders and files ready for use.  A simple command will create everything you need to get started:
+          </p>
+          <div class='code'>staticmatic setup my_site</div>
+          <p>This will set up a number of directories:</p>
+          <ul>
+            <li>
+              site/  - contains your static site and any assets such as images or javascript files
+            </li>
+            <li>
+              src/  - where you'll work on your templates
+              <ul>
+                <li>
+                  layouts/ - contains templates that 'wrap' your main content pages
+                </li>
+                <li>pages/ - contains the actual pages of content</li>
+                <li>
+                  stylesheets/ - contains any Sass stylesheets you want to create
+                </li>
+              </ul>
+            </li>
+          </ul>
+          <h3>Previewing your site</h3>
+          <p>
+            When you're ready to start working on your site, you can fire up the preview server to see your changes:
+          </p>
+          <div class='code'>staticmatic preview my_site</div>
+          <p>
+            This will start a web server on port 3000.  Point your web browser to
+            <a href="http://localhost:3000">http://localhost:3000</a>
+            to see your site.
+          </p>
+          <h3>Building your site</h3>
+          <p>
+            When you're happy with the website, you can tell StaticMatic to generate the HTML pages:
+          </p>
+          <div class='code'>staticmatic build my_site</div>
+          <h2 id='templates'>Templates</h2>
+          <p>
+            <em>
+              For information on how to use Haml itself, please check out the
+              <a href="http://haml.hamptoncatlin.com/docs/haml">Haml website</a>
+              .
+            </em>
+          </p>
+          <h3 id='layouts'>Layouts</h3>
+          <p>
+            As with web frameworks like
+            <a href="http://www.rubyonrails.com">Ruby on Rails</a>
+            , StaticMatic uses layouts to 'wrap' up the content contained within page templates.
+          </p>
+          <p>
+            A layout typically contains the header and footer code for a page - code that is common to all pages on the site.
+          </p>
+          <p>
+            The only thing a layout *must* contain is a line that tells StaticMatic where to put the content:
+          </p>
+          <div class='code'>= yield</div>
+          <p>
+            By default, StaticMatic will look for a template named 'application.haml'.  If you have a page that needs to use a different layout, this can be specified in the page itself:
+          </p>
+          <em>contact_us.haml:</em>
+          <div class='code'>- @layout = "contact"</div>
+          <p>
+            The above code would tell StaticMatic to use the layout called 'contact.haml' when building and previewing the 'contact_us' page.
+          </p>
+          <h3 id='helpers'>
+          </h3>
+          <p>
+            StaticMatic provides a number of 'helpers' on top of those in Haml to handle common code and reduce code.
+          </p>
+          <h4>Links</h4>
+          <p>
+            'link' can automatically set up hyperlinks for you:
+          </p>
+          <div class='code'>= link "Contact Us"</div>
+          produces:
+          <div class='code'>
+            &lt;a href="contact_us.html"&gt;Contact Us&lt;/a&gt;"
+          </div>
+          <p>You can also specify a URL:</p>
+          <div class='code'>
+            = link "StaticMatic", "http://staticmatic.rubyforge.org"
+          </div>
+          <h4>Images</h4>
+          <div class='code'>= img "me.jpg"</div>
+          produces:
+          <div class='code'>&lt;img src="/images/me.jpg"/&gt;</div>
+          <h4>Stylesheets</h4>
+          <div class='code'>= stylesheets</div>
+          <p>
+            This will automatically insert links to any Sass stylesheets in your site source.
+          </p>
         </div>
-        <h1>How to Use</h1>
-        <p>
-          StaticMatic is very easy to work with.  It aims to provide just the tools you need and not get in your way.
-        </p>
-        <ul>
-          <li><a href="#developing">Developing a site</a></li>
-          <li>
-            <a href="#templates">Templates</a>
-            <ul>
-              <li><a href="#layouts">Layouts</a></li>
-              <li><a href="#helpers">Helpers</a></li>
-            </ul>
-          </li>
-        </ul>
-        <h2 id='developing'>Developing a site with StaticMatic</h2>
-        <h3>Setting up a site</h3>
-        <p>
-          The first thing to do with a StaticMatic site is to set up the folders and files ready for use.  A simple command will create everything you need to get started:
-        </p>
-        <div class='code'>staticmatic setup my_site</div>
-        <p>This will set up a number of directories:</p>
-        <ul>
-          <li>
-            site/  - contains your static site and any assets such as images or javascript files
-          </li>
-          <li>
-            src/  - where you'll work on your templates
-            <ul>
-              <li>
-                layouts/ - contains templates that 'wrap' your main content pages
-              </li>
-              <li>pages/ - contains the actual pages of content</li>
-              <li>
-                stylesheets/ - contains any Sass stylesheets you want to create
-              </li>
-            </ul>
-          </li>
-        </ul>
-        <h3>Previewing your site</h3>
-        <p>
-          When you're ready to start working on your site, you can fire up the preview server to see your changes:
-        </p>
-        <div class='code'>staticmatic preview my_site</div>
-        <p>
-          This will start a web server on port 3000.  Point your web browser to
-          <a href="http://localhost:3000">http://localhost:3000</a>
-          to see your site.
-        </p>
-        <h3>Building your site</h3>
-        <p>
-          When you're happy with the website, you can tell StaticMatic to generate the HTML pages:
-        </p>
-        <div class='code'>staticmatic build my_site</div>
-        <h2 id='templates'>Templates</h2>
-        <p>
-          <em>
-            For information on how to use Haml itself, please check out the
-            <a href="http://haml.hamptoncatlin.com/docs/haml">Haml website</a>
-            .
-          </em>
-        </p>
-        <h3 id='layouts'>Layouts</h3>
-        <p>
-          As with web frameworks like
-          <a href="http://www.rubyonrails.com">Ruby on Rails</a>
-          , StaticMatic uses layouts to 'wrap' up the content contained within page templates.
-        </p>
-        <p>
-          A layout typically contains the header and footer code for a page - code that is common to all pages on the site.
-        </p>
-        <p>
-          The only thing a layout *must* contain is a line that tells StaticMatic where to put the content:
-        </p>
-        <div class='code'>= yield</div>
-        <p>
-          By default, StaticMatic will look for a template named 'application.haml'.  If you have a page that needs to use a different layout, this can be specified in the page itself:
-        </p>
-        <em>contact_us.haml:</em>
-        <div class='code'>- @layout = "contact"</div>
-        <p>
-          The above code would tell StaticMatic to use the layout called 'contact.haml' when building and previewing the 'contact_us' page.
-        </p>
-        <h3 id='helpers'>
-        </h3>
-        <p>
-          StaticMatic provides a number of 'helpers' on top of those in Haml to handle common code and reduce code.
-        </p>
-        <h4>Links</h4>
-        <p>
-          'link' can automatically set up hyperlinks for you:
-        </p>
-        <div class='code'>= link "Contact Us"</div>
-        produces:
-        <div class='code'>
-          &lt;a href="contact_us.html"&gt;Contact Us&lt;/a&gt;"
-        </div>
-        <p>You can also specify a URL:</p>
-        <div class='code'>
-          = link "StaticMatic", "http://staticmatic.rubyforge.org"
-        </div>
-        <h4>Images</h4>
-        <div class='code'>= img "me.jpg"</div>
-        produces:
-        <div class='code'>&lt;img src="/images/me.jpg"/&gt;</div>
-        <h4>Stylesheets</h4>
-        <div class='code'>= stylesheets</div>
-        <p>
-          This will automatically insert links to any Sass stylesheets in your site source.
-        </p>
       </div>
       <div id='footer'>
         <p>

data/website/site/index.html

@@ -1,14 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
   <head>
+    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <title>StaticMatic</title>
-    <link media="all" href="/stylesheets/application.css" rel="stylesheet"/>
+    <link href="/stylesheets/application.css" media="all" rel="stylesheet"/>
   </head>
   <body>
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -27,41 +28,37 @@
           <li><a href="faq.html">FAQ</a></li>
         </ul>
       </div>
-      <div id='content'>
-        <div id='side'>
-          <strong>News</strong>
-          <a href="staticmatic_08.html">StaticMatic 0.8</a>
-        </div>
-        <h1>Static websites, the modern way</h1>
-        <p>
-          Web developers are used to using dynamic and frameworks like
-          <a href="http://www.rubyonrails.com">Ruby on Rails</a>
-          to develop applications. When it comes to working with static, non-dynamic websites it can seem like stepping back in time.
-        </p>
-        <p>
-          The platform of choice for simple sites is often limited:
+      <div id='content_wrapper'>
+        <div id='content'>
+          <h1>Static websites, the modern way</h1>
+          <p>
+            Web developers are used to using dynamic and frameworks like
+            <a href="http://www.rubyonrails.com">Ruby on Rails</a>
+            to develop applications. When it comes to working with static, non-dynamic websites it can seem like stepping back in time.
+          </p>
+          <h2>You'd like to</h2>
           <ul>
-            <li>
-              Content Management Systems with complicated or limiting template languages and far too many features
+            <li class='highlight'>
+              Replace over-featured, cumbersome Content Management Systems
             </li>
-            <li>Over-featured, expensive WYSIWYG applications</li>
+            <li class='highlight'>Speed up your prototypes</li>
           </ul>
-        </p>
-        <h2>Enter StaticMatic</h2>
-        <div class='columns'>
-          <div class='left_column'>
-            <em>Concise and terse Haml Templating Language</em>
-            <img src="images/homepage-templating.jpg"/>
-          </div>
-          <div class='right_column'>
-            <em>Live preview server for use while developing</em>
-            <img src="images/homepage-previewing.jpg"/>
+          <h2>Meet StaticMatic</h2>
+          <div class='columns'>
+            <div class='left_column'>
+              <em>Concise and terse Haml Templating</em>
+              <img alt="Homepage templating" src="images/homepage-templating.jpg"/>
+            </div>
+            <div class='right_column'>
+              <em>Live preview server for development</em>
+              <img alt="Homepage previewing" src="images/homepage-previewing.jpg"/>
+            </div>
           </div>
+          <p>
+            <em>Output full HTML pages</em>
+            <img alt="Homepage build" src="images/homepage-build.jpg"/>
+          </p>
         </div>
-        <p>
-          <em>Output full HTML pages</em>
-          <img src="images/homepage-build.jpg"/>
-        </p>
       </div>
       <div id='footer'>
         <p>

data/website/site/stylesheets/application.css

@@ -34,10 +34,10 @@ body {
 #footer {
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #ccc;
-	clear: left;
+	clear: both;
 	font-size: 75%;
 	letter-spacing: 1px;
-	margin: 15px 0 15px 0;
+	margin: 30px 0 15px 0;
 	width: 100%;
 	text-align: center;
 	padding: 10px 0 5px 0;
@@ -160,24 +160,28 @@ hr {
 	border: 1px solid #aaa;
 	background-color: #efefef;
 	padding: 5px;
-	display: none;
+	margin: 0 0 10px 0;
 }
 
 #side a {
 	display: block;
 }
 
-#content {
-
-	width: 880px;
+#content_wrapper {
+	width: 920px;
 }
 
-#content {
+#content_wrapper {
 	margin: 15px 0 15px 0;
 	padding: 0 0 0 20px;
 }
 
-* html #content { margin-top: 10px; }
+* html #content_wrapper { margin-top: 10px; }
+
+#content {
+	width: 670px;
+	float: left;
+}
 
 #menu {
 	padding: 0;
@@ -227,7 +231,7 @@ hr {
 
 /* columns */
 .columns {
-	width: 880px;
+	width: 580px;
 }
 
 .left_column {
@@ -249,8 +253,35 @@ hr {
 	margin: 2px 0 2px 0;
 }
 
+#quotes {
+	margin: 10px 0 0 0;
+}
+
 .quote {
 	font-style: italic;
 	color: #555;
+	font-size: 10pt;
+	margin: 10px 0 10px 0;
+}
+
+
+
+#side #news {
+	font-size: 10pt;
+}
+
+#side .title {
+	font-weight: bold;
+	margin: 0 0 8px 0;
+}
+
+#side .heading {
 	font-weight: bold;
+	margin: 0 0 8px 0;
+	font-size: 12pt;
+}
+
+.highlight {
+  background-color: #aaa;
+  font-style: italic;
 }

data/website/src/layouts/application.haml

@@ -1,6 +1,7 @@
 !!!
-%html
+%html{ :xmlns => "http://www.w3.org/1999/xhtml", :lang => "en", 'xml:lang' => "en" }
   %head
+    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}
     %title StaticMatic
     = stylesheets
   %body
@@ -19,11 +20,10 @@
           %li= link "Community", "http://groups.google.co.uk/group/staticmatic"
           %li= link "FAQ"
 
-      #content
-        #side
-          %strong News
-          = link "StaticMatic 0.8"
-        = yield
+      #content_wrapper
+
+        #content
+          = yield
       
       #footer
         %p 

data/website/src/layouts/test.haml

@@ -0,0 +1,4 @@
+!!!
+%h1 Blah
+
+= yield

data/website/src/pages/index.haml

@@ -6,24 +6,21 @@
   = link "Ruby on Rails", "http://www.rubyonrails.com"
   to develop applications. When it comes to working with static, non-dynamic websites it can seem like stepping back in time.
 
-%p 
-  The platform of choice for simple sites is often limited:
-  
-  %ul
-    %li Content Management Systems with complicated or limiting template languages and far too many features
-    %li Over-featured, expensive WYSIWYG applications
+%h2 You'd like to
 
-%p.quote "At Curve21 we use StaticMatic to create flat-HTML based prototypes of our applications.  When we're ready to start coding, we just drop the templates straight into our app..." 
+%ul
+  %li.highlight Replace over-featured, cumbersome Content Management Systems
+  %li.highlight Speed up your prototypes
 
-%h2 Enter StaticMatic
+%h2 Meet StaticMatic
 
 .columns
   .left_column
-    %em Concise and terse Haml Templating Language
+    %em Concise and terse Haml Templating
     = img "homepage-templating.jpg"
 
   .right_column
-    %em Live preview server for use while developing
+    %em Live preview server for development
     = img "homepage-previewing.jpg"
   
 %p 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
-date: 2007-09-04 00:00:00 +01:00
+  version: 0.8.4
+date: 2007-09-18 00:00:00 +01:00
 summary: Manage static sites using Haml & Sass
 require_paths: 
 - lib
@@ -62,6 +62,7 @@ files:
 - README
 - StaticMatic - website.zip
 - staticmatic-0.8.0.gem
+- staticmatic-0.8.1.gem
 - test
 - test/base_test.rb
 - test/helpers_test.rb
@@ -78,9 +79,12 @@ files:
 - test/sandbox/test_site/src/layouts
 - test/sandbox/test_site/src/layouts/alternate_layout.haml
 - test/sandbox/test_site/src/layouts/application.haml
+- test/sandbox/test_site/src/layouts/projects.haml
 - test/sandbox/test_site/src/pages
 - test/sandbox/test_site/src/pages/index.haml
 - test/sandbox/test_site/src/pages/layout_test.haml
+- test/sandbox/test_site/src/partials
+- test/sandbox/test_site/src/partials/menu.haml
 - test/sandbox/test_site/src/stylesheets
 - test/sandbox/test_site/src/stylesheets/application.sass
 - test/sandbox/tmp
@@ -103,11 +107,13 @@ files:
 - website/src
 - website/src/layouts
 - website/src/layouts/application.haml
+- website/src/layouts/test.haml
 - website/src/pages
 - website/src/pages/download.haml
 - website/src/pages/faq.haml
 - website/src/pages/how_to_use.haml
 - website/src/pages/index.haml
+- website/src/partials
 - website/src/stylesheets
 test_files: 
 - test/base_test.rb