bonsai 1.3.2 → 1.4.1

data/lib/bonsai.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'fileutils'
 require 'logger'
+require 'active_support/core_ext/hash/keys'
 
 $LOAD_PATH << "#{File.dirname(__FILE__)}/bonsai"
 
@@ -10,7 +11,7 @@ module Bonsai
   
     def root_dir=(path)
       unless is_a_bonsai?(path)
-        log "no bonsai site found - are you in the right directory?" 
+        log "no bonsai site found - are you in the right directory?"
         exit 0
       end
       
@@ -19,12 +20,13 @@ module Bonsai
       Exporter.path = "#{path}/output"
       Page.path = "#{path}/content"
       Template.path = "#{path}/templates"
+      Liquid::Template.file_system = Liquid::LocalFileSystem.new(Template.path)
     end
     
     def log(message)
       puts message if config[:enable_logging]
     end
-  
+    
     def config
       @config || { :enable_logging => true }
     end

data/spec/bonsai/exporter_spec.rb

@@ -16,17 +16,13 @@ describe Bonsai::Exporter do
   end
   
   shared_examples_for "css generators" do      
-    it "should process .less files to .css" do
-      File.exists?("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should be_true
-    end
-    
-    it "should process .sass files to .css" do
+    it "should process .scss 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) }.should_not raise_error(Less::SyntaxError)
+      lambda { Bonsai::Exporter.send(:generate_css) }.should_not raise_error(Sass::SyntaxError)
     end
   end
   
@@ -40,10 +36,6 @@ describe Bonsai::Exporter do
       it_should_behave_like "css generators"
       
       # Uncompressed CSS
-      it "should be processed with less" do
-        File.read("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should == ".mymixin, #content { display: block; }\n"
-      end
-      
       it "should be processed with sass" do
         File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content {\n  display: block; }\n"
       end
@@ -77,18 +69,10 @@ describe Bonsai::Exporter do
       
       it_should_behave_like "css generators"
       
-      # Compressed CSS
-      it "should be processed with less" do
-        File.read("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should == ".mymixin,#content{display:block;}"
-      end
-      
+      # Compressed CSS      
       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
-        File.exists?("#{Bonsai::Exporter.path}/stylesheets/base.less").should be_false
-      end
 
       it "should create the output directory" do
         File.exists?(Bonsai::Exporter.path).should be_true
@@ -125,7 +109,7 @@ describe Bonsai::Exporter do
       
       describe "asset compression" do
         it "should compress the css file" do
-          File.read("#{Bonsai::Exporter.path}/stylesheets/lesscss.css").should == ".mymixin,#content{display:block;}"
+          File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block;}"
         end
         
         it "should compress the css file" do

data/spec/bonsai/generate_spec.rb

@@ -17,8 +17,8 @@ describe Bonsai::Generate do
       File.exists?("#{@path}/public/.htaccess").should be_true
     end
     
-    it "should copy the base.less file" do
-      File.exists?("#{@path}/public/css/base.less").should be_true
+    it "should copy the base.scss file" do
+      File.exists?("#{@path}/public/css/base.scss").should be_true
     end
     
     it "should copy an index page" do
@@ -26,7 +26,7 @@ describe Bonsai::Generate do
     end
     
     it "should copy a default template" do
-      File.exists?("#{@path}/templates/default.mustache").should be_true
+      File.exists?("#{@path}/templates/default.liquid").should be_true
     end
     
     it "should create a robots.txt" do

data/spec/bonsai/page_spec.rb

@@ -3,247 +3,231 @@
 require "#{File.dirname(__FILE__)}/../spec_helper"
 
 describe Bonsai::Page do
-  it "should respond to all" do
-    Bonsai::Page.should respond_to :all
-  end
   
-  it "should contain pages" do
-    Bonsai::Page.all.first.should be_an_instance_of(Bonsai::Page)
+  describe "class methods" do
+    it "should respond to all" do
+      Bonsai::Page.should respond_to :all
+    end
+
+    it "should contain pages" do
+      Bonsai::Page.all.first.should be_an_instance_of(Bonsai::Page)
+    end
+
+    it "should remove numbers over 10 from the permalink" do
+      Bonsai::Page.find("many-pages").permalink.should == "/many-pages/"
+    end
+
+    it "should be equal" do
+      Bonsai::Page.find("about-us").should == Bonsai::Page.find("about-us")
+    end
   end
   
-  describe "instance" do
+  describe "relationships" do
     before :all do
-      @page = Bonsai::Page.find("about-us/history/")
+      @index = Bonsai::Page.find("index")
+      @about = Bonsai::Page.find("about-us")
+      @history = Bonsai::Page.find("about-us/history")   
+      @contact = Bonsai::Page.find("about-us/contact")
+      @child = Bonsai::Page.find("about-us/history/child")
     end
     
-    it "should have a slug" do
-      @page.slug.should == "history"
+    it "should have siblings" do
+      @history.siblings.should be_an_instance_of(Array)
+      @history.siblings.size.should == 1
+      @history.siblings.should include(@contact)
+      @history.siblings.should_not include(@history)
     end
-    
-    it "should have a name" do
-      @page.name.should == "History"
+
+    it "should have a parent" do
+      @history.parent.should == @about
     end
-    
-    it "should have a permalink" do
-      @page.permalink.should == "/about-us/history/"
+
+    it "should not have a parent" do
+      @about.parent.should == nil
     end
     
-    it "should have a ctime" do
-      @page.should respond_to :ctime
-      @page.ctime.should be_an_instance_of(Time)
+    it "should not have a parent for index" do
+      @index.parent.should == nil
     end
-    
-    it "should have an mtime" do
-      @page.should respond_to :mtime
-      @page.mtime.should be_an_instance_of(Time)
+
+    it "should have children" do
+      @about.children.should be_an_instance_of(Array)
+      @about.children.size.should == 1
+      @about.children.should include(@contact)
     end
     
-    it "should remove numbers over 10 from the permalink" do
-      Bonsai::Page.find("many-pages").permalink.should == "/many-pages/"
+    it "should not have floating pages in the children array" do
+      @about.children.should_not include(@history)
+    end
+
+    it "should have ancestors" do
+      @child.ancestors.should be_an_instance_of(Array)
+      @child.ancestors.size.should == 2
+      @child.ancestors.should include(@history)
+      @child.ancestors.should include(@about)
     end
     
-    it "should have a write_path" do
-      @page.write_path.should == "/about-us/history/index.html"
+    it "should have the ancestors in a top down order" do
+      @child.ancestors.first.should == @about
+      @child.ancestors.last.should == @history
     end
     
-    it "should respond to disk path" do
-      @page.disk_path.should == "#{Bonsai.root_dir}/content/1.about-us/history/demo-template.yml"
+    it "index should be a floating page" do
+      @index.floating?.should be_true
     end
-            
-    describe "assets" do
-      it "should have assets" do
-        @page.assets.should be_an_instance_of(Array)
-        @page.assets.length.should == 6
-      end
-      
-      it "should have the correct name" do
-        @page.assets.first[:name].should == "001"
-      end
-      
-      it "should have the correct path" do
-        @page.assets.first[:path].should == "/about-us/history/001.jpg"
-      end
-      
-      it "should have the correct disk_path" do
-        @page.assets.first[:disk_path].should == File.join(Dir.pwd, "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
+
+    it "about should not be a floating page" do
+      @about.floating?.should be_false
     end
+  end
+  
+  describe "instance" do
+    let(:page) { Bonsai::Page.find("about-us/history") }
+    subject { page }
     
-    it "should be equal" do
-      Bonsai::Page.find("about-us").should == Bonsai::Page.find("about-us")
+    its(:slug) { should == "history" }
+    its(:name) { should == "History" }
+    its(:permalink) { should == "/about-us/history/" }
+    its(:ctime) { should be_an_instance_of Time }
+    its(:mtime) { should be_an_instance_of Time }
+    its(:write_path) { should == "/about-us/history/index.html" }
+    its(:disk_path) { should == "#{Bonsai.root_dir}/content/1.about-us/history/demo-template.yml" }
+    its(:template) { should be_an_instance_of(Bonsai::Template) }
+    it "should to_hash to its variables" do
+      page.content[:page_title].should == "About our history"
+      page.content[:page_title].should_not be_nil
     end
     
-    describe "relationships" do
-      before :all do
-        @index = Bonsai::Page.find("index")
-        @about = Bonsai::Page.find("about-us")
-        @history = Bonsai::Page.find("about-us/history")   
-        @contact = Bonsai::Page.find("about-us/contact")
-        @child = Bonsai::Page.find("about-us/history/child")
-      end
+    describe "assets" do
+      subject { page.assets }
       
-      it "should have siblings" do
-        @history.siblings.should be_an_instance_of(Array)
-        @history.siblings.size.should == 1
-        @history.siblings.should include(@contact)
-        @history.siblings.should_not include(@history)
-      end
-
-      it "should have a parent" do
-        @history.parent.should == @about
-      end
-
-      it "should not have a parent" do
-        @about.parent.should == nil
-      end
+      it { should be_an_instance_of Array }
+      its(:length) { should be 6 }
       
-      it "should not have a parent for index" do
-        @index.parent.should == nil
-      end
+      describe "asset properties" do
+        it "should have the correct name" do
+          page.assets.first['name'].should == "001"
+        end
 
-      it "should have children" do
-        @about.children.should be_an_instance_of(Array)
-        @about.children.size.should == 1
-        @about.children.should include(@contact)
-      end
-      
-      it "should not have floating pages in the children array" do
-        @about.children.should_not include(@history)
-      end
+        it "should have the correct path" do
+          page.assets.first['path'].should == "/about-us/history/001.jpg"
+        end
 
-      it "should have ancestors" do
-        @child.ancestors.should be_an_instance_of(Array)
-        @child.ancestors.size.should == 2
-        @child.ancestors.should include(@history)
-        @child.ancestors.should include(@about)
-      end
-      
-      it "should have the ancestors in a top down order" do
-        @child.ancestors.first.should == @about
-        @child.ancestors.last.should == @history
-      end
-      
-      it "index should be a floating page" do
-        @index.floating?.should be_true
-      end
+        it "should have the correct disk_path" do
+          page.assets.first['disk_path'].should == File.join(Dir.pwd, "spec/support/content/1.about-us/history/001.jpg")
+        end
 
-      it "about should not be a floating page" do
-        @about.floating?.should be_false
+        it "should titleize the name attribute and remove the file extension" do
+          page.assets[2]['name'].should == "A File Asset"
+        end
       end
     end
-    
-    it "should have a template" do
-      @page.template.should be_an_instance_of(Bonsai::Template)
-    end
-    
-    it "should to_hash to its variables" do
-      @page.content[:page_title].should == "About our history"
-      @page.content[:page_title].should_not be_nil
-    end
-    
-    describe "render" do
-      before :all do
-        @output = Bonsai::Page.find("about-us/contact").render 
-      end
-      
-      it "should render" do
-        @output.should_not be_nil
-      end
+  end
+  
+  describe "render" do
+    describe "general" do
+      let(:page) { Bonsai::Page.find("about-us/contact").render }
+      subject { page }
       
+      it { should_not be_nil }
+
       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>&#8220;A designer knows he has achieved perfection not when there is nothing left to add, but when there is nothing left to take away.&#8221;</p>\n\n<p>– Antoine de Saint-Exupery</p>"
-      end
-      
-      it "should write in images" do
-        @output.should include "image001.jpg"
-      end
-      
-      # Pages that use a structure yet have no parent page should still render
-      describe "page without parent" do
-        it "should render successfully" do
-          lambda { Bonsai::Page.find("legals/terms-and-conditions").render }.should_not raise_error
-        end
+        page.should == "Hello from our template, named Contact\n\nGet in touch\n<p>&#8220;A designer knows he has achieved perfection not when there is nothing left to add, but when there is nothing left to take away.&#8221;</p>\n\n<p>– Antoine de Saint-Exupery</p>\n\nThis content should be inserted!"
       end
       
       describe "markdown" do
         it "should not use markdown for single line content" do
-          @output.should =~ /\nGet in touch\n/
+          page.should =~ /\nGet in touch\n/
         end
-        
+
         it "should use markdown for multiple line content" do
-          @output.should =~ /<p>&#8220;A designer knows he/
+          page.should =~ /<p>&#8220;A designer knows he/
         end
-        
+
         it "should use smartypants" do
-          @output.should =~ /&#8220;/
+          page.should =~ /&#8220;/
         end
       end
     end
     
-    describe "to hash" do
-      before :all do
-        @page = Bonsai::Page.find("about-us/history")
-      end
-      
-      it "should respond to to_hash" do
-        @page.should respond_to(:to_hash)
+    describe "images" do
+      let(:page) { Bonsai::Page.find("render/image-spec").render }
+      it "should render successfully" do
+        page.should == "\n  /render/image-spec/images/image001.jpg\n"
       end
       
-      %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
+      it "should write in images" do
+        page.should include "image001.jpg"
       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
+    
+    # Pages that use a structure yet have no parent page should still render
+    describe "page without parent" do
+      it "should render successfully" do
+        lambda { Bonsai::Page.find("legals/terms-and-conditions").render }.should_not raise_error
       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 "to hash" do
+    before :all do
+      @page = Bonsai::Page.find("about-us/history")
+    end
+    
+    it "should respond to to_hash" do
+      @page.should respond_to(:to_hash)
+    end
+    
+    %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)
       end
     end
     
-    describe "broken page" do
+    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
-        Bonsai::Page.path = "spec/support/broken/content"
-      end
-      
-      after :all do
-        Bonsai::Page.path = "spec/support/content"
-      end
-      
-      it "should exist" do
-        Bonsai::Page.find("page").should be_an_instance_of(Bonsai::Page)
+        @vars = @page.to_hash
       end
       
-      it "should error gracefully" do
-        lambda { Bonsai::Page.find("page").render }.should_not raise_error(ArgumentError)
+      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
+    before :all do
+      Bonsai::Page.path = "spec/support/broken/content"
+    end
+    
+    after :all do
+      Bonsai::Page.path = "spec/support/content"
+    end
+    
+    it "should exist" do
+      Bonsai::Page.find("page").should be_an_instance_of(Bonsai::Page)
+    end
+    
+    it "should error gracefully" do
+      lambda { Bonsai::Page.find("page").render }.should_not raise_error(ArgumentError)
+    end
+  end
 end

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{{body}}\n\n{% include 'partials/inserted' %}"
     end
   end
 end

data/spec/support/content/render/image-spec/images.yml

@@ -0,0 +1 @@
+:name: Image rendering

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

@@ -1,3 +1 @@
-/* missing mixin */
-#identifier 
-  + mixin
+@include 'fake';

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

@@ -0,0 +1,5 @@
+@mixin mymixin {
+  display: block;
+}
+
+#content { @include mymixin; }

data/spec/support/templates/children.liquid

@@ -0,0 +1,4 @@
+CHILDREN PAGES: {children | count}}
+{% for child in children %}
+  {{child.permalink}}
+{% endfor %}

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

@@ -0,0 +1,6 @@
+Hello from our template, named {{name}}
+
+{{page_title}}
+{{body}}
+
+{% include 'partials/inserted' %}

data/spec/support/templates/images.liquid

@@ -0,0 +1,3 @@
+{% for image in images %}
+  {{ image.path }}
+{% endfor %}

data/spec/support/templates/partials/_magic.liquid

@@ -0,0 +1,3 @@
+{% for m in magic %}
+  {{m.path}}
+{% endfor %}