bonsai 1.1.2 → 1.1.3

data/CHANGES

@@ -1,3 +1,20 @@
+= 1.1.3 (23/01/2010)
+
+* Fixes for UTF-8 url strings under Ruby 1.9
+  - Thanks Ralph (Added to Credits in README.md)
+
+* Added shortcuts to --plant, --cultivate and --repot
+  - -p for --plant
+  - -c for --cultivate
+  - -r for --repot
+  - Thanks somedumbme91 (Added to Credits in README.md)
+  
+* Permalinks now have a trailing slash to reduce server redirects
+  - Thanks dgoodlad (Added to Credits in README.md)
+
+* Added an error page for badly formatted YML files or other issues
+  - Rendered during --cultivate sessions for debugging
+
 = 1.1.2 (19/01/2010)
 
 * Added Sass support

data/README.md

@@ -59,8 +59,10 @@ When I found something that didn't quite work, was too slow or perhaps not even
   * [Lincoln Stoll](http://github.com/lstoll) for reminding me to use the tools that I know best
   
 ## Credits
-  * [Rohit Arondekar][http://github.com/rohit] for figuring out an annoying Ubuntu filesystem issue
-
+  * [Rohit Arondekar](http://github.com/rohit)
+  * [Justin Ridgewell](git://github.com/somedumbme91)
+  * [Ralph von der Heyden](http://github.com/ralph)
+  * [David Goodlad](http://github.com/dgoodlad)
 
 ## Note on Patches/Pull Requests
  

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.executables = ['bonsai']
     gem.add_development_dependency "rspec", ">= 1.2.9"
     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"

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/bonsai

@@ -14,7 +14,7 @@ banner = %q{
 opts = OptionParser.new do |opts|
   opts.banner = banner
   
-  opts.on("--plant [NAME]", "creates the directory structure for your site") do |name|
+  opts.on("-p", "--plant [NAME]", "creates the directory structure for your site") do |name|
     if name.nil?
       Bonsai.log "no site name given check `bonsai --help` for details" 
       exit 0
@@ -22,7 +22,7 @@ opts = OptionParser.new do |opts|
     Bonsai::Generate.new("#{Dir.pwd}/#{name}")
   end
   
-  opts.on("--cultivate", "run a local web server and process your files on save") do
+  opts.on("-c", "--cultivate", "run a local web server and process your files on save") do
     begin
       Bonsai.log banner
       Bonsai.log "Press Control+C to quit"
@@ -51,7 +51,7 @@ opts = OptionParser.new do |opts|
     end
   end
   
-  opts.on("--repot", "export your site to #{Dir.pwd}/output") do
+  opts.on("-r", "--repot", "export your site to #{Dir.pwd}/output") do
     Bonsai.root_dir = Dir.pwd
     Bonsai::Exporter.publish!
   end

data/bonsai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bonsai}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-01-16}
+  s.date = %q{2010-01-23}
   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}
@@ -72,6 +72,7 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/support/broken/content/broken_page/demo-template.yml",
+     "spec/support/broken/public/empty.txt",
      "spec/support/broken/site.yml",
      "spec/support/broken/templates/content/index/default.yml",
      "spec/support/broken/templates/public/.htaccess",
@@ -145,6 +146,7 @@ Gem::Specification.new do |s|
     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<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,6 +159,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       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"])
@@ -170,6 +173,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     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/navigation.rb

@@ -1,7 +1,7 @@
 module Bonsai
   class Navigation
     def self.tree
-      Page.all(Page.path, "*").select{|p| !p.floating? }
+      Page.all(Page.path, "*").select{|p| !p.floating? }.sort_by{|p| p.disk_path }
     end
   end
 end

data/lib/bonsai/page.rb

@@ -22,13 +22,13 @@ module Bonsai
         Dir["#{dir_path}/#{pattern}/*.yml"].map {|p| Page.new p }
       end
       
-      def find(permalink)        
+      def find(permalink)
         @@pages[permalink] ||= find!(permalink)
       end
       
       private
       def find!(permalink)
-        search_path = permalink.gsub(/\//, "/*")
+        search_path = permalink.gsub(/\/$/, '').gsub(/\//, "/*")
         disk_path = Dir["#{path}/*#{search_path}/*.yml"]
         if disk_path.any?
           return new disk_path.first
@@ -45,7 +45,7 @@ module Bonsai
     end
     
     def slug
-      permalink.split('/').pop
+      permalink.gsub(/\/$/, '').split('/').pop
     end
     
     def name
@@ -53,14 +53,14 @@ module Bonsai
     end
     
     def permalink
-      web_path(directory)
+      web_path(directory) + '/'
     end
     
     def ctime; File.ctime(disk_path); end
     def mtime; File.mtime(disk_path); end
     
     def write_path
-      "#{permalink}/index.html"
+      "#{permalink}index.html"
     end
     
     def template
@@ -81,9 +81,9 @@ module Bonsai
     def floating?
       !!(File.dirname(disk_path) =~ /\/[a-zA-z][\w-]+$/)
     end
-    
+
     def parent
-      id = permalink[/^\/(.+)\/[^\/]*$/, 1]
+      id = permalink[/\/(.+\/)[^\/]*\/$/, 1]
       return nil if id.nil?
       
       parent = Page.find(id)
@@ -109,7 +109,7 @@ module Bonsai
       
       # Find pages up the permalink tree if possible
       while(page_ref) do
-        page_ref = page_ref[/(.+)\/[^\/]*$/, 1]
+        page_ref = page_ref[/(.+\/)[^\/]*\/$/, 1]
         ancestors << self.class.find(page_ref) rescue NotFound
       end
       
@@ -122,14 +122,12 @@ module Bonsai
     
     def render
       Tilt.new(template.path, :path => template.class.path).render(self, to_hash)
-    rescue => stack
-      raise "Issue rendering #{permalink}\n\n#{stack}"
     end
     
     def content
       YAML::load(File.read(disk_path)) || {}
     rescue ArgumentError
-      Bonsai.log "Page '#{permalink}' has badly formatted content"
+      raise "Page '#{permalink}' has badly formatted content"
     end
     
     # This hash is available to all templates, it will map common properties, 
@@ -205,4 +203,4 @@ module Bonsai
       path.gsub(@@path, '').gsub(/\/\d+\./, '/')
     end
   end
-end
+end

data/lib/bonsai/webserver/error.erb

@@ -3,8 +3,17 @@
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>Bonsai, an error occurred</title>
+    <style type="text/css" media="screen">
+      body { font-style: Times, "Times New Roman", serif; font-style: italic; text-shadow: white 1px 1px 1px; }
+      h1 { font-size: 1em; text-align: center; font-weight: normal; }
+      #main { width: 580px; margin: 0 auto; display: block; }
+      #circle { width: 145px; height: 145px; -moz-border-radius: 72px; -webkit-border-radius: 72px; border-radius: 72px; background-color: black; margin: 3em auto; }
+    </style>
   </head>
   <body id="error">
-    <h1><%= @error %></h1>
+    <section id="main">
+      <div id="circle"></div>
+      <h1><%= @error.to_s %></h1>
+    </section>
   </body>
 </html>

data/lib/bonsai/webserver.rb

@@ -6,24 +6,24 @@ module Bonsai
       @app.call(env)
     end
   end
-  
+
   class DevelopmentServer < Sinatra::Base
     set :views, "#{File.dirname(__FILE__)}/webserver"
-    
+
     get '/' do
       begin
         Page.find("index").render
-      rescue
-        @error = e.message
+      rescue Exception => e
+        @error = e
         erb :error
       end
     end
-    
+
     get '/*' do
       begin
-        Page.find(params[:splat].to_s).render
-      rescue
-        @error = e.message
+        Page.find(params[:splat].join).render
+      rescue Exception => e
+        @error = e
         erb :error
       end
     end

data/spec/bonsai/page_spec.rb

@@ -13,7 +13,7 @@ describe Bonsai::Page do
   
   describe "instance" do
     before :all do
-      @page = Bonsai::Page.find("about-us/history")
+      @page = Bonsai::Page.find("about-us/history/")
     end
     
     it "should have a slug" do
@@ -135,8 +135,8 @@ describe Bonsai::Page do
         @output.should_not be_nil
       end
       
-      it "should replace moustache 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"
+      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"
       end
       
       it "should write in images" do
@@ -233,4 +233,4 @@ describe Bonsai::Page do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bonsai
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 +11:00
+date: 2010-01-23 00:00:00 +11:00
 default_executable: bonsai
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ 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
@@ -185,6 +195,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/broken/content/broken_page/demo-template.yml
+- spec/support/broken/public/empty.txt
 - spec/support/broken/site.yml
 - spec/support/broken/templates/content/index/default.yml
 - spec/support/broken/templates/public/.htaccess