bonsai 1.3.1 → 1.3.2

data/lib/bonsai/page.rb

@@ -68,8 +68,8 @@ module Bonsai
     end
     
     # This method is used for the exporter to copy assets
-    def assets(disk_path = directory)
-      Dir["#{disk_path}/**/*"].select{|path| !File.directory?(path) && !File.basename(path).include?("yml") }.map do |file|
+    def assets
+      Dir["#{directory}/**/*"].select{|path| !File.directory?(path) && !File.basename(path).include?("yml") }.map do |file|
         file_to_hash(file)
       end
     end
@@ -96,8 +96,8 @@ module Bonsai
       self.class.all(File.dirname(disk_path[/(.+)\/[^\/]*$/, 1]), "*").delete_if{|p| p == self}
     end
     
-    def children(path = nil)
-      self.class.all((path||directory), "*").delete_if{|p| p.floating? }
+    def children
+      self.class.all(File.dirname(disk_path), "*").delete_if{|p| p.floating? }
     end
     
     def ancestors
@@ -170,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
@@ -181,10 +181,9 @@ module Bonsai
       name = File.basename(path)
       
       {
-        name.to_sym => {
-          :files => assets(path),
-          :children => children(path).map{|page| page.to_hash }
-        }
+        name.to_sym => Dir["#{path}/*"].map do |file|
+          file_to_hash(file)  
+        end
       }
     end
     

data/lib/bonsai/sitemap.rb

@@ -13,7 +13,7 @@ module Bonsai
             	xml.changefreq(change_freq)
            	}
 
-            Bonsai::Page.all.delete_if{|p| p.permalink === "/index"}.each do |page|
+            Bonsai::Page.all.delete_if{|p| p.permalink === "/index/"}.each do |page|
               xml.url {
                 xml.loc(Bonsai.site[:url] + page.permalink)
               	xml.lastmod(page.mtime.utc.strftime("%Y-%m-%d"))
@@ -35,4 +35,4 @@ module Bonsai
       exit
     end
   end
-end
+end

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}} are examples
+# {{site_name}}, {{url}}, {{copyright}} and {{analytics_code}}
 
 :site_name: Your website title
 :url: http://yourdomain.com

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 24 files" do
-      Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 24
+    it "should generate 22 files" do
+      Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 22
     end
     
-    it "should generate 16 directories" do
-      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 16
+    it "should generate 14 directories" do
+      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 14
     end
   end
 end

data/spec/bonsai/page_spec.rb

@@ -65,53 +65,12 @@ describe Bonsai::Page do
       end
       
       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"
+        @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
-      
-      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
@@ -196,7 +155,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/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"
+        @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
@@ -216,11 +175,11 @@ describe Bonsai::Page do
         end
         
         it "should use markdown for multiple line content" do
-          @output.should =~ /<p>&ldquo;A designer knows he/
+          @output.should =~ /<p>&#8220;A designer knows he/
         end
         
         it "should use smartypants" do
-          @output.should =~ /&rdquo;/
+          @output.should =~ /&#8220;/
         end
       end
     end
@@ -245,6 +204,28 @@ 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  {{#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}}}"
+      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}}}"
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'bonsai'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   Bonsai.config = { :enable_logging => false }
   
   BONSAI_PATH = "#{File.dirname(__FILE__)}/support" unless defined? BONSAI_PATH

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

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