bonsai 1.1.3 → 1.1.4

data/.gitignore

@@ -20,4 +20,17 @@ pkg
 
 ## PROJECT::SPECIFIC
 spec/support/output
-spec/support/public/stylesheets/base.css
+spec/support/public/stylesheets/base.css
+spec/tmp-generator/
+
+## BUNDLER
+bin/*
+vendor/gems/environment.rb
+vendor/gems/ruby/1.8/*
+!vendor/gems/ruby/1.8/cache/
+vendor/gems/ruby/1.9.1/*
+!vendor/gems/ruby/1.9.1/cache/
+vendor/gems/ruby/jruby/*
+!vendor/gems/ruby/jruby/cache/
+config/build_options.yml
+lib/bonsai/templates/public/css/base.css

data/CHANGES

@@ -1,3 +1,13 @@
+= 1.1.4 (12/02/2010)
+
+* Using the gem bundler for development environments
+  - No need to install each gem under other ruby implementations
+  - Thanks Ralph
+
+* Variables from `site.yml` are accessible to pages
+
+* Added analytics.mustache partial to the generated demo site
+
 = 1.1.3 (23/01/2010)
 
 * Fixes for UTF-8 url strings under Ruby 1.9

data/Gemfile

@@ -0,0 +1,11 @@
+gem 'jeweler'
+gem 'rspec'
+gem 'yard'
+gem 'tilt'
+gem 'mustache'
+gem 'builder'
+gem 'watch'
+gem 'sinatra'
+gem 'maruku'
+gem 'less'
+gem 'launchy'

data/README.md

@@ -2,18 +2,29 @@
 
 Bonsai is a static web site generator, it uses the best tools available for site construction and adheres to best web practices.
 
+## What it does
+
+  * Provides a tiny HTML5, mustache 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.
+  * Access to page hierarchy through `children`, `siblings`, `ancestors` and `navigation`.
+  * Generates `sitemap.xml` ready for search engines to spider your site.
+  * Generates `robots.txt` to be friendly to search engines.  
+  
 ## Getting started
 
   * Install bonsai 
-  
+
     `gem install bonsai --source http://gemcutter.org`
-  
+
   * Run the generator
-    
+
     `bonsai --plant [NAME]`
-    
+
 Type `bonsai --help` for any help with commands
 
+
 ## Development server
 
 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. 
@@ -35,16 +46,11 @@ The generator will provide you with a .htaccess file that will turn on gzip/defl
 
 Bonsai runs under a number of Ruby implementations:
   
+  * 1.8.6 (MRI)
   * 1.8.7 (MRI)
   * 1.9.1 (MRI)
   * JRuby
   * MacRuby
-
-## Technology used to make your site better
-
-  * [Tilt](http://github.com/rtomayko/tilt) - defaulting to [Mustache](http://github.com/defunkt/mustache)
-  * [Less CSS](http://lesscss.org/)
-  * [YUI CSS/Javascript compressor](http://developer.yahoo.com/yui/compressor/)
   
 ## Have you used this for a real job? 
 
@@ -52,6 +58,12 @@ Yes. I built (and content filled) a web site with around 160 pages in 5 days.
 
 When I found something that didn't quite work, was too slow or perhaps not even possible I wrote a spec and implemented it later. Better software from real requirements. (I used every feature I implemented)
 
+## Links
+
+  * [Tilt](http://github.com/rtomayko/tilt) - defaulting to [Mustache](http://github.com/defunkt/mustache)
+  * [Less CSS](http://lesscss.org/)
+  * [YUI CSS/Javascript compressor](http://developer.yahoo.com/yui/compressor/)
+
 
 ## Thanks
   
@@ -76,4 +88,4 @@ When I found something that didn't quite work, was too slow or perhaps not even
 
 ## Copyright
 
-Copyright (c) 2009 Ben Schwarz. See LICENSE for details.
+Copyright (c) 2010 Ben Schwarz. See LICENSE for details.

data/Rakefile

@@ -1,6 +1,18 @@
 # coding: utf-8
+begin
+  require File.dirname(__FILE__) + '/vendor/gems/environment'
+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
+    you should ensure that you have the `bundler` gem installed.
+    
+    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
+end
 
-require 'rubygems'
 require 'rake'
 
 begin
@@ -13,9 +25,11 @@ begin
     gem.homepage = "http://github.com/benschwarz/bonsai"
     gem.authors = ["Ben Schwarz"]
     gem.executables = ['bonsai']
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    
+    gem.files.exclude 'vendor/gems'
+    
+    gem.add_development_dependency "rspec", ">= 1.3.0"
     gem.add_development_dependency "yard", ">= 0"
-    gem.add_development_dependency "rdiscount"
     gem.add_dependency "tilt", ">= 0.5"
     gem.add_dependency "mustache", ">= 0.5.0"
     gem.add_dependency "builder", ">= 2.1.2"
@@ -25,17 +39,17 @@ begin
     gem.add_dependency "less", ">= 1.2.17"
     gem.add_dependency "rack", ">= 1.1.0"
     gem.add_dependency "launchy", ">= 0.3.3"
-    
+
     gem.post_install_message = %q{
 
       盆栽
       bonsai, tiny and beautiful
-      
-      
-      
+
+
+
       type `bonsai --help` to get started
     }
-    
+
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/bonsai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bonsai}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-01-23}
+  s.date = %q{2010-02-14}
   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}
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      ".gitignore",
      ".kick",
      "CHANGES",
+     "Gemfile",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -48,12 +49,12 @@ Gem::Specification.new do |s|
      "lib/bonsai/templates/output/docs/css/base.css",
      "lib/bonsai/templates/output/robots.txt",
      "lib/bonsai/templates/public/.htaccess",
-     "lib/bonsai/templates/public/docs/css/base.css",
-     "lib/bonsai/templates/public/docs/css/base.less",
+     "lib/bonsai/templates/public/css/base.less",
      "lib/bonsai/templates/public/robots.txt",
      "lib/bonsai/templates/site.yml",
      "lib/bonsai/templates/templates/default.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",
@@ -118,9 +119,9 @@ Gem::Specification.new do |s|
 
       盆栽
       bonsai, tiny and beautiful
-      
-      
-      
+
+
+
       type `bonsai --help` to get started
     }
   s.rdoc_options = ["--charset=UTF-8"]
@@ -144,9 +145,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<rdiscount>, [">= 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"])
@@ -157,9 +157,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<launchy>, [">= 0.3.3"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rdiscount>, [">= 0"])
       s.add_dependency(%q<tilt>, [">= 0.5"])
       s.add_dependency(%q<mustache>, [">= 0.5.0"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
@@ -171,9 +170,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<launchy>, [">= 0.3.3"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rdiscount>, [">= 0"])
     s.add_dependency(%q<tilt>, [">= 0.5"])
     s.add_dependency(%q<mustache>, [">= 0.5.0"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])

data/lib/bonsai/exporter.rb

@@ -66,12 +66,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/generate.rb

@@ -10,7 +10,7 @@ module Bonsai
   
     private  
     def create_directories
-      %w(content content/index public/docs/css public/docs/js).each do |dir|
+      %w(content content/index public/css public/js).each do |dir|
         Bonsai.log "\tcreate\t#{dir}"
         FileUtils.mkdir_p(File.join(@path, dir))
       end

data/lib/bonsai/page.rb

@@ -142,8 +142,10 @@ module Bonsai
         :siblings     => siblings,
         :parent       => parent, 
         :ancestors    => ancestors,
-        :navigation   => Bonsai::Navigation.tree
-      }.merge(formatted_content).merge(disk_assets)
+        :navigation   => Bonsai::Navigation.tree,
+        :updated_at   => mtime,
+        :created_at   => ctime
+      }.merge(formatted_content).merge(disk_assets).merge(Bonsai.site)
     end
     
     private

data/lib/bonsai/sitemap.rb

@@ -8,14 +8,14 @@ module Bonsai
           xml.instruct!
           xml.urlset(:xmlns=>'http://www.sitemaps.org/schemas/sitemap/0.9') {
             xml.url {
-              xml.loc(Bonsai.site[:site][:url])
+              xml.loc(Bonsai.site[:url])
             	xml.lastmod(index.mtime.utc.strftime("%Y-%m-%d"))
             	xml.changefreq(change_freq)
            	}
 
             Bonsai::Page.all.delete_if{|p| p.permalink === "/index"}.each do |page|
               xml.url {
-                xml.loc(Bonsai.site[:site][:url] + page.permalink)
+                xml.loc(Bonsai.site[:url] + page.permalink)
               	xml.lastmod(page.mtime.utc.strftime("%Y-%m-%d"))
               	xml.changefreq(change_freq)
              	}

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

@@ -8,7 +8,7 @@ header, section, article, footer, aside, nav { display: block; }
 
 
 
-/* Put your styles here */
+/* Put your styles below here */
 #wrapper { margin: 0 auto; width: 660px; }
 
 header { 

data/lib/bonsai/templates/site.yml

@@ -1,4 +1,7 @@
-:site:
-  :name: Your website title
-  :url: http://yourdomain.com
-  :copyright: 2010
+# The key value pairs found below are available within the templates.
+# {{site_name}}, {{url}}, {{copyright}} and {{analytics_code}}
+
+:site_name: Your website title
+:url: http://yourdomain.com
+:copyright: 2010
+:analytics_code: UA-00000000-0

data/lib/bonsai/templates/templates/default.mustache

@@ -7,5 +7,6 @@
       {{{body}}}
       {{> shared/footer}}
     </section>
+    {{> shared/analytics }}
   </body>
 </html>

data/lib/bonsai/templates/templates/products.mustache

@@ -15,4 +15,5 @@
       {{> shared/footer}}
     </section>
   </body>
+  {{> shared/analytics }}
 </html>

data/lib/bonsai/templates/templates/shared/analytics.mustache

@@ -0,0 +1,10 @@
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("{{analytics_code}}");
+    pageTracker._trackPageview();
+  } catch(err) {}
+</script>

data/lib/bonsai/templates/templates/shared/head.mustache

@@ -1,7 +1,7 @@
 <head>
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
   <title>{{headline}}</title>
-  <link rel="stylesheet" href="/docs/css/base.css" type="text/css">
+  <link rel="stylesheet" href="/css/base.css" type="text/css">
   <!--[if IE]>
     <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->

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

@@ -8,7 +8,7 @@ describe Bonsai::Generate do
     end
     
     it "should create base directories" do
-      %w(content content/index templates public public/docs public/docs/css public/docs/js).each do |dir|
+      %w(content content/index templates public public/css public/js).each do |dir|
         File.directory?("#{@path}/#{dir}").should be_true
       end
     end
@@ -18,7 +18,7 @@ describe Bonsai::Generate do
     end
     
     it "should copy the base.less file" do
-      File.exists?("#{@path}/public/docs/css/base.less").should be_true
+      File.exists?("#{@path}/public/css/base.less").should be_true
     end
     
     it "should copy an index page" do
@@ -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 23 files" do
+      Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 23
     end
     
-    it "should generate 16 directories" do
-      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 16
+    it "should generate 15 directories" do
+      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 15
     end
   end
 end

data/spec/bonsai/page_spec.rb

@@ -174,12 +174,18 @@ describe Bonsai::Page do
         @page.should respond_to(:to_hash)
       end
       
-      %w(slug permalink name page_title children siblings parent ancestors magic navigation).each do |key|
+      %w(slug permalink name page_title children siblings parent ancestors magic navigation updated_at created_at).each do |key|
         it "should have a to_hash key for #{key}" do
           @page.to_hash.keys.should include(key.to_sym)
         end
       end
       
+      it "should include global site variables from site.yml" do
+        @page.to_hash[:site_name].should == "Bonsai"
+        @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
@@ -200,18 +206,6 @@ describe Bonsai::Page do
             @vars[:magic].size.should == 2
           end
         end
-        
-        describe "boolean" do
-          it "should be false" do
-            pending
-            @vars[:child?].should be_false
-          end
-          
-          it "should be true" do
-            pending
-            @vars[:magic?].should be_true
-          end
-        end
       end
     end
     

data/spec/support/broken/site.yml

@@ -2,5 +2,5 @@
   :name: My broken site
   :url: http://broke.it
   :copyright: 2010
-  :how-to-break-it: 
+  :how-to-br eak-it: 
 Just start writing like you don't know what you're doing.

data/spec/support/site.yml

@@ -1,4 +1,6 @@
-:site: 
-  :name: Bonsai
-  :url: http://tinytree.info
-  :copyright: 2010
+# The key value pairs found below are available within the templating language.
+# {{site_name}}, {{url}}, {{copyright}} and {{analytics_code}}
+:site_name: Bonsai
+:url: http://tinytree.info
+:copyright: 2010
+:analytics_code: UA-00000000-0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bonsai
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +11:00
+date: 2010-02-14 00:00:00 +11:00
 default_executable: bonsai
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: tilt
   type: :runtime
@@ -146,6 +136,7 @@ files:
 - .gitignore
 - .kick
 - CHANGES
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -171,12 +162,12 @@ files:
 - lib/bonsai/templates/output/docs/css/base.css
 - lib/bonsai/templates/output/robots.txt
 - lib/bonsai/templates/public/.htaccess
-- lib/bonsai/templates/public/docs/css/base.css
-- lib/bonsai/templates/public/docs/css/base.less
+- lib/bonsai/templates/public/css/base.less
 - lib/bonsai/templates/public/robots.txt
 - lib/bonsai/templates/site.yml
 - lib/bonsai/templates/templates/default.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
@@ -239,7 +230,7 @@ has_rdoc: true
 homepage: http://github.com/benschwarz/bonsai
 licenses: []
 
-post_install_message: "\n\n      \xE7\x9B\x86\xE6\xA0\xBD\n      bonsai, tiny and beautiful\n      \n      \n      \n      type `bonsai --help` to get started\n    "
+post_install_message: "\n\n      \xE7\x9B\x86\xE6\xA0\xBD\n      bonsai, tiny and beautiful\n\n\n\n      type `bonsai --help` to get started\n    "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 

data/lib/bonsai/templates/public/docs/css/base.css

@@ -1,60 +0,0 @@
-h1, h2, h3, h4, h5, h6, p, ol, ul {
-  margin: 0;
-  padding: 0;
-  font-weight: normal;
-}
-header, section, article, footer, aside, nav { display: block; }
-#wrapper {
-  margin: 0 auto;
-  width: 660px;
-}
-header {
-  position: relative;
-  margin-top: 5em;
-}
-header span { display: block; }
-header #logo {
-  width: 145px;
-  height: 145px;
-  -moz-border-radius: 72px;
-  -webkit-border-radius: 72px;
-  border-radius: 72px;
-  background-color: black;
-  color: white;
-  position: relative;
-  margin: 0 auto;
-}
-header #logo a {
-  color: white;
-  text-decoration: none;
-  position: absolute;
-  margin: 1em 0 0 1.5em;
-  text-align: center;
-  text-transform: lowercase;
-}
-header #navigation {
-  margin: 5em 0;
-  text-transform: lowercase;
-  text-align: center;
-  font-style: italic;
-  font-size: 0.8em;
-}
-header #navigation li:not(:last-child):after { content: " /"; }
-header #navigation a {
-  color: black;
-  text-decoration: none;
-}
-header #navigation a:hover { text-decoration: underline; }
-nav li {
-  display: inline;
-  list-style-type: none;
-}
-#breadcrumbs, footer {
-  color: #666666;
-  font-size: 0.7em;
-}
-#breadcrumbs { margin: 3em 0 0 0; }
-#breadcrumbs li:not(:last-child):after { content: " →"; }
-#breadcrumbs a { color: inherit; }
-nav, footer { margin: 1em 0; }
-h1, h2, h3, h4, h5, h6 { margin: 1.25em 0; }