staticmatic 0.8.4 → 0.8.5

data/lib/staticmatic/base.rb

@@ -99,6 +99,7 @@ module StaticMatic
     end
     
     def source_for_layout
+
       if layout_exists?(@layout)
         File.read(full_layout_path(@layout))
       else
@@ -110,20 +111,41 @@ module StaticMatic
     # generate_html("index.haml")
     def generate_html(source_file, source_dir = '')
       full_file_path = File.join(@src_dir, 'pages', source_dir, "#{source_file}.haml")
+
+      begin
+        html = generate_html_from_template_source(File.read(full_file_path))
       
-      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")
+        @layout = detirmine_layout(source_dir)
+      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, "#{source_dir}/#{source_file}", haml_error.message)
       end
       
+      # 
+      # # 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, source_dir = '')
-      @layout = layout_from_source_dir(source_dir)
-      generate_html_from_template_source(source_for_layout) { generate_html(source, source_dir) }
+      template_content = generate_html(source, source_dir)
+      @layout = detirmine_layout(source_dir)
+      
+      begin
+        generate_html_from_template_source(source_for_layout) { template_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: #{source_dir}/#{@layout}", haml_error.message)
+      end
     end
     
     def generate_partial(name)
@@ -134,8 +156,8 @@ module StaticMatic
       end
     end
 
-    def generate_css(source)
-      full_file_path = "#{@src_dir}/stylesheets/#{source}.sass"
+    def generate_css(source, source_dir = '')
+      full_file_path = File.join(@src_dir, 'stylesheets', source_dir, "#{source}.sass")
       begin
         stylesheet = Sass::Engine.new(File.read(full_file_path))
         stylesheet.to_css
@@ -155,22 +177,16 @@ module StaticMatic
     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        
+
+      html.render(@scope) { yield }
     end
     
-    def layout_from_source_dir(dir)
+    def detirmine_layout(dir = '')
       layout_name = "application"
-
-      if dir
+      
+      if @scope.instance_variable_get("@layout")
+        layout_name = @scope.instance_variable_get("@layout")
+      elsif dir
         dirs = dir.split("/")
         dir_layout_name = dirs[1]
         
@@ -178,7 +194,7 @@ module StaticMatic
           layout_name = dir_layout_name
         end
       end
-      
+
       layout_name
     end
   

data/lib/staticmatic/helpers.rb

@@ -73,7 +73,7 @@ module StaticMatic
     
     # Generates an image tag
     def img(name, options = {})
-      options[:src] = "images/#{name}"
+      options[:src] = "/images/#{name}"
       options[:alt] ||= name.split('.').first.capitalize.gsub(/_|-/, ' ')
       tag :img, options
     end

data/lib/staticmatic/server.rb

@@ -18,7 +18,7 @@ module StaticMatic
 
       if file_ext && file_ext.match(/html|css/)
         response.start(200) do |head, out|
-          head["Content-Type"] = "text/html"
+          head["Content-Type"] = "text/#{file_ext}"
           output = ""
           
           if @staticmatic.template_exists?(file_name, file_dir)

data/test/base_test.rb

@@ -47,6 +47,6 @@ class StaticMaticBaseTest < Test::Unit::TestCase
   end
   
   def test_should_find_layout_from_passed_path
-    assert_equal "projects", @staticmatic.layout_from_source_dir("test/projects")
+    assert_equal "projects", @staticmatic.detirmine_layout("test/projects")
   end
 end

data/website/site/download.html

@@ -9,7 +9,7 @@
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="/images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -17,18 +17,32 @@
       <div id='menu'>
         <ul>
           <li><a href="/">Home</a></li>
-          <li><a href="download.html">Download</a></li>
-          <li><a href="how_to_use.html">How to use</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/how_to_use.html">How to use</a></li>
           <li>
             <a href="http://rubyforge.org/projects/staticmatic">Development</a>
           </li>
           <li>
             <a href="http://groups.google.co.uk/group/staticmatic">Community</a>
           </li>
-          <li><a href="faq.html">FAQ</a></li>
+          <li><a href="/faq.html">FAQ</a></li>
         </ul>
       </div>
       <div id='content_wrapper'>
+        <div id='side'>
+          <div id='news'>
+            <div class='heading'>News</div>
+            <div class='title'>0.8.4 Released!</div>
+            <p>
+              You can now enjoy:
+            </p>
+            <ul>
+              <li>Multiple directories</li>
+              <li>Partials</li>
+            </ul>
+            <a href="/releases/0_8_4.html">And More!</a>
+          </div>
+        </div>
         <div id='content'>
           <h1>Download</h1>
           <p>

data/website/site/faq.html

@@ -9,7 +9,7 @@
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="/images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -17,18 +17,32 @@
       <div id='menu'>
         <ul>
           <li><a href="/">Home</a></li>
-          <li><a href="download.html">Download</a></li>
-          <li><a href="how_to_use.html">How to use</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/how_to_use.html">How to use</a></li>
           <li>
             <a href="http://rubyforge.org/projects/staticmatic">Development</a>
           </li>
           <li>
             <a href="http://groups.google.co.uk/group/staticmatic">Community</a>
           </li>
-          <li><a href="faq.html">FAQ</a></li>
+          <li><a href="/faq.html">FAQ</a></li>
         </ul>
       </div>
       <div id='content_wrapper'>
+        <div id='side'>
+          <div id='news'>
+            <div class='heading'>News</div>
+            <div class='title'>0.8.4 Released!</div>
+            <p>
+              You can now enjoy:
+            </p>
+            <ul>
+              <li>Multiple directories</li>
+              <li>Partials</li>
+            </ul>
+            <a href="/releases/0_8_4.html">And More!</a>
+          </div>
+        </div>
         <div id='content'>
           <h1>FAQ</h1>
           <h3>

data/website/site/how_to_use.html

@@ -9,7 +9,7 @@
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="/images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -17,18 +17,32 @@
       <div id='menu'>
         <ul>
           <li><a href="/">Home</a></li>
-          <li><a href="download.html">Download</a></li>
-          <li><a href="how_to_use.html">How to use</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/how_to_use.html">How to use</a></li>
           <li>
             <a href="http://rubyforge.org/projects/staticmatic">Development</a>
           </li>
           <li>
             <a href="http://groups.google.co.uk/group/staticmatic">Community</a>
           </li>
-          <li><a href="faq.html">FAQ</a></li>
+          <li><a href="/faq.html">FAQ</a></li>
         </ul>
       </div>
       <div id='content_wrapper'>
+        <div id='side'>
+          <div id='news'>
+            <div class='heading'>News</div>
+            <div class='title'>0.8.4 Released!</div>
+            <p>
+              You can now enjoy:
+            </p>
+            <ul>
+              <li>Multiple directories</li>
+              <li>Partials</li>
+            </ul>
+            <a href="/releases/0_8_4.html">And More!</a>
+          </div>
+        </div>
         <div id='content'>
           <h1>How to Use</h1>
           <p>

data/website/site/index.html

@@ -9,7 +9,7 @@
     <div id='container'>
       <div id='header'>
         <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="/images/bycurve21.gif"/>
           </a>
         </div>
         <div class='title'>StaticMatic</div>
@@ -17,18 +17,32 @@
       <div id='menu'>
         <ul>
           <li><a href="/">Home</a></li>
-          <li><a href="download.html">Download</a></li>
-          <li><a href="how_to_use.html">How to use</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/how_to_use.html">How to use</a></li>
           <li>
             <a href="http://rubyforge.org/projects/staticmatic">Development</a>
           </li>
           <li>
             <a href="http://groups.google.co.uk/group/staticmatic">Community</a>
           </li>
-          <li><a href="faq.html">FAQ</a></li>
+          <li><a href="/faq.html">FAQ</a></li>
         </ul>
       </div>
       <div id='content_wrapper'>
+        <div id='side'>
+          <div id='news'>
+            <div class='heading'>News</div>
+            <div class='title'>0.8.4 Released!</div>
+            <p>
+              You can now enjoy:
+            </p>
+            <ul>
+              <li>Multiple directories</li>
+              <li>Partials</li>
+            </ul>
+            <a href="/releases/0_8_4.html">And More!</a>
+          </div>
+        </div>
         <div id='content'>
           <h1>Static websites, the modern way</h1>
           <p>
@@ -47,16 +61,16 @@
           <div class='columns'>
             <div class='left_column'>
               <em>Concise and terse Haml Templating</em>
-              <img alt="Homepage templating" src="images/homepage-templating.jpg"/>
+              <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"/>
+              <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"/>
+            <img alt="Homepage build" src="/images/homepage-build.jpg"/>
           </p>
         </div>
       </div>

data/website/site/releases/0_8_4.html

@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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 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 alt="Bycurve21" src="/images/bycurve21.gif"/>
+          </a>
+        </div>
+        <div class='title'>StaticMatic</div>
+      </div>
+      <div id='menu'>
+        <ul>
+          <li><a href="/">Home</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/how_to_use.html">How to use</a></li>
+          <li>
+            <a href="http://rubyforge.org/projects/staticmatic">Development</a>
+          </li>
+          <li>
+            <a href="http://groups.google.co.uk/group/staticmatic">Community</a>
+          </li>
+          <li><a href="/faq.html">FAQ</a></li>
+        </ul>
+      </div>
+      <div id='content_wrapper'>
+        <div id='side'>
+          <div id='news'>
+            <div class='heading'>News</div>
+            <div class='title'>0.8.4 Released!</div>
+            <p>
+              You can now enjoy:
+            </p>
+            <ul>
+              <li>Multiple directories</li>
+              <li>Partials</li>
+            </ul>
+            <a href="/releases/0_8_4.html">And More!</a>
+          </div>
+        </div>
+        <div id='content'>
+          <h1>StaticMatic 0.8.4</h1>
+          <p>
+            Don't be fooled by the small minor increments - there's loads of great stuff in the latest release:
+          </p>
+          <h2>Sub-Directory Support</h2>
+          <p>
+            Thanks to Brent Beardsley, you can now have as many directories as you like.  This should be considered 'beta' at the moment as there is likely to be issues with paths in the helpers, but try it out and we'll figure out the best solution.
+          </p>
+          <h2>Partials!</h2>
+          <p>
+            Simply create a 'partials' directory in your src/ and you'll be able to do:
+            <div class='code'>partial("partial_name")</div>
+          </p>
+          <h2>Layouts based on directory</h2>
+          <p>
+            Along with sub-directory support, you can also create layouts based on the sub-directory a template is in.  For example, if you have a 'projects' directory and would like it to render a different template, simply create 'projects.haml' in your layouts directory.
+          </p>
+          <h2>Relative Stylesheet Linking</h2>
+          <p>
+            You can now tell the stylesheet helper to use relative linking:
+            <div class='code'>= stylesheets :relative => true</div>
+          </p>
+          <p>
+            <em>
+              Note that you may get issues with nested directories and relative stylesheets
+            </em>
+          </p>
+          <h2>What's Next?</h2>
+          <p>
+            The main things on the list are configuration and clearing up any bugs not yet sorted.  It'd also be great to start extending the test set more.
+          </p>
+        </div>
+      </div>
+      <div id='footer'>
+        <p>
+          Made with StaticMatic, Hosted by
+          <a href="http://rubyforge.org">RubyForge</a>
+        </p>
+      </div>
+      <script src='http://www.google-analytics.com/urchin.js' type='text/javascript'>
+        _hamlspace = "";
+      </script>
+      <script type='text/javascript'>
+        _uacct = "UA-775359-8";
+        urchinTracker();
+      </script>
+    </div>
+  </body>
+</html>

data/website/site/stylesheets/application.css

@@ -154,18 +154,6 @@ hr {
 	position: relative;
 }
 
-#side {
-	float: right;
-	width: 200px;
-	border: 1px solid #aaa;
-	background-color: #efefef;
-	padding: 5px;
-	margin: 0 0 10px 0;
-}
-
-#side a {
-	display: block;
-}
 
 #content_wrapper {
 	width: 920px;
@@ -264,6 +252,18 @@ hr {
 	margin: 10px 0 10px 0;
 }
 
+#side {
+	float: right;
+	width: 200px;
+	border: 1px solid #aaa;
+	background-color: #efefef;
+	padding: 5px;
+	margin: 0 0 10px 0;
+}
+
+#side a {
+	display: block;
+}
 
 
 #side #news {

data/website/src/layouts/application.haml

@@ -14,13 +14,24 @@
 
         %ul
           %li= link "Home", "/"
-          %li= link "Download"
-          %li= link "How to use"
+          %li= link "Download", "/download.html"
+          %li= link "How to use", "/how_to_use.html"
           %li= link "Development", "http://rubyforge.org/projects/staticmatic"
           %li= link "Community", "http://groups.google.co.uk/group/staticmatic"
-          %li= link "FAQ"
+          %li= link "FAQ", "/faq.html"
 
       #content_wrapper
+        #side
+          #news
+            .heading News
+            .title 0.8.4 Released!
+            %p 
+              You can now enjoy:
+            %ul
+              %li Multiple directories
+              %li Partials
+            = link "And More!", "/releases/0_8_4.html"
+              
 
         #content
           = yield

data/website/src/pages/releases/0_8_4.haml

@@ -0,0 +1,25 @@
+%h1 StaticMatic 0.8.4 
+
+%p Don't be fooled by the small minor increments - there's loads of great stuff in the latest release:
+
+%h2 Sub-Directory Support
+%p Thanks to Brent Beardsley, you can now have as many directories as you like.  This should be considered 'beta' at the moment as there is likely to be issues with paths in the helpers, but try it out and we'll figure out the best solution.
+
+%h2 Partials! 
+%p 
+  Simply create a 'partials' directory in your src/ and you'll be able to do: 
+  .code partial("partial_name")
+
+%h2 Layouts based on directory
+%p Along with sub-directory support, you can also create layouts based on the sub-directory a template is in.  For example, if you have a 'projects' directory and would like it to render a different template, simply create 'projects.haml' in your layouts directory.
+
+%h2 Relative Stylesheet Linking
+%p 
+  You can now tell the stylesheet helper to use relative linking:
+  .code = stylesheets :relative => true
+  
+%p
+  %em Note that you may get issues with nested directories and relative stylesheets
+
+%h2 What's Next?
+%p The main things on the list are configuration and clearing up any bugs not yet sorted.  It'd also be great to start extending the test set more.

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
-date: 2007-09-18 00:00:00 +01:00
+  version: 0.8.5
+date: 2007-09-19 00:00:00 +01:00
 summary: Manage static sites using Haml & Sass
 require_paths: 
 - lib
@@ -63,6 +63,7 @@ files:
 - StaticMatic - website.zip
 - staticmatic-0.8.0.gem
 - staticmatic-0.8.1.gem
+- staticmatic-0.8.4.gem
 - test
 - test/base_test.rb
 - test/helpers_test.rb
@@ -102,6 +103,8 @@ files:
 - website/site/images/homepage-templating.jpg
 - website/site/index.html
 - website/site/javascripts
+- website/site/releases
+- website/site/releases/0_8_4.html
 - website/site/stylesheets
 - website/site/stylesheets/application.css
 - website/src
@@ -113,6 +116,8 @@ files:
 - website/src/pages/faq.haml
 - website/src/pages/how_to_use.haml
 - website/src/pages/index.haml
+- website/src/pages/releases
+- website/src/pages/releases/0_8_4.haml
 - website/src/partials
 - website/src/stylesheets
 test_files: