bonsai 1.1.6 → 1.2.0

data/CHANGES

@@ -1,3 +1,10 @@
+= 1.2.0 (13/03/2010)
+
+* Updates to default templates
+  - Now includes an image which is dynamically mapped to the filesystem
+    This shows the "magic" variable feature of Bonsai in action. 
+  - Thanks to Philip Harrison
+
 = 1.1.6 (27/02/2010)
 
 * Updates to default templates

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.2.0

data/bonsai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bonsai}
-  s.version = "1.1.6"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-02-27}
+  s.date = %q{2010-03-13}
   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}
@@ -41,18 +41,18 @@ Gem::Specification.new do |s|
      "lib/bonsai/template.rb",
      "lib/bonsai/templates/content/1.varieties/1.fig/default.yml",
      "lib/bonsai/templates/content/1.varieties/2.maple/default.yml",
+     "lib/bonsai/templates/content/1.varieties/3.magic/images/magic.jpg",
+     "lib/bonsai/templates/content/1.varieties/3.magic/magic.yml",
      "lib/bonsai/templates/content/1.varieties/products.yml",
      "lib/bonsai/templates/content/2.cultivation/default.yml",
      "lib/bonsai/templates/content/3.history/default.yml",
      "lib/bonsai/templates/content/index/default.yml",
-     "lib/bonsai/templates/output/.htaccess",
-     "lib/bonsai/templates/output/docs/css/base.css",
-     "lib/bonsai/templates/output/robots.txt",
      "lib/bonsai/templates/public/.htaccess",
      "lib/bonsai/templates/public/css/base.less",
      "lib/bonsai/templates/public/robots.txt",
      "lib/bonsai/templates/site.yml",
      "lib/bonsai/templates/templates/default.mustache",
+     "lib/bonsai/templates/templates/magic.mustache",
      "lib/bonsai/templates/templates/products.mustache",
      "lib/bonsai/templates/templates/shared/analytics.mustache",
      "lib/bonsai/templates/templates/shared/breadcrumbs.mustache",
@@ -127,7 +127,7 @@ Gem::Specification.new do |s|
     }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A static site generator that uses the best toolset available}
   s.test_files = [
     "spec/bonsai/console_spec.rb",

data/lib/bonsai/templates/content/1.varieties/3.magic/magic.yml

@@ -0,0 +1,11 @@
+:headline: Magic fruit
+:body: |
+  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+  ### This is magic
+  [More about variables][1]
+
+  [1]: http://tinytree.info/managing-pages/
+
+:aside: |
+  #### Aside
+  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. 

data/lib/bonsai/templates/public/css/base.less

@@ -1,5 +1,5 @@
 /* HTML resets */
-h1, h2, h3, h4, h5, h6, p, ol, ul, li div, body, html, img, form, fieldset, input, textarea, p{ margin: 0; padding: 0; font-weight: normal; font-size: 100%; outline: none; border: none;}
+body, html, div, p, img, h1, h2, h3, h4, h5, h6, ol, ul, li { margin: 0; padding: 0; font-weight: normal; font-size: 100%; outline: none; border: none;}
 
 /* HTML5 block elements */
 header, section, article, footer, aside, nav { display: block; }
@@ -10,34 +10,62 @@ header, section, article, footer, aside, nav { display: block; }
 body { font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; }
 
 header { 
-	position: relative; margin-top: 5em;
+	margin-top: 5em;
 	
 	#logo { 
-		text-align: center; width: 145px; height: 145px; -moz-border-radius: 72px; -webkit-border-radius: 72px; background-color: black; color: white; margin: 0 auto; 
-		a { font-weight: 100; color: white; text-transform: lowercase; text-decoration: none; position: absolute; margin: 1em 0 0em 1.5em; }
-}
-	
-	#navigation {
-		margin: 5em 0; text-transform: lowercase; text-align: center;  font-style: italic; font-size: 0.8em;
+		width: 145px; 
+		height: 145px; 
+		margin: 0 auto; 
+		-moz-border-radius: 72px; 
+		-webkit-border-radius: 72px; 
+		background-color: black; 
 		
+		a { 
+			position: absolute; 
+			margin: 1em 0 0em 1.5em; 
+			color: white; 
+			text-align: center; 
+			text-transform: lowercase; 
+			text-decoration: none; 
+			font-weight: 100; 
+		}
+		  
+	}
+
+	#navigation {
+		margin: 5em 0; 
+		text-transform: lowercase; 
+		text-align: center;  
+		font-style: italic; 
+		font-size: 0.8em;
 		li:not(:last-child):after { content: " /"; }
+		
 		a { color: black; text-decoration: none; }
 		a:hover { text-decoration: underline; }
+		
 	}
 }
 
+
 nav li { display: inline; list-style-type: none; }
 
-#breadcrumbs, footer { color: #666; font-size: 0.7em; }
+#breadcrumbs, footer { color: gray; font-size: 0.7em; }
 
 #breadcrumbs {
-	margin: 3em 0 0 0;
-	li:not(:last-child):after { content: " →"; }
+	li:not(:last-child):after { content: " ➔";}
+	border-top: 1px solid lightgray;
+	padding-top:5px;
 	a { color: inherit; }
 }
 
+#sub-navigation{
+	font-size: 0.8em;
+	li { display: block; margin-bottom: 5px; }
+}
+
 nav, footer { margin: 1em 0; }
 
+/* Typesetting */
 h1, h2, h3, h4, h5, h6 { margin: 1.25em 0; }
 
 h1 { font-size: 2em; }
@@ -47,4 +75,19 @@ h4 { font-size: 1.2em; }
 h5 { font-size: 1em; }
 h6 { font-size: 0.9em; }
 
-p { font-size: 0.8em; line-height: 140%; margin-bottom: 10px; }
+a { color: #256ec4; }
+p { font-size: 0.8em; line-height: 140%; margin-bottom: 10px; color: #333;}
+
+/* Floating the Magic template */
+.magic article { 
+	width: 450px; 
+	float: left; 
+	border-right: 1px solid lightgray;
+	margin-right: 14px; 
+	padding-right: 15px;
+}
+.magic aside { 
+	width: 180px; 
+	float: left 
+}
+.clear{ clear: both; }

data/lib/bonsai/templates/templates/magic.mustache

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+  {{> shared/head}}
+  <body id="{{slug}}">
+    <section id="wrapper" class="magic">
+      {{> shared/header}}	
+	  
+	    <article>
+	      <h2>{{headline}}</h2>
+		    {{{body}}}
+			<figure>
+			{{#images}} {{! renders files located in a "images" folder within you page content }}
+			  <img src="{{path}}" alt="{{name}}" />
+			{{/images}}
+			</figure>
+	    </article>
+		<aside>
+			{{{aside}}}
+		</aside>
+		<div class="clear"></div>
+      {{> shared/footer}}
+    </section>
+    {{> shared/analytics }}
+  </body>
+</html>

data/lib/bonsai/templates/templates/shared/nav.mustache

@@ -1,5 +1,6 @@
 <nav id="navigation">
   <ol>
+  <li><a href="/">Home</a></li>
   {{# navigation}}
     <li><a href="{{permalink}}">{{name}}</a></li>
   {{/ navigation}}

data/spec/bonsai/generate_spec.rb

@@ -41,8 +41,8 @@ describe Bonsai::Generate do
       Dir.glob("#{@path}/**/*", File::FNM_DOTMATCH).select{|f| File.file?(f) }.size.should == 21
     end
     
-    it "should generate 15 directories" do
-      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 15
+    it "should generate 14 directories" do
+      Dir.glob("#{@path}/**/*").select{|f| File.directory?(f) }.size.should == 14
     end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bonsai
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,119 +14,160 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 +11:00
+date: 2010-03-13 00:00:00 +11:00
 default_executable: bonsai
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: tilt
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mustache
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: watch
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: maruku
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: less
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 17
         version: 1.2.17
-    version: 
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: launchy
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 3
         version: 0.3.3
-    version: 
+  type: :runtime
+  version_requirements: *id011
 description: A static site generator that uses the best toolset available
 email: ben.schwarz@gmail.com
 executables: 
@@ -154,18 +200,18 @@ files:
 - lib/bonsai/template.rb
 - lib/bonsai/templates/content/1.varieties/1.fig/default.yml
 - lib/bonsai/templates/content/1.varieties/2.maple/default.yml
+- lib/bonsai/templates/content/1.varieties/3.magic/images/magic.jpg
+- lib/bonsai/templates/content/1.varieties/3.magic/magic.yml
 - lib/bonsai/templates/content/1.varieties/products.yml
 - lib/bonsai/templates/content/2.cultivation/default.yml
 - lib/bonsai/templates/content/3.history/default.yml
 - lib/bonsai/templates/content/index/default.yml
-- lib/bonsai/templates/output/.htaccess
-- lib/bonsai/templates/output/docs/css/base.css
-- lib/bonsai/templates/output/robots.txt
 - lib/bonsai/templates/public/.htaccess
 - lib/bonsai/templates/public/css/base.less
 - lib/bonsai/templates/public/robots.txt
 - lib/bonsai/templates/site.yml
 - lib/bonsai/templates/templates/default.mustache
+- lib/bonsai/templates/templates/magic.mustache
 - lib/bonsai/templates/templates/products.mustache
 - lib/bonsai/templates/templates/shared/analytics.mustache
 - lib/bonsai/templates/templates/shared/breadcrumbs.mustache
@@ -239,18 +285,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A static site generator that uses the best toolset available

data/lib/bonsai/templates/output/.htaccess

@@ -1,28 +0,0 @@
-DirectoryIndex index.html
-FileETag All
-
-# Compress all static assets
-<IfModule mod_deflate.c>
-	# compress content with type html, text, and css
-  AddOutputFilterByType DEFLATE text/css text/html text/javascript application/javascript application/x-javascript text/js text/plain text/xml
-
-	<IfModule mod_headers.c>
-		# properly handle requests coming from behind proxies
-		Header append Vary User-Agent
-	</IfModule>
-</IfModule>
-
-# Cache, aggressively 
-<IfModule mod_expires.c>
-  ExpiresActive On
-  ExpiresDefault "access plus 10 days"
-
-	<FilesMatch "\.(eot|ttf|otf)$">
-		ExpiresDefault "access plus 10 years"
-	</filesMatch>
-</IfModule>
-
-# Mime-types
-AddType application/vnd.ms-fontobject .eot
-AddType font/ttf .ttf
-AddType font/otf .otf

data/lib/bonsai/templates/output/docs/css/base.css

@@ -1,60 +0,0 @@
-h1, h2, h3, h4, h5, h6, p, ol, ul {
-  margin: 0;
-  padding: 0;
-  font-weight: normal;
-}
-header, section, article, footer, aside, nav { display: block; }
-#wrapper {
-  margin: 0 auto;
-  width: 660px;
-}
-header {
-  position: relative;
-  margin-top: 5em;
-}
-header span { display: block; }
-header #logo {
-  width: 145px;
-  height: 145px;
-  -moz-border-radius: 72px;
-  -webkit-border-radius: 72px;
-  border-radius: 72px;
-  background-color: black;
-  color: white;
-  position: relative;
-  margin: 0 auto;
-}
-header #logo a {
-  color: white;
-  text-decoration: none;
-  position: absolute;
-  margin: 1em 0 0 1.5em;
-  text-align: center;
-  text-transform: lowercase;
-}
-header #navigation {
-  margin: 5em 0;
-  text-transform: lowercase;
-  text-align: center;
-  font-style: italic;
-  font-size: 0.8em;
-}
-header #navigation li:not(:last-child):after { content: " /"; }
-header #navigation a {
-  color: black;
-  text-decoration: none;
-}
-header #navigation a:hover { text-decoration: underline; }
-nav li {
-  display: inline;
-  list-style-type: none;
-}
-#breadcrumbs, footer {
-  color: #666666;
-  font-size: 0.7em;
-}
-#breadcrumbs { margin: 3em 0 0 0; }
-#breadcrumbs li:not(:last-child):after { content: " →"; }
-#breadcrumbs a { color: inherit; }
-nav, footer { margin: 1em 0; }
-h1, h2, h3, h4, h5, h6 { margin: 1.25em 0; }

data/lib/bonsai/templates/output/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Allow: /