bonsai 1.1.1 → 1.1.2

data/CHANGES

@@ -0,0 +1,12 @@
+= 1.1.2 (19/01/2010)
+
+* Added Sass support
+  - You can use LessCSS or Sass
+  - Sass needs to be installed to work
+  - Thanks to Ryan Tomayko for writing Tilt and accepting my LessCSS addition
+
+* Removed RDiscount in favour of Maruku.
+  - Still uses RDiscount if you have it
+  - Maruku is pure Ruby, no native extensions required
+
+* Added support for JRuby and Macruby

data/README.md

@@ -30,6 +30,15 @@ The generator will provide you with a .htaccess file that will turn on gzip/defl
   * Run `bonsai --repot`
   * Upload the contents of `site-root/output` to your producton server
     * For example: `rsync -ave ssh ./output/ tinytree.info:/var/www/tinytree.info`
+    
+## Ruby implementations
+
+Bonsai runs under a number of Ruby implementations:
+  
+  * 1.8.7 (MRI)
+  * 1.9.1 (MRI)
+  * JRuby
+  * MacRuby
 
 ## Technology used to make your site better
 
@@ -48,6 +57,9 @@ When I found something that didn't quite work, was too slow or perhaps not even
   
   * [Anthony Kolber](http://github.com/kolber) for writing, then rewriting [Stacey](http://github.com/kolber/stacey) from scratch. We spent many hours talking about best practice and software UX.
   * [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
 
 
 ## Note on Patches/Pull Requests

data/Rakefile

@@ -15,12 +15,12 @@ begin
     gem.executables = ['bonsai']
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
-    gem.add_dependency "tilt", ">= 0.4"
+    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 "rdiscount", ">= 1.5.5"
+    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"

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/bonsai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bonsai}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-01-16}
   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}
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      ".kick",
+     "CHANGES",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -100,8 +101,12 @@ Gem::Specification.new do |s|
      "spec/support/content/legals/terms-and-conditions/demo-template.yml",
      "spec/support/public/.htaccess",
      "spec/support/public/js/script.js",
-     "spec/support/public/stylesheets/base.less",
-     "spec/support/public/stylesheets/broken.less",
+     "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/site.yml",
      "spec/support/templates/demo-template.mustache",
      "spec/support/templates/partials/inserted.mustache",
@@ -140,24 +145,24 @@ 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_runtime_dependency(%q<tilt>, [">= 0.4"])
+      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<rdiscount>, [">= 1.5.5"])
+      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"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<tilt>, [">= 0.4"])
+      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<rdiscount>, [">= 1.5.5"])
+      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"])
@@ -165,12 +170,12 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<tilt>, [">= 0.4"])
+    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<rdiscount>, [">= 1.5.5"])
+    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"])

data/lib/bonsai/exporter.rb

@@ -39,7 +39,7 @@ module Bonsai
       end
       
       def cleanup
-        remove_less_from_public
+        remove_less_sass
       end
       
       def write_index
@@ -88,11 +88,11 @@ module Bonsai
       end
       
       def copy_public
-        generate_css_from_less
+        generate_css
         
         Bonsai.log "Copying public files"
         # Using system call because fileutils is inadequate
-        system("cp -fR '#{Bonsai.root_dir}/public/' '#{path}'")
+        system("cp -fR '#{Bonsai.root_dir}/public/.' '#{path}/.'")
       end
       
       def compress_assets
@@ -104,19 +104,19 @@ module Bonsai
         end
       end
       
-      def generate_css_from_less
-        Dir["#{Bonsai.root_dir}/public/**/*.less"].each do |lessfile|
-          css = File.open(lessfile) {|f| Less::Engine.new(f) }.to_css
-          path = "#{File.dirname(lessfile)}/#{File.basename(lessfile, ".less")}.css"
+      def generate_css
+        Dir["#{Bonsai.root_dir}/public/**/*.{less,sass}"].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
-        Bonsai.log "LessCSS Syntax error\n\n#{exception.message}"
+        Bonsai.log "CSS Syntax error\n\n#{exception.message}"
       end
       
-      def remove_less_from_public
-        Dir["#{path}/**/*.less"].each{|f| FileUtils.rm(f) }
+      def remove_less_sass
+        Dir["#{path}/**/*.{less,sass}"].each{|f| FileUtils.rm(f) }
       end
     end
   end

data/lib/bonsai/page.rb

@@ -1,7 +1,14 @@
 require 'yaml'
-require 'rdiscount'
 require 'tilt'
 
+# Use RDiscount for those who care
+begin 
+  require 'rdiscount'
+  BlueCloth = RDiscount
+rescue LoadError
+  require 'maruku'
+end
+
 module Bonsai
   class Page
     class NotFound < StandardError; end;
@@ -143,17 +150,24 @@ module Bonsai
     
     private
     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] = RDiscount.new(v, :smart).to_html
+          formatted_content[k] = to_markdown(v)
         end
       end
       
       formatted_content
     end
     
+    def to_markdown(content)
+      if defined? RDiscount
+        RDiscount.new(content, :smart).to_html
+      else
+        Maruku.new(content).to_html
+      end
+    end
+    
     # Creates methods for each sub-folder within the page's folder
     # that isn't a sub-page (a page object)
     def disk_assets

data/lib/bonsai/webserver.rb

@@ -11,13 +11,18 @@ module Bonsai
     set :views, "#{File.dirname(__FILE__)}/webserver"
     
     get '/' do
-      Page.find("index").render
+      begin
+        Page.find("index").render
+      rescue
+        @error = e.message
+        erb :error
+      end
     end
     
     get '/*' do
       begin
         Page.find(params[:splat].to_s).render
-      rescue Bonsai::Page::NotFound => e
+      rescue
         @error = e.message
         erb :error
       end

data/spec/bonsai/exporter_spec.rb

@@ -15,14 +15,18 @@ describe Bonsai::Exporter do
     Bonsai::Exporter.path = BONSAI_PATH + "/output"
   end
   
-  shared_examples_for "lesscss" do      
+  shared_examples_for "css generators" do      
     it "should process .less files to .css" do
-      File.exists?("#{Bonsai::Exporter.path}/stylesheets/base.css").should be_true
+      File.exists?("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should be_true
+    end
+    
+    it "should process .sass files to .css" do
+      File.exists?("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should be_true
     end
         
     it "should log an error when badly formatted less is supplied (and not raise an exception)" do
       Bonsai.should_receive(:log)
-      lambda { Bonsai::Exporter.send(:generate_css_from_less) }.should_not raise_error(Less::SyntaxError)
+      lambda { Bonsai::Exporter.send(:generate_css) }.should_not raise_error(Less::SyntaxError)
     end
   end
   
@@ -33,17 +37,16 @@ describe Bonsai::Exporter do
         Bonsai::Exporter.process!
       end
       
-      it_should_behave_like "lesscss"
+      it_should_behave_like "css generators"
       
       # Uncompressed CSS
       it "should be processed with less" do
-        File.read("#{Bonsai::Exporter.path}/stylesheets/base.css").should == ".mymixin, #content { display: block; }\n"
+        File.read("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should == ".mymixin, #content { display: block; }\n"
       end
       
-      it "should not write the base.css file to the public directory" do
-        File.exists?("#{Bonsai.root_dir}/public/base.css").should_not be_true
+      it "should be processed with sass" do
+        File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content {\n  display: block; }\n"
       end
-      
     end
     
     describe "expectations" do
@@ -60,7 +63,7 @@ describe Bonsai::Exporter do
       end
 
       it "should generate css via lesscss" do
-        Bonsai::Exporter.should_receive(:generate_css_from_less)
+        Bonsai::Exporter.should_receive(:generate_css)
       end      
     end
   end
@@ -72,11 +75,15 @@ describe Bonsai::Exporter do
         Bonsai::Exporter.publish!
       end
       
-      it_should_behave_like "lesscss"
+      it_should_behave_like "css generators"
       
       # Compressed CSS
       it "should be processed with less" do
-        File.read("#{Bonsai::Exporter.path}/stylesheets/base.css").should == ".mymixin,#content{display:block;}"
+        File.read("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should == ".mymixin,#content{display:block;}"
+      end
+      
+      it "should be processed with sass" do
+        File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block;}"
       end
       
       it "should not export the base.less file" do
@@ -118,7 +125,11 @@ describe Bonsai::Exporter do
       
       describe "asset compression" do
         it "should compress the css file" do
-          File.read("#{Bonsai::Exporter.path}/stylesheets/base.css").should == ".mymixin,#content{display:block;}"
+          File.read("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should == ".mymixin,#content{display:block;}"
+        end
+        
+        it "should compress the css file" do
+          File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block;}"
         end
         
         it "should compress the js file" do
@@ -136,8 +147,8 @@ describe Bonsai::Exporter do
         FileUtils.should_receive(:rm_rf).with(Bonsai::Exporter.path)
       end
       
-      it "should generate css via lesscss" do
-        Bonsai::Exporter.should_receive(:generate_css_from_less)
+      it "should process css with less or sass" do
+        Bonsai::Exporter.should_receive(:generate_css)
       end
 
       it "should compress assets" do

data/spec/support/public/stylesheets/brokensass.sass

@@ -0,0 +1,3 @@
+/* missing mixin */
+#identifier 
+  + mixin

data/spec/support/public/stylesheets/lesscss.css

@@ -0,0 +1 @@
+.mymixin, #content { display: block; }

data/spec/support/public/stylesheets/sassy.css

@@ -0,0 +1,2 @@
+#content {
+  display: block; }

data/spec/support/public/stylesheets/sassy.sass

@@ -0,0 +1,5 @@
+=mymixin
+  display: block
+
+#content
+  +mymixin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bonsai
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +11:00
+date: 2010-01-16 00:00:00 +11:00
 default_executable: bonsai
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        version: "0.5"
     version: 
 - !ruby/object:Gem::Dependency 
   name: mustache
@@ -83,14 +83,14 @@ dependencies:
         version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: maruku
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.5
+        version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: less
@@ -135,6 +135,7 @@ files:
 - .document
 - .gitignore
 - .kick
+- CHANGES
 - LICENSE
 - README.md
 - Rakefile
@@ -213,8 +214,12 @@ files:
 - spec/support/content/legals/terms-and-conditions/demo-template.yml
 - spec/support/public/.htaccess
 - spec/support/public/js/script.js
-- spec/support/public/stylesheets/base.less
-- spec/support/public/stylesheets/broken.less
+- 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/site.yml
 - spec/support/templates/demo-template.mustache
 - spec/support/templates/partials/inserted.mustache