bonsai 1.3.2 → 1.4.1

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@bonsai
+rvm 1.9.2@bonsai --create

data/Gemfile

@@ -1,16 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'jeweler'
-gem 'rspec', '~> 2.3'
-gem 'yard'
-
-gem 'tilt', '~> 0.9.0'
-gem 'mustache', '~> 0.7.0'
-gem 'builder'
-gem 'watch'
-gem 'sinatra'
-gem 'maruku'
-gem 'less'
-gem 'launchy'
-gem 'activesupport'
-gem 'i18n'
+gemspec

data/Gemfile.lock

@@ -1,3 +1,31 @@
+PATH
+  remote: .
+  specs:
+    bonsai (1.4.0)
+      activesupport (= 3.0.3)
+      activesupport (>= 3.0.3)
+      builder (= 3.0.0)
+      builder (>= 3.0.0)
+      i18n (= 0.5.0)
+      jeweler
+      launchy (= 0.3.7)
+      launchy (>= 0.3.7)
+      liquid (= 2.2.2)
+      liquid (>= 2.2.2)
+      maruku (= 0.6.0)
+      maruku (>= 0.6.0)
+      rack
+      rspec (~> 2.3)
+      sass (= 3.1.4)
+      sass
+      sinatra (= 1.0)
+      sinatra (>= 1.0)
+      tilt (= 1.3)
+      tilt (>= 1.3)
+      watch (= 0.1.0)
+      watch (>= 0.1.0)
+      yard
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -14,14 +42,9 @@ GEM
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    less (1.2.21)
-      mutter (>= 0.4.2)
-      treetop (>= 1.4.2)
+    liquid (2.2.2)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    mustache (0.7.0)
-    mutter (0.5.3)
-    polyglot (0.3.1)
     rack (1.2.1)
     rake (0.8.7)
     rspec (2.3.0)
@@ -32,12 +55,11 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    sass (3.1.4)
     sinatra (1.0)
       rack (>= 1.0)
     syntax (1.0.0)
-    tilt (0.9)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
+    tilt (1.3)
     watch (0.1.0)
     yard (0.6.4)
 
@@ -45,16 +67,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  builder
-  i18n
-  jeweler
-  launchy
-  less
-  maruku
-  mustache (~> 0.7.0)
-  rspec (~> 2.3)
-  sinatra
-  tilt (~> 0.9.0)
-  watch
+  bonsai!
+  rspec (>= 1.3.0)
   yard

data/README.md

@@ -4,7 +4,7 @@ Bonsai is a static web site generator, it uses the best tools available for site
 
 ## What it does
 
-  * Provides a tiny HTML5, mustache driven template set.
+  * Provides a tiny HTML5, [liquid](http://liquidmarkup.org/) driven template set.
   * Implies a simple structure to get started faster.
   * An inbuilt server for development. No setup required.
   * Tasks to export the site to `output`. Upload the contents of `output`. Job done.
@@ -36,7 +36,7 @@ Type `bonsai --help` for any help with commands
 
 Unlike other static generators, bonsai provides you with a built in web server. Once you've generated the necessary files (generator included) you can simply start developing. Type `bonsai --cultivate` in the root of the generated site, a web server (rack, with thin) will start up. 
 
-It will also watch for when you save files - taking care of processing your [lesscss](http://lesscss.org/) files - kind of like [autotest](http://www.zenspider.com/ZSS/Products/ZenTest/).
+It will also watch for when you save files - taking care of processing your [sass](http://sass-lang.com/) files - kind of like [autotest](http://www.zenspider.com/ZSS/Products/ZenTest/).
 
 ## Production server
 
@@ -67,8 +67,8 @@ When I found something that didn't quite work, was too slow or perhaps not even
 
 ## Links
 
-  * [Tilt](http://github.com/rtomayko/tilt) - defaulting to [Mustache](http://github.com/defunkt/mustache)
-  * [Less CSS](http://lesscss.org/)
+  * [Tilt](http://github.com/rtomayko/tilt)
+  * [SASS](http://sass-lang.com/)
   * [YUI CSS/Javascript compressor](http://developer.yahoo.com/yui/compressor/)
 
 

data/Rakefile

@@ -15,19 +15,21 @@ begin
     gem.has_rdoc = false
     gem.files.exclude 'vendor/gems'
     
-    gem.add_development_dependency "rspec", ">= 1.3.0"
+    gem.add_development_dependency "rspec", "~> 2.3"
     gem.add_development_dependency "yard", ">= 0"
-    gem.add_dependency "tilt", ">= 0.5"
-    gem.add_dependency "mustache", ">= 0.5.0"
-    gem.add_dependency "builder", ">= 2.1.2"
+    
+    gem.add_dependency "rack"
+    gem.add_dependency "sinatra", ">= 1.0"
+    gem.add_dependency "tilt", ">= 1.3"
+    gem.add_dependency "liquid", ">= 2.2.2"
+    gem.add_dependency "builder", ">= 3.0.0"
     gem.add_dependency "watch", ">= 0.1.0"
-    gem.add_dependency "sinatra", ">= 0.9.4"
     gem.add_dependency "maruku", ">= 0.6.0"
-    gem.add_dependency "less", ">= 1.2.17"
-    gem.add_dependency "rack", ">= 1.2.1"
-    gem.add_dependency "launchy", ">= 0.3.3"
-    gem.add_dependency "activesupport", ">= 2.3.5"
-
+    gem.add_dependency "launchy", ">= 0.3.7"
+    gem.add_dependency "activesupport", ">= 3.0.3"
+    gem.add_dependency "i18n", ">= 0.5.0"
+    gem.add_dependency "sass"
+    
     gem.post_install_message = %q{
 
       盆栽

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.1

data/bonsai.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{bonsai}
-  s.version = "1.3.0"
+  s.name = "bonsai"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-12-28}
-  s.default_executable = %q{bonsai}
-  s.description = %q{A static site generator that uses the best toolset available}
-  s.email = %q{ben.schwarz@gmail.com}
+  s.date = "2011-09-20"
+  s.description = "A static site generator that uses the best toolset available"
+  s.email = "ben.schwarz@gmail.com"
   s.executables = ["bonsai"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -21,7 +20,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".bundle/config",
     ".document",
-    ".kick",
+    ".rspec",
+    ".rvmrc",
     "CHANGES",
     "Gemfile",
     "Gemfile.lock",
@@ -50,18 +50,18 @@ Gem::Specification.new do |s|
     "lib/bonsai/templates/content/3.history/default.yml",
     "lib/bonsai/templates/content/index/default.yml",
     "lib/bonsai/templates/public/.htaccess",
-    "lib/bonsai/templates/public/css/base.less",
+    "lib/bonsai/templates/public/css/base.scss",
     "lib/bonsai/templates/public/robots.txt",
     "lib/bonsai/templates/site.yml",
-    "lib/bonsai/templates/templates/default.mustache",
-    "lib/bonsai/templates/templates/magic.mustache",
-    "lib/bonsai/templates/templates/products.mustache",
-    "lib/bonsai/templates/templates/shared/analytics.mustache",
-    "lib/bonsai/templates/templates/shared/breadcrumbs.mustache",
-    "lib/bonsai/templates/templates/shared/footer.mustache",
-    "lib/bonsai/templates/templates/shared/head.mustache",
-    "lib/bonsai/templates/templates/shared/header.mustache",
-    "lib/bonsai/templates/templates/shared/nav.mustache",
+    "lib/bonsai/templates/templates/default.liquid",
+    "lib/bonsai/templates/templates/magic.liquid",
+    "lib/bonsai/templates/templates/products.liquid",
+    "lib/bonsai/templates/templates/shared/_analytics.liquid",
+    "lib/bonsai/templates/templates/shared/_breadcrumbs.liquid",
+    "lib/bonsai/templates/templates/shared/_footer.liquid",
+    "lib/bonsai/templates/templates/shared/_head.liquid",
+    "lib/bonsai/templates/templates/shared/_header.liquid",
+    "lib/bonsai/templates/templates/shared/_nav.liquid",
     "lib/bonsai/webserver.rb",
     "lib/bonsai/webserver/error.erb",
     "lib/core_ext/string.rb",
@@ -86,7 +86,6 @@ Gem::Specification.new do |s|
     "spec/support/content/1.about-us/1.contact/1.child/a_file_asset.txt",
     "spec/support/content/1.about-us/1.contact/1.child/demo-template.yml",
     "spec/support/content/1.about-us/1.contact/demo-template.yml",
-    "spec/support/content/1.about-us/1.contact/images/image001.jpg",
     "spec/support/content/1.about-us/1.contact/magic/image001.jpg",
     "spec/support/content/1.about-us/1.contact/magic/image002.jpg",
     "spec/support/content/1.about-us/demo-template.yml",
@@ -104,128 +103,85 @@ Gem::Specification.new do |s|
     "spec/support/content/2.products/demo-template.yml",
     "spec/support/content/index/demo-template.yml",
     "spec/support/content/legals/terms-and-conditions/demo-template.yml",
+    "spec/support/content/render/image-spec/images.yml",
+    "spec/support/content/render/image-spec/images/image001.jpg",
     "spec/support/public/.htaccess",
     "spec/support/public/js/script.js",
-    "spec/support/public/stylesheets/brokenless.less",
     "spec/support/public/stylesheets/brokensass.sass",
-    "spec/support/public/stylesheets/lesscss.css",
-    "spec/support/public/stylesheets/lesscss.less",
     "spec/support/public/stylesheets/sassy.css",
-    "spec/support/public/stylesheets/sassy.sass",
+    "spec/support/public/stylesheets/sassy.scss",
     "spec/support/site.yml",
-    "spec/support/templates/demo-template.mustache",
-    "spec/support/templates/partials/inserted.mustache",
+    "spec/support/templates/children.liquid",
+    "spec/support/templates/demo-template.liquid",
+    "spec/support/templates/images.liquid",
+    "spec/support/templates/partials/_inserted.liquid",
+    "spec/support/templates/partials/_magic.liquid",
     "vendor/yui-compressor/yuicompressor-2.4.2.jar"
   ]
-  s.has_rdoc = false
-  s.homepage = %q{http://github.com/benschwarz/bonsai}
-  s.post_install_message = %q{
-
-      盆栽
-      bonsai, tiny and beautiful
-
-
-
-      type `bonsai --help` to get started
-    }
+  s.homepage = "http://github.com/benschwarz/bonsai"
+  s.post_install_message = "\n\n      \347\233\206\346\240\275\n      bonsai, tiny and beautiful\n\n\n\n      type `bonsai --help` to get started\n    "
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A static site generator that uses the best toolset available}
-  s.test_files = [
-    "spec/bonsai/console_spec.rb",
-    "spec/bonsai/exporter_spec.rb",
-    "spec/bonsai/generate_spec.rb",
-    "spec/bonsai/navigation_spec.rb",
-    "spec/bonsai/page_spec.rb",
-    "spec/bonsai/sitemap_spec.rb",
-    "spec/bonsai/template_spec.rb",
-    "spec/bonsai_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "A static site generator that uses the best toolset available"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<rspec>, [">= 0"])
-      s.add_runtime_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<tilt>, ["~> 0.5.0"])
-      s.add_runtime_dependency(%q<mustache>, ["~> 0.5.0"])
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<watch>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<maruku>, [">= 0"])
-      s.add_runtime_dependency(%q<less>, [">= 0"])
-      s.add_runtime_dependency(%q<launchy>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_runtime_dependency(%q<bonsai>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<tilt>, [">= 0.5"])
-      s.add_runtime_dependency(%q<mustache>, [">= 0.5.0"])
-      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_runtime_dependency(%q<tilt>, [">= 1.3"])
+      s.add_runtime_dependency(%q<liquid>, [">= 2.2.2"])
+      s.add_runtime_dependency(%q<builder>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<watch>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<maruku>, [">= 0.6.0"])
-      s.add_runtime_dependency(%q<less>, [">= 1.2.17"])
-      s.add_runtime_dependency(%q<rack>, [">= 1.2.1"])
-      s.add_runtime_dependency(%q<launchy>, [">= 0.3.3"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_runtime_dependency(%q<launchy>, [">= 0.3.7"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.3"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<sass>, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bonsai>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<tilt>, ["~> 0.5.0"])
-      s.add_dependency(%q<mustache>, ["~> 0.5.0"])
-      s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<watch>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<maruku>, [">= 0"])
-      s.add_dependency(%q<less>, [">= 0"])
-      s.add_dependency(%q<launchy>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<tilt>, [">= 0.5"])
-      s.add_dependency(%q<mustache>, [">= 0.5.0"])
-      s.add_dependency(%q<builder>, [">= 2.1.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.3"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_dependency(%q<tilt>, [">= 1.3"])
+      s.add_dependency(%q<liquid>, [">= 2.2.2"])
+      s.add_dependency(%q<builder>, [">= 3.0.0"])
       s.add_dependency(%q<watch>, [">= 0.1.0"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_dependency(%q<maruku>, [">= 0.6.0"])
-      s.add_dependency(%q<less>, [">= 1.2.17"])
-      s.add_dependency(%q<rack>, [">= 1.2.1"])
-      s.add_dependency(%q<launchy>, [">= 0.3.3"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_dependency(%q<launchy>, [">= 0.3.7"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.3"])
+      s.add_dependency(%q<i18n>, [">= 0.5.0"])
+      s.add_dependency(%q<sass>, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bonsai>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<tilt>, ["~> 0.5.0"])
-    s.add_dependency(%q<mustache>, ["~> 0.5.0"])
-    s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<watch>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<maruku>, [">= 0"])
-    s.add_dependency(%q<less>, [">= 0"])
-    s.add_dependency(%q<launchy>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<tilt>, [">= 0.5"])
-    s.add_dependency(%q<mustache>, [">= 0.5.0"])
-    s.add_dependency(%q<builder>, [">= 2.1.2"])
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
+    s.add_dependency(%q<tilt>, [">= 1.3"])
+    s.add_dependency(%q<liquid>, [">= 2.2.2"])
+    s.add_dependency(%q<builder>, [">= 3.0.0"])
     s.add_dependency(%q<watch>, [">= 0.1.0"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     s.add_dependency(%q<maruku>, [">= 0.6.0"])
-    s.add_dependency(%q<less>, [">= 1.2.17"])
-    s.add_dependency(%q<rack>, [">= 1.2.1"])
-    s.add_dependency(%q<launchy>, [">= 0.3.3"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    s.add_dependency(%q<launchy>, [">= 0.3.7"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.3"])
+    s.add_dependency(%q<i18n>, [">= 0.5.0"])
+    s.add_dependency(%q<sass>, [">= 0"])
   end
 end
 

data/lib/bonsai/exporter.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'less'
+require 'sass'
 
 module Bonsai
   class Exporter
@@ -80,10 +80,10 @@ module Bonsai
         Page.all.each do |page|
           page.assets.each do |asset|      
             # Create the path to the asset by the export path of the page + File.dirname(asset permalink)
-            FileUtils.mkdir_p "#{path}#{File.dirname(asset[:path])}"
+            FileUtils.mkdir_p "#{path}#{File.dirname(asset['path'])}"
             
             # Copy the the asset from its disk path to File.dirname(asset permalink)
-            FileUtils.cp asset[:disk_path], "#{path}#{asset[:path]}"            
+            FileUtils.cp asset['disk_path'], "#{path}#{asset['path']}"
           end
         end
       end
@@ -106,13 +106,13 @@ module Bonsai
       end
       
       def generate_css
-        Dir["#{Bonsai.root_dir}/public/**/*.{less,sass}"].each do |cssfile|
+        Dir["#{Bonsai.root_dir}/public/**/*.{less,sass,scss}"].each do |cssfile|
           css = Tilt.new(cssfile).render
           path = "#{File.dirname(cssfile)}/#{File.basename(cssfile, ".*")}.css"
           
           File.open(path, "w") {|file| file.write(css) }
         end
-      rescue Less::SyntaxError => exception
+      rescue Sass::SyntaxError => exception
         Bonsai.log "CSS Syntax error\n\n#{exception.message}"
       end
       

data/lib/bonsai/page.rb

@@ -1,8 +1,13 @@
 require 'yaml'
+
+if RUBY_VERSION =~ /^1.9./
+  YAML::ENGINE.yamler = 'syck'
+end
+
 require 'tilt'
+require 'liquid'
 require 'active_support/inflector'
 
-# Use RDiscount for those who care
 begin 
   require 'rdiscount'
   BlueCloth = RDiscount
@@ -12,7 +17,7 @@ end
 
 module Bonsai
   class Page
-    class NotFound < StandardError; end;  
+    class NotFound < StandardError; end;
     class << self
       attr_accessor :path, :pages
       
@@ -132,7 +137,7 @@ module Bonsai
     # content file results, as well as any "magic" hashes for file 
     # system contents
     def to_hash
-      {
+      hash = {
         :slug         => slug, 
         :permalink    => permalink, 
         :name         => name, 
@@ -144,11 +149,16 @@ module Bonsai
         :updated_at   => mtime,
         :created_at   => ctime
       }.merge(formatted_content).merge(disk_assets).merge(Bonsai.site)
+      
+      hash.stringify_keys
     end
     
+    alias to_liquid to_hash
+    
     private
+    # This method ensures that multiline strings are run through markdown and smartypants
     def formatted_content
-      formatted_content = content      
+      formatted_content = content
       formatted_content.each do |k,v|
         if v.is_a?(String) and v =~ /\n/
           formatted_content[k] = to_markdown(v)
@@ -181,8 +191,8 @@ module Bonsai
       name = File.basename(path)
       
       {
-        name.to_sym => Dir["#{path}/*"].map do |file|
-          file_to_hash(file)  
+        name => Dir["#{path}/*"].map do |file|
+          file_to_hash(file)
         end
       }
     end
@@ -204,7 +214,7 @@ module Bonsai
         :name       => File.basename(file, ".*").titleize,
         :path       => "#{web_path(File.dirname(file))}/#{File.basename(file)}",
         :disk_path  => File.expand_path(file)
-      }
+      }.stringify_keys
     end
   end
 end

data/lib/bonsai/templates/public/css/{base.less → base.scss}

@@ -1,3 +1,5 @@
+@charset "utf-8";
+
 /* HTML resets */
 body, html, div, p, img, h1, h2, h3, h4, h5, h6, ol, ul, li { margin: 0; padding: 0; font-weight: normal; font-size: 100%; outline: none; border: none;}
 

data/lib/bonsai/templates/templates/default.liquid

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  {% include "shared/head" %}
+  <body id="{{slug}}">
+    <section id="wrapper">
+      {% include "shared/header" %}	
+	  
+	    <article>
+	      <h2>{{headline}}</h2>
+		    <section role="main">
+		      {{body}}
+		    </section>
+	    </article>
+	
+      {% include "shared/footer" %}
+    </section>
+    {% include "shared/analytics" %}
+  </body>
+</html>

data/lib/bonsai/templates/templates/magic.liquid

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+  {% include "shared/head" %}
+  <body id="{{slug}}">
+    <section id="wrapper" class="magic">
+      {% include "shared/header" %}	
+	  
+	    <article>
+	      <h2>{{headline}}</h2>
+		    <section role="main">
+		      {{body}}
+		    </section>
+  			<figure>
+  			{% for image in images %}
+  			<!-- renders files located in a "images" folder within you page content -->
+  			  <img src="{{image.path}}" alt="{{image.name}}" />
+  			{% endfor %}
+  			</figure>
+	    </article>
+		<aside>
+			{{aside}}
+		</aside>
+		<div class="clear"></div>
+      {% include "shared/footer" %}
+    </section>
+    {% include "shared/analytics" %}
+  </body>
+</html>

data/lib/bonsai/templates/templates/products.liquid

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+  {% include "shared/head" %}
+  <body id="{{slug}}">
+    <section id="wrapper">
+      {% include "shared/header" %}
+    
+  	  <article>
+  	  	<h2>{{headline}}</h2>
+        <section role="main">
+		      {{body}}
+		    </section>
+  	  </article>
+	  
+  	  <nav id="sub-navigation">
+        <ol>
+          {% for child in children %}
+  	        <li><a href="{{child.permalink}}">{{child.name}}</a></li>
+  	      {% endfor %}
+  	    </ol>
+      </nav>
+	  
+      {% include "shared/footer" %}
+    </section>
+  </body>
+  {% include "shared/analytics" %}
+</html>

data/lib/bonsai/templates/templates/shared/_breadcrumbs.liquid

@@ -0,0 +1,9 @@
+<nav id="breadcrumbs">
+  <ol>
+    <li><a href="/">Home</a></li>
+    {% for ancestor in ancestors %}
+      <li><a href="{{ancestor.permalink}}">{{ancestor.name}}</a></li>
+    {% endfor %}
+    <li>{{headline}}</li>
+  </ol>
+</nav>

data/lib/bonsai/templates/templates/shared/_header.liquid

@@ -0,0 +1,5 @@
+<header>
+  <h1 id="logo"><a href="/" rel="home">Tiny<br />Tree</a></h1>
+  {% include "shared/nav" %}
+  {% include "shared/breadcrumbs" %}
+</header>

data/lib/bonsai/templates/templates/shared/_nav.liquid

@@ -0,0 +1,8 @@
+<nav id="navigation">
+  <ol>
+  <li><a href="/">Home</a></li>
+  {% for item in navigation %}
+    <li><a href="{{item.permalink}}">{{item.name}}</a></li>
+  {% endfor %}
+  </ol>
+</nav>