bonsai 1.4.3 → 1.4.4

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    bonsai (1.4.1)
+    bonsai (1.4.3)
       activesupport (>= 3.0.3)
-      bonsai
       builder (>= 3.0.0)
       i18n (>= 0.5.0)
       launchy (>= 0.3.7)
@@ -18,19 +17,19 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    addressable (2.2.6)
+    activesupport (3.0.3)
     builder (3.0.0)
+    configuration (1.2.0)
     diff-lcs (1.1.2)
-    i18n (0.6.0)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
+    i18n (0.5.0)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
     liquid (2.2.2)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    multi_json (1.0.3)
-    rack (1.3.3)
+    rack (1.2.1)
+    rake (0.8.7)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -39,12 +38,11 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    sass (3.1.7)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    sass (3.1.4)
+    sinatra (1.0)
+      rack (>= 1.0)
     syntax (1.0.0)
-    tilt (1.3.3)
+    tilt (1.3)
     watch (0.1.0)
     yard (0.6.4)
 

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.4.4

data/bonsai.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{bonsai}
-  s.version = "1.4.3"
+  s.name = "bonsai"
+  s.version = "1.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ben Schwarz}]
-  s.date = %q{2011-09-21}
-  s.description = %q{A static site generator that uses the best toolset available}
-  s.email = %q{ben.schwarz@gmail.com}
-  s.executables = [%q{bonsai}]
+  s.authors = ["Ben Schwarz"]
+  s.date = "2011-10-07"
+  s.description = "A static site generator that uses the best toolset available"
+  s.email = "ben.schwarz@gmail.com"
+  s.executables = ["bonsai"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -118,19 +118,23 @@ Gem::Specification.new do |s|
     "spec/support/templates/partials/_magic.liquid",
     "vendor/yui-compressor/yuicompressor-2.4.2.jar"
   ]
-  s.homepage = %q{http://github.com/benschwarz/bonsai}
-  s.post_install_message = %q{
-
-      盆栽
-      bonsai, tiny and beautiful
-
-
-
-      type `bonsai --help` to get started
-    }
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{A static site generator that uses the best toolset available}
+  s.homepage = "http://github.com/benschwarz/bonsai"
+  s.post_install_message = "\n\n      \u{76c6}\u{683d}\n      bonsai, tiny and beautiful\n\n\n\n      type `bonsai --help` to get started\n    "
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "A static site generator that uses the best toolset available"
+  s.test_files = [
+    "spec/bonsai/console_spec.rb",
+    "spec/bonsai/exporter_spec.rb",
+    "spec/bonsai/generate_spec.rb",
+    "spec/bonsai/navigation_spec.rb",
+    "spec/bonsai/page_spec.rb",
+    "spec/bonsai/sitemap_spec.rb",
+    "spec/bonsai/template_spec.rb",
+    "spec/bonsai_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/extensions.rb"
+  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -145,6 +149,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
       s.add_runtime_dependency(%q<tilt>, [">= 1.3"])
@@ -166,6 +172,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3"])
+      s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 1.0"])
       s.add_dependency(%q<tilt>, [">= 1.3"])
@@ -188,6 +196,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3"])
+    s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<tilt>, [">= 1.3"])

data/lib/bonsai.rb

@@ -17,10 +17,7 @@ module Bonsai
       
       @root_dir = path
       
-      Exporter.path = "#{path}/output"
-      Page.path = "#{path}/content"
-      Template.path = "#{path}/templates"
-      Liquid::Template.file_system = Liquid::LocalFileSystem.new(Template.path)
+      init
     end
     
     def log(message)
@@ -36,12 +33,32 @@ module Bonsai
     end
     
     def site
-      YAML::load(File.read("#{Bonsai.root_dir}/site.yml")) || {}
+      YAML::load(File.read("#{@root_dir}/site.yml")) || {}
     rescue ArgumentError
       Bonsai.log "Badly formatted site.yml"
     end
     
     private
+    def init
+      set_paths
+      load_extensions
+    end
+    
+    def set_paths
+      Exporter.path = "#{@root_dir}/output"
+      Page.path = "#{@root_dir}/content"
+      Template.path = "#{@root_dir}/templates"
+      Liquid::Template.file_system = Liquid::LocalFileSystem.new(Template.path)
+    end
+    
+    def load_extensions
+      extension_path = "#{@root_dir}/extensions.rb"
+       
+      if File.exists?(extension_path)
+        require File.expand_path(extension_path)
+      end
+    end
+    
     def is_a_bonsai?(path)
       File.directory?("#{path}/content") && File.directory?("#{path}/public") && File.directory?("#{path}/templates")
     end
@@ -54,7 +71,6 @@ module Bonsai
   autoload :Template,           "template"
   autoload :Generate,           "generate"
   autoload :Navigation,         "navigation"
-  autoload :PagePresenter,      "page_presenter"
   autoload :StaticPassThrough,  "webserver"
   autoload :DevelopmentServer,  "webserver"
 end

data/spec/bonsai_spec.rb

@@ -19,6 +19,12 @@ describe Bonsai do
     Bonsai.version.should =~ /\d+.\d+.\d+/
   end
   
+  it "should load extensions.rb" do
+    Bonsai.root_dir = "spec/support"
+
+    # Test the module was created
+    Extensions.class.should == Module
+  end
   
   describe "site yml" do
     describe "working" do

data/spec/support/extensions.rb

@@ -0,0 +1,2 @@
+module Extensions
+end

metadata

@@ -1,247 +1,267 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bonsai
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.4.4
   prerelease: 
-  version: 1.4.3
 platform: ruby
-authors: 
+authors:
 - Ben Schwarz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70205692080400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692080400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70205692078440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692078440
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70205692077840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692077840
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70205692077360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692077360
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70205692076880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692076880
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70205692076400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692076400
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70205692075900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692075900
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70205692075240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70205692075240
+- !ruby/object:Gem::Dependency
   name: yard
+  requirement: &70205692074560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692074560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70205692073980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692073980
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70205692073340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70205692073340
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70205692072740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692072740
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70205692072220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692072220
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &70205692071740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: liquid
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692071740
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: &70205692071160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692071160
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70205692070440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: watch
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692070440
+- !ruby/object:Gem::Dependency
+  name: watch
+  requirement: &70205692065480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: maruku
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692065480
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: &70205692064980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692064980
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70205692064500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.7
   type: :runtime
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692064500
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70205692064020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692064020
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70205692063480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: sass
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: *70205692063480
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70205692062980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id020
+  prerelease: false
+  version_requirements: *70205692062980
 description: A static site generator that uses the best toolset available
 email: ben.schwarz@gmail.com
-executables: 
+executables:
 - bonsai
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .bundle/config
 - .document
 - .rspec
@@ -341,32 +361,40 @@ files:
 - spec/support/templates/partials/_inserted.liquid
 - spec/support/templates/partials/_magic.liquid
 - vendor/yui-compressor/yuicompressor-2.4.2.jar
+- spec/support/extensions.rb
 homepage: http://github.com/benschwarz/bonsai
 licenses: []
-
-post_install_message: "\n\n      \xE7\x9B\x86\xE6\xA0\xBD\n      bonsai, tiny and beautiful\n\n\n\n      type `bonsai --help` to get started\n    "
+post_install_message: ! "\n\n      盆栽\n      bonsai, tiny and beautiful\n\n\n\n      type
+  `bonsai --help` to get started\n    "
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A static site generator that uses the best toolset available
-test_files: []
-
+test_files:
+- spec/bonsai/console_spec.rb
+- spec/bonsai/exporter_spec.rb
+- spec/bonsai/generate_spec.rb
+- spec/bonsai/navigation_spec.rb
+- spec/bonsai/page_spec.rb
+- spec/bonsai/sitemap_spec.rb
+- spec/bonsai/template_spec.rb
+- spec/bonsai_spec.rb
+- spec/spec_helper.rb
+- spec/support/extensions.rb