bonsai 1.1.4 → 1.1.5

data/Rakefile

@@ -25,7 +25,7 @@ begin
     gem.homepage = "http://github.com/benschwarz/bonsai"
     gem.authors = ["Ben Schwarz"]
     gem.executables = ['bonsai']
-    
+    gem.has_rdoc = false
     gem.files.exclude 'vendor/gems'
     
     gem.add_development_dependency "rspec", ">= 1.3.0"

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/benchmark/associations.rb

@@ -2,7 +2,7 @@ require 'lib/bonsai'
 require 'benchmark'
 
 Bonsai.root_dir = File.dirname(__FILE__) + "/../spec/support"
-Bonsai.configure {|config| config[:enable_logging] = false }
+Bonsai.config = { :enable_logging => false }
 
 page = Bonsai::Page.find("about-us/history")
 

data/bonsai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bonsai}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-02-14}
+  s.date = %q{2010-02-15}
   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}
@@ -114,6 +114,7 @@ Gem::Specification.new do |s|
      "spec/support/templates/partials/inserted.mustache",
      "vendor/yui-compressor/yuicompressor-2.4.2.jar"
   ]
+  s.has_rdoc = false
   s.homepage = %q{http://github.com/benschwarz/bonsai}
   s.post_install_message = %q{
 

data/lib/bonsai.rb

@@ -5,13 +5,8 @@ require 'logger'
 $LOAD_PATH << "#{File.dirname(__FILE__)}/bonsai"
 
 module Bonsai
-  @@root_dir = nil
-  @@config = { :enable_logging => true }
-
   class << self
-    def root_dir
-      @@root_dir || Dir.pwd
-    end
+    attr_accessor :root_dir, :config
   
     def root_dir=(path)
       unless is_a_bonsai?(path)
@@ -19,7 +14,7 @@ module Bonsai
         exit 0
       end
       
-      @@root_dir = path
+      @root_dir = path
       
       Exporter.path = "#{path}/output"
       Page.path = "#{path}/content"
@@ -27,15 +22,11 @@ module Bonsai
     end
     
     def log(message)
-      puts message if @@config[:enable_logging]
+      puts message if config[:enable_logging]
     end
   
     def config
-      @@config 
-    end
-  
-    def configure(&block)
-      yield @@config
+      @config || { :enable_logging => true }
     end
     
     def version

data/lib/bonsai/exporter.rb

@@ -3,11 +3,9 @@ require 'less'
 
 module Bonsai
   class Exporter
-    @@path = "output"
-    
     class << self
-      def path; @@path; end
-      def path=(path); @@path = path; end
+      attr_accessor :path
+      def path; @path || "output"; end
       
       def process!
         setup
@@ -66,15 +64,12 @@ module Bonsai
         
         readme = <<-README
           This site was built using Bonsai (http://tinytree.info)
-                
-          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}`)
+          To make changes to the site you will require the original source files.
+          Please contact the author of your site for details.
         README
         
-        File.open("#{path}/ABOUT-THIS-SITE.txt", "w") {|file| file.write(readme) }
+        File.open("#{path}/ABOUT-THIS-SITE", "w") {|file| file.write(readme) }
       end
       
       def copy_assets

data/lib/bonsai/page.rb

@@ -11,19 +11,18 @@ end
 
 module Bonsai
   class Page
-    class NotFound < StandardError; end;
-    @@pages = {}
-    
-    class << self    
-      def path; @@path; end
-      def path=(path); @@path = path; end
+    class NotFound < StandardError; end;  
+    class << self
+      attr_accessor :path, :pages
+      
+      def pages; @pages || {} end
       
       def all(dir_path = path, pattern = "*/**")
         Dir["#{dir_path}/#{pattern}/*.yml"].map {|p| Page.new p }
       end
       
       def find(permalink)
-        @@pages[permalink] ||= find!(permalink)
+        pages[permalink] ||= find!(permalink)
       end
       
       private
@@ -202,7 +201,7 @@ module Bonsai
     end
     
     def web_path(path)
-      path.gsub(@@path, '').gsub(/\/\d+\./, '/')
+      path.gsub(self.class.path, '').gsub(/\/\d+\./, '/')
     end
   end
 end

data/lib/bonsai/sitemap.rb

@@ -25,6 +25,14 @@ module Bonsai
       end
       
       template.render
+    rescue NoMethodError
+      Bonsai.log <<-HELP
+      ! Can't write sitemap. Check that `site.yml` looks something like this:
+      
+      #{File.read(File.dirname(__FILE__) + "/templates/site.yml")}
+      HELP
+      
+      exit
     end
   end
 end

data/lib/bonsai/template.rb

@@ -1,14 +1,13 @@
 module Bonsai
-  class Template
-    @@path = "templates"
-    
+  class Template    
     class NotFound < StandardError; end
     
+    # Class methods
     class << self
-      def path; @@path; end
-      
-      def path=(path)
-        @@path = path
+      attr_accessor :path
+
+      def path
+        @path || "templates"
       end
       
       def find(name)
@@ -22,6 +21,7 @@ module Bonsai
       end
     end
     
+    # Instance methods
     attr_reader :path
     
     def initialize(path)

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.txt").should be_true
+        File.exists?("#{Bonsai::Exporter.path}/ABOUT-THIS-SITE").should be_true
       end
       
       describe "asset compression" do

data/spec/bonsai/generate_spec.rb

@@ -37,8 +37,8 @@ describe Bonsai::Generate do
       File.exists?("#{@path}/site.yml").should be_true
     end
     
-    it "should generate 23 files" do
-      Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 23
+    it "should generate 21 files" do
+      Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 21
     end
     
     it "should generate 15 directories" do

data/spec/spec.opts

@@ -1 +1,2 @@
 --color
+-b

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  Bonsai.configure {|config| config[:enable_logging] = false }
+  Bonsai.config = { :enable_logging => false }
   
   BONSAI_PATH = "#{File.dirname(__FILE__)}/support" unless defined? BONSAI_PATH
   Bonsai.root_dir = BONSAI_PATH

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bonsai
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +11:00
+date: 2010-02-15 00:00:00 +11:00
 default_executable: bonsai
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -226,7 +226,7 @@ files:
 - spec/support/templates/demo-template.mustache
 - spec/support/templates/partials/inserted.mustache
 - vendor/yui-compressor/yuicompressor-2.4.2.jar
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/benschwarz/bonsai
 licenses: []