bonsai 1.3.0 → 1.3.1

data/CHANGES

@@ -1,9 +1,6 @@
-= 1.3.0 (29/03/2010)
+= 1.3.0 (20/03/2010)
 
 * File assets are no longer stripped of digits from the file name (Closes Issue #7)
-* File asset "name" property is titlecased. (Closes Issue #11)
-* Added a .gitignore so that the output directory is ignored from the get-go. 
-* Lock to mustache 0.6 to avoid 0.9.X bugs
 
 = 1.2.0 (13/03/2010)
 

data/Gemfile

@@ -1,13 +1,12 @@
-source :gemcutter
-
 gem 'jeweler'
 gem 'rspec'
 gem 'yard'
 gem 'tilt'
-gem 'mustache', '0.6.0'
+gem 'mustache'
 gem 'builder'
 gem 'watch'
 gem 'sinatra'
 gem 'maruku'
 gem 'less'
-gem 'launchy'
+gem 'launchy'
+gem 'activesupport'

data/Gemfile.lock

@@ -1,95 +1,58 @@
---- 
-dependencies: 
-  maruku: 
-    group: 
-    - :default
-    version: ">= 0"
-  mustache: 
-    group: 
-    - :default
-    version: = 0.6.0
-  yard: 
-    group: 
-    - :default
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :default
-    version: ">= 0"
-  watch: 
-    group: 
-    - :default
-    version: ">= 0"
-  sinatra: 
-    group: 
-    - :default
-    version: ">= 0"
-  jeweler: 
-    group: 
-    - :default
-    version: ">= 0"
-  less: 
-    group: 
-    - :default
-    version: ">= 0"
-  tilt: 
-    group: 
-    - :default
-    version: ">= 0"
-  builder: 
-    group: 
-    - :default
-    version: ">= 0"
-  launchy: 
-    group: 
-    - :default
-    version: ">= 0"
-specs: 
-- rake: 
-    version: 0.8.7
-- builder: 
-    version: 2.1.2
-- configuration: 
-    version: 1.1.0
-- json_pure: 
-    version: 1.2.3
-- gemcutter: 
-    version: 0.5.0
-- git: 
-    version: 1.2.5
-- rubyforge: 
-    version: 2.0.4
-- jeweler: 
-    version: 1.4.0
-- launchy: 
-    version: 0.3.5
-- mutter: 
-    version: 0.5.3
-- polyglot: 
-    version: 0.3.1
-- treetop: 
-    version: 1.4.5
-- less: 
-    version: 1.2.21
-- syntax: 
-    version: 1.0.0
-- maruku: 
-    version: 0.6.0
-- mustache: 
-    version: 0.6.0
-- rack: 
-    version: 1.1.0
-- rspec: 
-    version: 1.3.0
-- sinatra: 
-    version: "1.0"
-- tilt: 
-    version: "0.8"
-- watch: 
-    version: 0.1.0
-- yard: 
-    version: 0.5.4
-hash: b3b574f01bf6f8e6fe47ea377ef334b53b8a4396
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org
+GEM
+  specs:
+    activesupport (2.3.5)
+    builder (2.1.2)
+    configuration (1.1.0)
+    gemcutter (0.2.0)
+      json_pure
+      net-scp
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.3)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    less (1.2.20)
+      mutter (>= 0.4.2)
+      treetop (>= 1.4.2)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    mustache (0.6.0)
+    mutter (0.5.2)
+    net-scp (1.0.2)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.0.15)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    rspec (1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sinatra (1.0)
+      rack (>= 1.0)
+    syntax (1.0.0)
+    tilt (0.8)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    watch (0.1.0)
+    yard (0.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  builder
+  jeweler
+  launchy
+  less
+  maruku
+  mustache
+  rspec
+  sinatra
+  tilt
+  watch
+  yard

data/Rakefile

@@ -1,13 +1,15 @@
 # coding: utf-8
 begin
-  require File.dirname(__FILE__) + '/.bundle/environment'
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 rescue LoadError
   raise <<-HELP
     Bonsai uses the gem bundler to handle its development dependencies under 
-    multiple environments. So if you're testing under 1.8, 1.9, jruby or otherwise
+    multiple environments. So if you're testing under 1.8, 1.9.x, jruby or otherwise
     you should ensure that you have the `bundler` gem installed.
     
-    Then run `bundle install --relock`. Following going through these steps you should
+    Then run `gem bundle`. Following going through these steps you should
     not see this error message. If you do, please contact me or raise an issue.
       (http://github.com/benschwarz/bonsai/issues)
   HELP
@@ -27,19 +29,19 @@ begin
     gem.executables = ['bonsai']
     gem.has_rdoc = false
     gem.files.exclude 'vendor/gems'
-    gem.files.exclude 'vendor/cache'
     
     gem.add_development_dependency "rspec", ">= 1.3.0"
     gem.add_development_dependency "yard", ">= 0"
-    gem.add_dependency "tilt", ">= 0.8"
-    gem.add_dependency "mustache", "= 0.6"
-    gem.add_dependency "builder", ">= 2.1.2"
-    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.1.0"
-    gem.add_dependency "launchy", ">= 0.3.3"
+    gem.add_dependency "tilt", "= 0.5"
+    gem.add_dependency "mustache", "= 0.5.0"
+    gem.add_dependency "builder", "= 2.1.2"
+    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.1.0"
+    gem.add_dependency "launchy", "= 0.3.3"
+    gem.add_dependency "activesupport", "= 2.3.5"
 
     gem.post_install_message = %q{
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/benchmark/associations.rb

@@ -1,4 +1,4 @@
-require 'lib/bonsai'
+require File.expand_path("#{File.dirname(__FILE__)}/../lib/bonsai")
 require 'benchmark'
 
 Bonsai.root_dir = File.dirname(__FILE__) + "/../spec/support"

data/bonsai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bonsai}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-08-03}
   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}
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".bundle/config",
-     ".bundle/environment.rb",
      ".document",
      ".gitignore",
      ".kick",
@@ -42,6 +41,7 @@ Gem::Specification.new do |s|
      "lib/bonsai/page.rb",
      "lib/bonsai/sitemap.rb",
      "lib/bonsai/template.rb",
+     "lib/bonsai/templates/.gitignore",
      "lib/bonsai/templates/content/1.varieties/1.fig/default.yml",
      "lib/bonsai/templates/content/1.varieties/2.maple/default.yml",
      "lib/bonsai/templates/content/1.varieties/3.magic/images/magic.jpg",
@@ -65,6 +65,7 @@ Gem::Specification.new do |s|
      "lib/bonsai/templates/templates/shared/nav.mustache",
      "lib/bonsai/webserver.rb",
      "lib/bonsai/webserver/error.erb",
+     "lib/core_ext/string.rb",
      "spec/bonsai/console_spec.rb",
      "spec/bonsai/exporter_spec.rb",
      "spec/bonsai/generate_spec.rb",
@@ -115,9 +116,21 @@ Gem::Specification.new do |s|
      "spec/support/site.yml",
      "spec/support/templates/demo-template.mustache",
      "spec/support/templates/partials/inserted.mustache",
-     "vendor/yui-compressor/yuicompressor-2.4.2.jar"
+     "vendor/cache/activesupport-2.3.5.gem",
+     "vendor/cache/builder-2.1.2.gem",
+     "vendor/cache/configuration-1.1.0.gem",
+     "vendor/cache/gemcutter-0.5.0.gem",
+     "vendor/cache/git-1.2.5.gem",
+     "vendor/cache/jeweler-1.4.0.gem",
+     "vendor/cache/json_pure-1.2.3.gem",
+     "vendor/cache/maruku-0.6.0.gem",
+     "vendor/cache/rake-0.8.7.gem",
+     "vendor/cache/rspec-1.3.0.gem",
+     "vendor/cache/rubyforge-2.0.4.gem",
+     "vendor/cache/syntax-1.0.0.gem",
+     "vendor/cache/watch-0.1.0.gem",
+     "vendor/cache/yard-0.2.2.gem"
   ]
-  s.has_rdoc = false
   s.homepage = %q{http://github.com/benschwarz/bonsai}
   s.post_install_message = %q{
 
@@ -130,7 +143,7 @@ Gem::Specification.new do |s|
     }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  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",
@@ -148,43 +161,46 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<tilt>, [">= 0.8"])
-      s.add_runtime_dependency(%q<mustache>, ["= 0.6"])
-      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
-      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.1.0"])
-      s.add_runtime_dependency(%q<launchy>, [">= 0.3.3"])
+      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_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.1.0"])
+      s.add_runtime_dependency(%q<launchy>, ["= 0.3.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.5"])
     else
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<tilt>, [">= 0.8"])
-      s.add_dependency(%q<mustache>, ["= 0.6"])
-      s.add_dependency(%q<builder>, [">= 2.1.2"])
-      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.1.0"])
-      s.add_dependency(%q<launchy>, [">= 0.3.3"])
+      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<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.1.0"])
+      s.add_dependency(%q<launchy>, ["= 0.3.3"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<tilt>, [">= 0.8"])
-    s.add_dependency(%q<mustache>, ["= 0.6"])
-    s.add_dependency(%q<builder>, [">= 2.1.2"])
-    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.1.0"])
-    s.add_dependency(%q<launchy>, [">= 0.3.3"])
+    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<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.1.0"])
+    s.add_dependency(%q<launchy>, ["= 0.3.3"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.5"])
   end
 end
 

data/lib/bonsai/exporter.rb

@@ -64,12 +64,15 @@ module Bonsai
         
         readme = <<-README
           This site was built using Bonsai (http://tinytree.info)
-          
-          To make changes to the site you will require the original source files.
+                
+          To make changes to the site using Bonsai you will require the original source files.
           Please contact the author of your site for details.
+          
+          It may also be a good idea to ensure that you've got Bonsai version #{Bonsai.version} or higher.
+          If you experience any unexplainable issues try uninstalling all versions of Bonsai (`gem uninstall bonsai`) and install version #{Bonsai.version} (`gem install bonsai -v #{Bonsai.version}`)
         README
         
-        File.open("#{path}/ABOUT-THIS-SITE", "w") {|file| file.write(readme) }
+        File.open("#{path}/ABOUT-THIS-SITE.txt", "w") {|file| file.write(readme) }
       end
       
       def copy_assets

data/lib/bonsai/page.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'tilt'
+require 'active_support/inflector'
 
 # Use RDiscount for those who care
 begin 
@@ -67,8 +68,8 @@ module Bonsai
     end
     
     # This method is used for the exporter to copy assets
-    def assets
-      Dir["#{directory}/**/*"].select{|path| !File.directory?(path) && !File.basename(path).include?("yml") }.map do |file|
+    def assets(disk_path = directory)
+      Dir["#{disk_path}/**/*"].select{|path| !File.directory?(path) && !File.basename(path).include?("yml") }.map do |file|
         file_to_hash(file)
       end
     end
@@ -95,8 +96,8 @@ module Bonsai
       self.class.all(File.dirname(disk_path[/(.+)\/[^\/]*$/, 1]), "*").delete_if{|p| p == self}
     end
     
-    def children
-      self.class.all(File.dirname(disk_path), "*").delete_if{|p| p.floating? }
+    def children(path = nil)
+      self.class.all((path||directory), "*").delete_if{|p| p.floating? }
     end
     
     def ancestors
@@ -169,8 +170,8 @@ module Bonsai
     # that isn't itself, a child-page (a page object)
     def disk_assets
       assets = {}
-      Dir["#{File.dirname(disk_path)}/**"].select{|p| File.directory?(p)}.reject {|p|
-        Dir.entries(p).any?{|e| e.include? "yml"}
+      Dir["#{File.dirname(disk_path)}/**"].select{|p| 
+        File.directory?(p)}.reject {|p| Dir.entries(p).any?{|e| e.include? "yml" }
       }.each{|asset_path| assets.merge!(map_to_disk(asset_path)) }
 
       assets
@@ -180,9 +181,10 @@ module Bonsai
       name = File.basename(path)
       
       {
-        name.to_sym => Dir["#{path}/*"].map do |file|
-          file_to_hash(file)  
-        end
+        name.to_sym => {
+          :files => assets(path),
+          :children => children(path).map{|page| page.to_hash }
+        }
       }
     end
     
@@ -200,7 +202,7 @@ module Bonsai
     
     def file_to_hash(file)
       {
-        :name       => File.basename(file),
+        :name       => File.basename(file, ".*").titleize,
         :path       => "#{web_path(File.dirname(file))}/#{File.basename(file)}",
         :disk_path  => File.expand_path(file)
       }

data/lib/bonsai/templates/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+output/*

data/lib/bonsai/templates/site.yml

@@ -1,5 +1,5 @@
 # The key value pairs found below are available within the templates.
-# {{site_name}}, {{url}}, {{copyright}} and {{analytics_code}}
+# {{site_name}}, {{url}}, {{copyright}} and {{analytics_code}} are examples
 
 :site_name: Your website title
 :url: http://yourdomain.com

data/lib/core_ext/string.rb

@@ -0,0 +1,11 @@
+class String
+  def to_permalink
+    # Pinched: http://github.com/jrun/merb_permalink_fu/tree/master/lib/merb_permalink_fu/permalink_fu.rb
+    string = self
+    
+    string = string.gsub(/\W+/, ' ')
+    string = string.strip
+    string = string.downcase
+    string = string.gsub(/\ +/, '-') # spaces to dashes, preferred separator char everywhere
+  end
+end

data/spec/bonsai/exporter_spec.rb

@@ -120,7 +120,7 @@ describe Bonsai::Exporter do
       end
       
       it "should write a readme file to explain how the site was generated" do
-        File.exists?("#{Bonsai::Exporter.path}/ABOUT-THIS-SITE").should be_true
+        File.exists?("#{Bonsai::Exporter.path}/ABOUT-THIS-SITE.txt").should be_true
       end
       
       describe "asset compression" do

data/spec/bonsai/generate_spec.rb

@@ -37,12 +37,12 @@ describe Bonsai::Generate do
       File.exists?("#{@path}/site.yml").should be_true
     end
     
-    it "should generate 21 files" do
-      Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 21
+    it "should generate 24 files" do
+      Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 24
     end
     
-    it "should generate 14 directories" do
-      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 14
+    it "should generate 16 directories" do
+      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 16
     end
   end
 end

data/spec/bonsai/page_spec.rb

@@ -37,6 +37,7 @@ describe Bonsai::Page do
       @page.should respond_to :mtime
       @page.mtime.should be_an_instance_of(Time)
     end
+    
     it "should remove numbers over 10 from the permalink" do
       Bonsai::Page.find("many-pages").permalink.should == "/many-pages/"
     end
@@ -56,7 +57,7 @@ describe Bonsai::Page do
       end
       
       it "should have the correct name" do
-        @page.assets.first[:name].should == "001.jpg"
+        @page.assets.first[:name].should == "001"
       end
       
       it "should have the correct path" do
@@ -66,6 +67,51 @@ describe Bonsai::Page do
       it "should have the correct disk_path" do
         @page.assets.first[:disk_path].should == "/Users/ben/Documents/Projects/bonsai/spec/support/content/1.about-us/history/001.jpg"
       end
+      
+      it "should titleize the name attribute and remove the file extension" do
+        @page.assets[2][:name].should == "A File Asset"
+      end
+      
+      describe "disk_assets" do
+        before :all do
+          @page = Bonsai::Page.find("about-us/contact")
+        end
+        
+        it "should have magic" do
+          @page.to_hash.should have_key(:magic)
+        end
+        
+        it "should have assets" do
+          @page.to_hash[:magic][:files].should be_an_instance_of(Array)
+          @page.to_hash[:magic][:files].should_not be_empty
+        end
+
+        it "it should be a an array of hashes" do
+          @page.to_hash[:magic][:files].should be_an_instance_of(Array)
+          @page.to_hash[:magic][:files].first.should be_an_instance_of(Hash)
+          @page.to_hash[:magic][:files].size.should == 2
+        end
+        
+        it "should have children" do
+          @page.to_hash[:magic][:children].should_not be_empty
+        end
+        
+        describe "children (pages)" do
+          it "should represent the children as pages" do
+            @page.to_hash[:magic][:children].first.should be_an_instance_of(Bonsai::Page)
+          end
+          
+          it "should contain a single child" do
+            @page.to_hash[:magic][:children].size.should == 1
+          end
+          
+          %w(slug permalink name page_title children siblings parent ancestors navigation updated_at created_at).each do |key|
+            it "should have a to_hash key for #{key}" do
+              @page.to_hash[:magic][:children].first.to_hash.keys.should include(key.to_sym)
+            end
+          end
+        end
+      end
     end
     
     it "should be equal" do
@@ -150,7 +196,7 @@ describe Bonsai::Page do
       end
       
       it "should replace mustache variables with properties from the content file" do
-        @output.should == "Hello from our template, named Contact\n\nGet in touch\n\n/about-us/contact/images/image001.jpg\n/about-us/contact/child/\n/about-us/contact/magic/image001.jpg\n/about-us/contact/magic/image002.jpg\nThis content should be inserted!\n\n<p>&ldquo;A designer knows he has achieved perfection\nnot when there is nothing left to add,\nbut when there is nothing left to take away.&rdquo;</p>\n\n<p>– Antoine de Saint-Exupery</p>\n"
+        @output.should == "Hello from our template, named Contact\n\nGet in touch\n\n/about-us/contact/images/image001.jpg\n/about-us/contact/child/\n/about-us/contact/magic/containing-a-page\n/about-us/contact/magic/image001.jpg\n/about-us/contact/magic/image002.jpg\nThis content should be inserted!\n\n<p>&ldquo;A designer knows he has achieved perfection\nnot when there is nothing left to add,\nbut when there is nothing left to take away.&rdquo;</p>\n\n<p>– Antoine de Saint-Exupery</p>\n"
       end
       
       it "should write in images" do
@@ -199,28 +245,6 @@ describe Bonsai::Page do
         @page.to_hash[:url].should == "http://tinytree.info"
         @page.to_hash[:copyright].should == 2010
       end
-      
-      describe "disk_assets" do
-        before :all do
-          @vars = @page.to_hash
-        end
-        
-        describe "enum" do
-          it "should not have a child" do
-            @vars.should_not have_key(:child)
-          end
-
-          it "should have magic" do
-            @vars.should have_key(:magic)
-          end
-
-          it "it should be a an array of hashes" do
-            @vars[:magic].should be_an_instance_of(Array)
-            @vars[:magic].first.should be_an_instance_of(Hash)
-            @vars[:magic].size.should == 2
-          end
-        end
-      end
     end
     
     describe "broken page" do

data/spec/bonsai/template_spec.rb

@@ -13,7 +13,7 @@ describe Bonsai::Template do
   describe "instance" do
     it "should give the template source" do
       @template = Bonsai::Template.find("demo-template")
-      File.read(@template.path).should == "Hello from our template, named {{name}}\n\n{{page_title}}\n\n{{#images}}\n  {{path}}\n{{/images}}\n\n{{#children}}\n  {{permalink}}\n{{/children}}\n\n{{#magic}}\n  {{path}}\n{{/magic}}\n\n{{>partials/inserted}}\n\n{{{body}}}"
+      File.read(@template.path).should == "Hello from our template, named {{name}}\n\n{{page_title}}\n\n{{#images}}\n  {{#files}}\n    {{path}}\n  {{/files}}\n{{/images}}\n\n{{#children}}\n  {{permalink}}\n{{/children}}\n\n{{#magic}}\n  {{path}}\n{{/magic}}\n\n{{>partials/inserted}}\n\n{{{body}}}"
     end
   end
 end

data/spec/support/templates/demo-template.mustache

@@ -3,7 +3,9 @@ Hello from our template, named {{name}}
 {{page_title}}
 
 {{#images}}
-  {{path}}
+  {{#files}}
+    {{path}}
+  {{/files}}
 {{/images}}
 
 {{#children}}

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bonsai
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -14,159 +15,198 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +11:00
+date: 2010-08-03 00:00:00 +10:00
 default_executable: bonsai
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
         - 0
         version: 1.3.0
   type: :development
+  name: rspec
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  name: yard
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: tilt
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
-        - 8
-        version: "0.8"
+        - 5
+        version: "0.5"
   type: :runtime
+  name: tilt
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mustache
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
+  name: mustache
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
         - 2
         version: 2.1.2
   type: :runtime
+  name: builder
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: watch
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 1
         - 0
         version: 0.1.0
   type: :runtime
+  name: watch
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
         - 4
         version: 0.9.4
   type: :runtime
+  name: sinatra
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: maruku
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
         - 0
         version: 0.6.0
   type: :runtime
+  name: maruku
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: less
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 1
         - 2
         - 17
         version: 1.2.17
   type: :runtime
+  name: less
+  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
         - 0
         version: 1.1.0
   type: :runtime
+  name: rack
+  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: launchy
-  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 3
         - 3
         version: 0.3.3
   type: :runtime
+  name: launchy
+  prerelease: false
   version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :runtime
+  name: activesupport
+  prerelease: false
+  version_requirements: *id012
 description: A static site generator that uses the best toolset available
 email: ben.schwarz@gmail.com
 executables: 
@@ -178,7 +218,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .bundle/config
-- .bundle/environment.rb
 - .document
 - .gitignore
 - .kick
@@ -200,6 +239,7 @@ files:
 - lib/bonsai/page.rb
 - lib/bonsai/sitemap.rb
 - lib/bonsai/template.rb
+- lib/bonsai/templates/.gitignore
 - lib/bonsai/templates/content/1.varieties/1.fig/default.yml
 - lib/bonsai/templates/content/1.varieties/2.maple/default.yml
 - lib/bonsai/templates/content/1.varieties/3.magic/images/magic.jpg
@@ -223,6 +263,7 @@ files:
 - lib/bonsai/templates/templates/shared/nav.mustache
 - lib/bonsai/webserver.rb
 - lib/bonsai/webserver/error.erb
+- lib/core_ext/string.rb
 - spec/bonsai/console_spec.rb
 - spec/bonsai/exporter_spec.rb
 - spec/bonsai/generate_spec.rb
@@ -273,8 +314,21 @@ files:
 - spec/support/site.yml
 - spec/support/templates/demo-template.mustache
 - spec/support/templates/partials/inserted.mustache
-- vendor/yui-compressor/yuicompressor-2.4.2.jar
-has_rdoc: false
+- vendor/cache/activesupport-2.3.5.gem
+- vendor/cache/builder-2.1.2.gem
+- vendor/cache/configuration-1.1.0.gem
+- vendor/cache/gemcutter-0.5.0.gem
+- vendor/cache/git-1.2.5.gem
+- vendor/cache/jeweler-1.4.0.gem
+- vendor/cache/json_pure-1.2.3.gem
+- vendor/cache/maruku-0.6.0.gem
+- vendor/cache/rake-0.8.7.gem
+- vendor/cache/rspec-1.3.0.gem
+- vendor/cache/rubyforge-2.0.4.gem
+- vendor/cache/syntax-1.0.0.gem
+- vendor/cache/watch-0.1.0.gem
+- vendor/cache/yard-0.2.2.gem
+has_rdoc: true
 homepage: http://github.com/benschwarz/bonsai
 licenses: []
 
@@ -284,23 +338,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A static site generator that uses the best toolset available

data/.bundle/environment.rb

@@ -1,230 +0,0 @@
-# DO NOT MODIFY THIS FILE
-
-require 'digest/sha1'
-require 'rubygems'
-
-module Gem
-  class Dependency
-    if !instance_methods.map { |m| m.to_s }.include?("requirement")
-      def requirement
-        version_requirements
-      end
-    end
-  end
-end
-
-module Bundler
-  module SharedHelpers
-
-    def default_gemfile
-      gemfile = find_gemfile
-      gemfile or raise GemfileNotFound, "The default Gemfile was not found"
-      Pathname.new(gemfile)
-    end
-
-    def in_bundle?
-      find_gemfile
-    end
-
-  private
-
-    def find_gemfile
-      return ENV['BUNDLE_GEMFILE'] if ENV['BUNDLE_GEMFILE']
-
-      previous = nil
-      current  = File.expand_path(Dir.pwd)
-
-      until !File.directory?(current) || current == previous
-        filename = File.join(current, 'Gemfile')
-        return filename if File.file?(filename)
-        current, previous = File.expand_path("..", current), current
-      end
-    end
-
-    def clean_load_path
-      # handle 1.9 where system gems are always on the load path
-      if defined?(::Gem)
-        me = File.expand_path("../../", __FILE__)
-        $LOAD_PATH.reject! do |p|
-          next if File.expand_path(p).include?(me)
-          p != File.dirname(__FILE__) &&
-            Gem.path.any? { |gp| p.include?(gp) }
-        end
-        $LOAD_PATH.uniq!
-      end
-    end
-
-    def reverse_rubygems_kernel_mixin
-      # Disable rubygems' gem activation system
-      ::Kernel.class_eval do
-        if private_method_defined?(:gem_original_require)
-          alias rubygems_require require
-          alias require gem_original_require
-        end
-
-        undef gem
-      end
-    end
-
-    def cripple_rubygems(specs)
-      reverse_rubygems_kernel_mixin
-
-      executables = specs.map { |s| s.executables }.flatten
-
-     :: Kernel.class_eval do
-        private
-        def gem(*) ; end
-      end
-      Gem.source_index # ensure RubyGems is fully loaded
-
-      ::Kernel.send(:define_method, :gem) do |dep, *reqs|
-        if executables.include? File.basename(caller.first.split(':').first)
-          return
-        end
-        opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
-
-        unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
-          dep = Gem::Dependency.new(dep, reqs)
-        end
-
-        spec = specs.find  { |s| s.name == dep.name }
-
-        if spec.nil?
-          e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile."
-          e.name = dep.name
-          e.version_requirement = dep.requirement
-          raise e
-        elsif dep !~ spec
-          e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. " \
-                                 "Make sure all dependencies are added to Gemfile."
-          e.name = dep.name
-          e.version_requirement = dep.requirement
-          raise e
-        end
-
-        true
-      end
-
-      # === Following hacks are to improve on the generated bin wrappers ===
-
-      # Yeah, talk about a hack
-      source_index_class = (class << Gem::SourceIndex ; self ; end)
-      source_index_class.send(:define_method, :from_gems_in) do |*args|
-        source_index = Gem::SourceIndex.new
-        source_index.spec_dirs = *args
-        source_index.add_specs(*specs)
-        source_index
-      end
-
-      # OMG more hacks
-      gem_class = (class << Gem ; self ; end)
-      gem_class.send(:define_method, :bin_path) do |name, *args|
-        exec_name, *reqs = args
-
-        spec = nil
-
-        if exec_name
-          spec = specs.find { |s| s.executables.include?(exec_name) }
-          spec or raise Gem::Exception, "can't find executable #{exec_name}"
-        else
-          spec = specs.find  { |s| s.name == name }
-          exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
-        end
-
-        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
-        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
-        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
-      end
-    end
-
-    extend self
-  end
-end
-
-module Bundler
-  LOCKED_BY    = '0.9.13'
-  FINGERPRINT  = "b3b574f01bf6f8e6fe47ea377ef334b53b8a4396"
-  AUTOREQUIRES = {:default=>[["builder", false], ["jeweler", false], ["launchy", false], ["less", false], ["maruku", false], ["mustache", false], ["rspec", false], ["sinatra", false], ["tilt", false], ["watch", false], ["yard", false]]}
-  SPECS        = [
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/rake-0.8.7/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/rake-0.8.7.gemspec", :name=>"rake"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/builder-2.1.2/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/builder-2.1.2.gemspec", :name=>"builder"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/configuration-1.1.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/configuration-1.1.0.gemspec", :name=>"configuration"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/json_pure-1.2.3/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/json_pure-1.2.3.gemspec", :name=>"json_pure"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/gemcutter-0.5.0/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/gemcutter-0.5.0.gemspec", :name=>"gemcutter"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/git-1.2.5/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/git-1.2.5.gemspec", :name=>"git"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/rubyforge-2.0.4/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/rubyforge-2.0.4.gemspec", :name=>"rubyforge"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/jeweler-1.4.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/jeweler-1.4.0.gemspec", :name=>"jeweler"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/launchy-0.3.5/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/launchy-0.3.5.gemspec", :name=>"launchy"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/mutter-0.5.3/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/mutter-0.5.3.gemspec", :name=>"mutter"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/polyglot-0.3.1/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/polyglot-0.3.1.gemspec", :name=>"polyglot"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/treetop-1.4.5/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/treetop-1.4.5.gemspec", :name=>"treetop"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/less-1.2.21/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/less-1.2.21.gemspec", :name=>"less"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/syntax-1.0.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/syntax-1.0.0.gemspec", :name=>"syntax"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/maruku-0.6.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/maruku-0.6.0.gemspec", :name=>"maruku"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/mustache-0.6.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/mustache-0.6.0.gemspec", :name=>"mustache"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/rack-1.1.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/rack-1.1.0.gemspec", :name=>"rack"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/rspec-1.3.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/rspec-1.3.0.gemspec", :name=>"rspec"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/sinatra-1.0/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/sinatra-1.0.gemspec", :name=>"sinatra"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/tilt-0.8/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/tilt-0.8.gemspec", :name=>"tilt"},
-        {:load_paths=>["/Users/ben/.gem/ruby/1.8/gems/watch-0.1.0/lib"], :loaded_from=>"/Users/ben/.gem/ruby/1.8/specifications/watch-0.1.0.gemspec", :name=>"watch"},
-        {:load_paths=>["/Users/ben/.bundle/ruby/1.8/gems/yard-0.5.4/lib"], :loaded_from=>"/Users/ben/.bundle/ruby/1.8/specifications/yard-0.5.4.gemspec", :name=>"yard"},
-      ].map do |hash|
-    if hash[:virtual_spec]
-      spec = eval(hash[:virtual_spec], binding, "<virtual spec for '#{hash[:name]}'>")
-    else
-      dir = File.dirname(hash[:loaded_from])
-      spec = Dir.chdir(dir){ eval(File.read(hash[:loaded_from]), binding, hash[:loaded_from]) }
-    end
-    spec.loaded_from = hash[:loaded_from]
-    spec.require_paths = hash[:load_paths]
-    spec
-  end
-
-  extend SharedHelpers
-
-  def self.configure_gem_path_and_home(specs)
-    # Fix paths, so that Gem.source_index and such will work
-    paths = specs.map{|s| s.installation_path }
-    paths.flatten!; paths.compact!; paths.uniq!; paths.reject!{|p| p.empty? }
-    ENV['GEM_PATH'] = paths.join(File::PATH_SEPARATOR)
-    ENV['GEM_HOME'] = paths.first
-    Gem.clear_paths
-  end
-
-  def self.match_fingerprint
-    print = Digest::SHA1.hexdigest(File.read(File.expand_path('../../Gemfile', __FILE__)))
-    unless print == FINGERPRINT
-      abort 'Gemfile changed since you last locked. Please `bundle lock` to relock.'
-    end
-  end
-
-  def self.setup(*groups)
-    match_fingerprint
-    clean_load_path
-    cripple_rubygems(SPECS)
-    configure_gem_path_and_home(SPECS)
-    SPECS.each do |spec|
-      Gem.loaded_specs[spec.name] = spec
-      $LOAD_PATH.unshift(*spec.require_paths)
-    end
-  end
-
-  def self.require(*groups)
-    groups = [:default] if groups.empty?
-    groups.each do |group|
-      (AUTOREQUIRES[group.to_sym] || []).each do |file, explicit|
-        if explicit
-          Kernel.require file
-        else
-          begin
-            Kernel.require file
-          rescue LoadError
-          end
-        end
-      end
-    end
-  end
-
-  # Setup bundle when it's required.
-  setup
-end