soxer 0.9.9 → 0.9.10

data/CHANGES

@@ -1,18 +1,31 @@
+= 0.9.10 / 2011-03-21
+  
+  * The function get_list now returns an array of hashies. This was a severe
+    inconsistency.
+  
+  * Fixed incompatibility with Ruby 1.9.2+ where app.rb was called without a
+    local path.
+  
+  * Completely rewritten inclusion of empty directories to facilitate a more
+    flexible skeleton project creation.
+  
 = 0.9.9 / 2011-03-03
 
   * Changed the names of Classes to match CamelCase convention in Ruby
   
   * Added .eot font to the mime collection to Rack
   
-  * Cleaned up the superfuous blocks of documentation.
+  * Cleaned up the superfluous blocks of documentation.
   
   * Fixed interpretation of layout: 'false' statement, if used inside yaml 
     file.
   
-  * Added dependancy on 'hashie' gem. Now page keys can be accessed 
+  * Added dependency on 'hashie' gem. Now page keys can be accessed 
     as hash keys(strings or symbols) as well as methods.
     The following will yield the same: page[:date], page['date'], page.date
   
+  * Finally resolved the inclusion of empty directories within skeleton dirs.
+  
 = 0.9.8 / 2010-11-28
   
   * Standardized and beautified code (no particular standard though.)
@@ -22,7 +35,7 @@
   * YAML file downloading disabled. This was a severe bug.
   
   * Url-to-file routing completely redone, now far more flexible and 
-    extendible, while less error prone.
+    extensible, while less error prone.
   
   * Atom feed generator completely redone. Not backwards compatible. However, 
     it was not logical and mostly broken anyway.
@@ -33,7 +46,7 @@
   
   * Fixed skeleton creation to include empty directories.
   
-  * Developement mode output padded with newline. Annoyance only.
+  * Development mode output padded with newline. Annoyance only.
   
   * get_list now filters list of files: If both 'dir/something.yaml' and 
     'dir/something/index.html' exist, only the first is included.
@@ -48,7 +61,7 @@
   * Created a README.markdown document
   
   * Added sinatra-reloader as dependency, although it's only needed in 
-    developement mode.
+    development mode.
   
   * Added proper license
   
@@ -85,13 +98,13 @@
   
   * Fixed partial generator so it properly handles strings and symbols
   
-  * Cleaned up "soxer test" and only choose "thin" webserver if available.
+  * Cleaned up "soxer test" and only choose "thin" web server if available.
     Defaults to webrick (very slow).
 
 = 0.9.4 / 2010-10-27
   
   * Added executable 'soxer' to help generating application directories and
-    running developement versions
+    running development versions
     
   * Added skeletal directories, and 'empty' skeleton application
 

data/README.markdown

@@ -2,7 +2,7 @@ Soxer, the web publishing tool
 ==============================
 
 [Soxer](http://soxer.mutsu.org) is a document/url centric web publishing 
-system. It enables the developer to quickly setup, design and deploy any web based project, from quick mockups to complete portals. 
+system. It enables the developer to quickly setup, design and deploy any web based project, from quick mock-ups to complete portals. 
 
 Soxer is distributed under the terms of [GNU General Public License](http://www.gnu.org/licenses/gpl.htm) and is supported by [Formalibre](http://www.formalibre.si).
 

data/bin/soxer

@@ -43,6 +43,7 @@ def help
       
       First parameter:
         #{b 'empty'}     - Creates an empty project
+        #{b 'blog'}      - Creates a simple blog project
         More project templates are in the making
         
         Other parameters:
@@ -75,6 +76,7 @@ end
 
 def create template, dir
   skel = File.dirname(__FILE__)+"/../lib/soxer/skel"
+  dest = File.join Dir.pwd,  dir
   case true
     when template==nil then
       return err "You did not enter the project type skeleton."
@@ -85,8 +87,10 @@ def create template, dir
     when File.exist?(dir) then
       return err "The destination directory exists."
     else
-      FileUtils.copy_entry( File.join(skel, template), dir)
-      FileUtils.rm Dir.glob('**/EMPTY')
+      FileUtils.copy_entry( File.join(skel, template), dest)
+      require dest+'/SETUP'
+      initSkel dest
+      FileUtils.rm dest + '/SETUP.rb'
       return notice "Successfuly created '#{dir}' application directory from '#{template}'."
   end
 end
@@ -110,6 +114,5 @@ end
 # TO COME LATER
 x = <<END
       #{b 'corporate'} - Creates a corporate web page mockup
-      #{b 'blog'}      - Creates a blog mockup
       #{b 'gallery'}   - Creates an image gallery mockup
 END

data/lib/soxer/main.rb

@@ -176,9 +176,9 @@ module Sinatra
           file = FileReader.new
           file.filename = f
           if block_given?
-            f = block.call file.get_content
+            f = block.call Hashie::Mash.new( file.get_content )
           else
-            f = file.get_content
+            f = Hashie::Mash.new file.get_content
           end
         end.compact
       end

data/lib/soxer/skel/blog/SETUP.rb

@@ -0,0 +1,7 @@
+def initSkel dest
+  %w[bin log public].each {|d| Dir.mkdir "#{dest}/#{d}" unless Dir.exists? "#{dest}/#{d}" }
+  
+  Dir.chdir dest+'/content/categories'
+  %w[rants recipes tutorials].each {|l| File.symlink 'index.yaml', l+'.yaml' }
+  Dir.chdir dest
+end

data/lib/soxer/skel/blog/app.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+require "rubygems"
+require "sinatra"
+require "soxer"
+
+class SoxerApp < Sinatra::Base
+  enable :sessions
+  before do
+    session[:theme] ||= %w[dna blossom][rand 1]
+    session[:theme] = params[:theme] if params[:theme]
+  end
+  get '/blog' do
+    redirect '/categories'
+  end
+  
+  register Sinatra::Soxer
+end

data/lib/soxer/skel/blog/config.ru

@@ -0,0 +1,25 @@
+require "rubygems"
+require "sinatra/base"
+require "app"
+
+disable :run
+set :server, %w[thin mongrel webrick]
+set :haml, {:format => :html5, 
+            :attr_wrapper => '"'}
+set :haml, {:encoding => 'utf-8'} if RUBY_VERSION=~/1\.9/
+
+configure :development do
+  require 'sinatra/reloader'
+  set :port, 9394
+end
+
+configure :production do
+  set :haml, {:ugly => true}
+  set :port, 55500
+end
+
+set :environment, :production
+
+map '/' do
+  run SoxerApp
+end

data/lib/soxer/skel/blog/config.yml

@@ -0,0 +1,14 @@
+---
+  environment: production
+  chdir: /path/to/your/application/home/dir
+  address: 0.0.0.0
+  user: toni
+  group: toni
+  port: 55500
+  pid: /path/to/your/application/home/dir/log/thin.pid
+  log: /path/to/your/application/home/dir/log/thin.log
+  rackup: /path/to/your/application/home/dir/config.ru
+  max_conns: 1024
+  timeout: 30
+  max_persistent_conns: 512
+  daemonize: true

data/lib/soxer/skel/blog/content/blog/2009-06-02-meum_est_propositum.yaml

@@ -0,0 +1,20 @@
+uuid: 4198acb0-dcb4-012d-f730-001e378a2988
+date: 2009-06-02T01:26:47+01:00
+class: [doc]
+category: [tutorials, recipes, rants]
+title: Meum est propositum in taberna mori
+summary: Ut sit vina proxima morientes ori. Maecenas quis ligula enim, ut luctus urna. Cras cursus, sem non gravida laoreet, purus felis venenatis tortor, sed commodo augue libero ac metus.
+content: |
+  :markdown
+  
+    #{ page['title'] }
+    ==================
+    
+    #### #{ page['summary'] }
+    
+    Ut consequat suscipit tincidunt. Nullam nulla magna, tincidunt ac aliquet vitae, viverra in odio. Ut sagittis erat at lorem lacinia vel convallis tortor dignissim. Aliquam erat volutpat. Donec dui elit, scelerisque suscipit tincidunt quis, suscipit et metus. Aliquam erat volutpat. Curabitur egestas velit orci. Maecenas euismod rhoncus condimentum. Ut mattis mollis ligula, malesuada consectetur sapien condimentum nec. Quisque pellentesque interdum diam, sed gravida arcu consectetur ac. Cras auctor mi nec ante elementum blandit.
+    
+    In tempus cursus ipsum ac cursus. Quisque nec vulputate justo. Maecenas quis ligula enim, ut luctus urna. Cras cursus, sem non gravida laoreet, purus felis venenatis tortor, sed commodo augue libero ac metus. Quisque eget mauris sed magna cursus laoreet. Fusce augue lacus, dictum luctus sagittis ut, convallis in risus. Etiam gravida tincidunt ultrices. In hac habitasse platea dictumst. Vestibulum faucibus dolor quis magna dapibus consequat. Aenean mi nibh, tempus id placerat in, volutpat nec sem. Nunc congue bibendum leo. Aliquam viverra egestas pellentesque. Duis dictum, metus id eleifend tincidunt, diam nisl venenatis ante, a tempor turpis enim in nunc. Etiam id sem magna, tempor eleifend nisl. Quisque tortor metus, interdum et cursus sodales, ullamcorper at orci.
+    
+    Cras eget justo sit amet nibh viverra condimentum. Aenean in neque eget ligula convallis mollis. Nulla ac diam erat, id tristique eros. Sed quis ligula vitae nisl laoreet dictum eget eget sapien. Nulla vehicula elit in sem feugiat sollicitudin eget in lorem. Integer erat metus, aliquam nec cursus a, dignissim in felis. Etiam arcu purus, iaculis non malesuada vel, faucibus luctus nibh. Aenean eros sem, fermentum at blandit ut, tincidunt pharetra tortor. Ut massa dui, imperdiet vitae interdum ac, pretium eget eros. Mauris blandit nibh sed tellus iaculis quis vestibulum metus sagittis. Duis sit amet odio id odio eleifend sagittis nec nec sem. Nulla facilisi. In bibendum justo et velit lobortis convallis. Pellentesque purus orci, vehicula et rutrum a, lacinia nec felis. Vivamus malesuada quam vitae ligula aliquet ut sodales sapien lacinia. Pellentesque blandit dolor in tellus accumsan lobortis. Vestibulum vel erat odio. Maecenas vel massa vitae metus condimentum faucibus mattis ut leo. 
+    

data/lib/soxer/skel/blog/content/blog/2010-04-16-ecce_quomdo_moritur_iustus.yaml

@@ -0,0 +1,20 @@
+uuid: 41987df0-dcb4-012d-f72f-001e378a2988
+date: 2010-04-16T16:29:22+01:00
+class: [doc]
+category: [tutorials, recipes, rants]
+title: Ecce quomodo moriur iustus
+summary: Maecenas quis ligula enim, ut luctus urna. Cras cursus, sem non gravida laoreet, purus felis venenatis tortor, sed commodo augue libero ac metus.
+content: |
+  :markdown
+  
+    #{ page['title'] }
+    ==================
+    
+    #### #{ page['summary'] }
+    
+    Ut consequat suscipit tincidunt. Nullam nulla magna, tincidunt ac aliquet vitae, viverra in odio. Ut sagittis erat at lorem lacinia vel convallis tortor dignissim. Aliquam erat volutpat. Donec dui elit, scelerisque suscipit tincidunt quis, suscipit et metus. Aliquam erat volutpat. Curabitur egestas velit orci. Maecenas euismod rhoncus condimentum. Ut mattis mollis ligula, malesuada consectetur sapien condimentum nec. Quisque pellentesque interdum diam, sed gravida arcu consectetur ac. Cras auctor mi nec ante elementum blandit.
+    
+    In tempus cursus ipsum ac cursus. Quisque nec vulputate justo. Maecenas quis ligula enim, ut luctus urna. Cras cursus, sem non gravida laoreet, purus felis venenatis tortor, sed commodo augue libero ac metus. Quisque eget mauris sed magna cursus laoreet. Fusce augue lacus, dictum luctus sagittis ut, convallis in risus. Etiam gravida tincidunt ultrices. In hac habitasse platea dictumst. Vestibulum faucibus dolor quis magna dapibus consequat. Aenean mi nibh, tempus id placerat in, volutpat nec sem. Nunc congue bibendum leo. Aliquam viverra egestas pellentesque. Duis dictum, metus id eleifend tincidunt, diam nisl venenatis ante, a tempor turpis enim in nunc. Etiam id sem magna, tempor eleifend nisl. Quisque tortor metus, interdum et cursus sodales, ullamcorper at orci.
+    
+    Cras eget justo sit amet nibh viverra condimentum. Aenean in neque eget ligula convallis mollis. Nulla ac diam erat, id tristique eros. Sed quis ligula vitae nisl laoreet dictum eget eget sapien. Nulla vehicula elit in sem feugiat sollicitudin eget in lorem. Integer erat metus, aliquam nec cursus a, dignissim in felis. Etiam arcu purus, iaculis non malesuada vel, faucibus luctus nibh. Aenean eros sem, fermentum at blandit ut, tincidunt pharetra tortor. Ut massa dui, imperdiet vitae interdum ac, pretium eget eros. Mauris blandit nibh sed tellus iaculis quis vestibulum metus sagittis. Duis sit amet odio id odio eleifend sagittis nec nec sem. Nulla facilisi. In bibendum justo et velit lobortis convallis. Pellentesque purus orci, vehicula et rutrum a, lacinia nec felis. Vivamus malesuada quam vitae ligula aliquet ut sodales sapien lacinia. Pellentesque blandit dolor in tellus accumsan lobortis. Vestibulum vel erat odio. Maecenas vel massa vitae metus condimentum faucibus mattis ut leo. 
+    

data/lib/soxer/skel/blog/content/blog/2010-09-06-lorem_ipsum.yaml

@@ -0,0 +1,20 @@
+uuid: a75b5870-da54-012d-f71b-001e378a2988
+date: 2010-09-06T00:59:22+01:00
+class: [doc]
+category: [tutorials, recipes]
+title: Quisque eget mauris sed magna cursus
+summary: Maecenas quis ligula enim, ut luctus urna. Cras cursus, sem non gravida laoreet, purus felis venenatis tortor, sed commodo augue libero ac metus.
+content: |
+  :markdown
+  
+    #{ page['title'] }
+    ==================
+    
+    #### #{ page['summary'] }
+    
+    Ut consequat suscipit tincidunt. Nullam nulla magna, tincidunt ac aliquet vitae, viverra in odio. Ut sagittis erat at lorem lacinia vel convallis tortor dignissim. Aliquam erat volutpat. Donec dui elit, scelerisque suscipit tincidunt quis, suscipit et metus. Aliquam erat volutpat. Curabitur egestas velit orci. Maecenas euismod rhoncus condimentum. Ut mattis mollis ligula, malesuada consectetur sapien condimentum nec. Quisque pellentesque interdum diam, sed gravida arcu consectetur ac. Cras auctor mi nec ante elementum blandit.
+    
+    In tempus cursus ipsum ac cursus. Quisque nec vulputate justo. Maecenas quis ligula enim, ut luctus urna. Cras cursus, sem non gravida laoreet, purus felis venenatis tortor, sed commodo augue libero ac metus. Quisque eget mauris sed magna cursus laoreet. Fusce augue lacus, dictum luctus sagittis ut, convallis in risus. Etiam gravida tincidunt ultrices. In hac habitasse platea dictumst. Vestibulum faucibus dolor quis magna dapibus consequat. Aenean mi nibh, tempus id placerat in, volutpat nec sem. Nunc congue bibendum leo. Aliquam viverra egestas pellentesque. Duis dictum, metus id eleifend tincidunt, diam nisl venenatis ante, a tempor turpis enim in nunc. Etiam id sem magna, tempor eleifend nisl. Quisque tortor metus, interdum et cursus sodales, ullamcorper at orci.
+    
+    Cras eget justo sit amet nibh viverra condimentum. Aenean in neque eget ligula convallis mollis. Nulla ac diam erat, id tristique eros. Sed quis ligula vitae nisl laoreet dictum eget eget sapien. Nulla vehicula elit in sem feugiat sollicitudin eget in lorem. Integer erat metus, aliquam nec cursus a, dignissim in felis. Etiam arcu purus, iaculis non malesuada vel, faucibus luctus nibh. Aenean eros sem, fermentum at blandit ut, tincidunt pharetra tortor. Ut massa dui, imperdiet vitae interdum ac, pretium eget eros. Mauris blandit nibh sed tellus iaculis quis vestibulum metus sagittis. Duis sit amet odio id odio eleifend sagittis nec nec sem. Nulla facilisi. In bibendum justo et velit lobortis convallis. Pellentesque purus orci, vehicula et rutrum a, lacinia nec felis. Vivamus malesuada quam vitae ligula aliquet ut sodales sapien lacinia. Pellentesque blandit dolor in tellus accumsan lobortis. Vestibulum vel erat odio. Maecenas vel massa vitae metus condimentum faucibus mattis ut leo. 
+    

data/lib/soxer/skel/blog/content/blog/2010-10-12-how_to_spend_your_time_wisely.yaml

@@ -0,0 +1,20 @@
+uuid: e2121c00-dae1-012d-f724-001e378a2988
+date: 2010-10-12T17:49:23+01:00
+class: [doc]
+category: [rants]
+title: How to spend your time wisely
+summary: CMS tools are great. They keep people occupied, programmers busy, wallets dry and most important of all - the masses doing meanial things into oblivion.
+content: |
+  :markdown
+  
+    #{ page['title'] }
+    ==================
+    
+    #### #{ page['summary'] }
+  
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nunc dolor, porta in interdum ornare, scelerisque sit amet orci. Nullam elit turpis, molestie et imperdiet eu, lobortis vitae quam. Aenean nunc orci, pellentesque et viverra sed, facilisis in nulla. Maecenas laoreet eleifend nunc, vitae convallis lorem rhoncus non. Cras gravida sapien sed lacus aliquet rutrum. In varius leo ac nibh tincidunt accumsan. Nullam ut pulvinar tortor. Vivamus vel pretium quam. Donec vel viverra tortor. Curabitur turpis libero, lacinia et hendrerit id, suscipit in tortor. Cras enim tellus, ornare vitae laoreet id, adipiscing ut nunc. In sed ligula mauris, ut porttitor dui. Sed iaculis eros ac lectus scelerisque hendrerit. Duis sed felis vel ipsum accumsan bibendum. Nulla scelerisque pharetra lacinia. Donec vitae neque risus, eu pellentesque sem. Donec hendrerit mattis augue, vel viverra metus dapibus non. Duis imperdiet augue nec nulla pulvinar molestie. Aenean interdum dapibus dui, et varius orci aliquam auctor. Fusce iaculis, mauris eget laoreet cursus, diam lacus posuere lectus, at gravida nulla risus blandit est.
+
+    Quisque nunc lectus, feugiat a vulputate ac, accumsan placerat nunc. Fusce feugiat pretium enim et ullamcorper. Vestibulum ultrices tristique luctus. Morbi in dolor non tellus mollis elementum ut quis magna. Etiam vel ante massa. Curabitur turpis ipsum, suscipit eu vestibulum nec, lacinia vel nulla. Donec placerat vestibulum auctor. Donec tincidunt egestas ultrices. Fusce porta tortor vitae sem faucibus elementum suscipit nunc vehicula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
+    
+    Vestibulum eu dolor eu justo scelerisque ultrices ac eu risus. Vivamus fermentum neque quis lorem viverra commodo. Donec a mauris quam, in condimentum diam. Aliquam convallis lectus a elit condimentum luctus. Curabitur ultricies eleifend lorem a molestie. Nunc mauris sapien, accumsan eget tincidunt vitae, tincidunt pretium lacus. Etiam porta leo at enim ullamcorper ut semper risus eleifend. Cras sagittis mi nulla, ut mollis enim. Cras enim mauris, aliquet vel dapibus eget, ultrices id mauris. Pellentesque auctor, arcu ac commodo pulvinar, nisi nunc euismod lacus, ac dignissim orci est dignissim enim. Integer nunc felis, aliquam sit amet ultricies sit amet, porttitor eu odio. 
+    

data/lib/soxer/skel/blog/content/blog/2010-11-24-what_is_where.yaml

@@ -0,0 +1,38 @@
+uuid: 6648b260-da52-012d-f71a-001e378a2988
+date: 2010-11-25T00:42:16+01:00
+class: [doc]
+category: [tutorials]
+title: Soxer application structure
+summary: Every soxer project has a similar default directory structure, workflow and dynamics. As a matter of fact, creating a blog is exactly the same as creating a corporate web page. The only difference is naming your URLs... and perhaps styling with SASS to achieve the desired effect.
+content: |
+  :markdown
+  
+    #{ page['title'] }
+    ==================
+    
+    #### #{ page['summary'] }
+  
+      This blog is an excellent example of the power of soxer. It only takes 3 separate files (excluding configuration) for the entire design, layout, style and whatnot. Ok, we admit, every block in the column is a separate file - so... 6 files:
+      
+      1. **./views/layout.haml**  
+         This is the mama of all html. It represents the HTML layout every page uses. It's written in [HAML](http://haml-lang.com) and uses all bells and whistles haml can offer.
+      2. **./css/*/css.css**  
+         Well, this could be only one css file, but i wanted to make sure you can switch styles on the fly. That's why i created several SASS styles. Also, there is a common sass file, that's included in all designs. It's because I believe programming and [Martini cocktails](http://en.wikipedia.org/wiki/Martini_%28cocktail%29) share [a common trait](http://en.wikipedia.org/wiki/Don%27t_repeat_yourself).
+      3. **./views/_block_*.haml**  
+         These are blocks that appear in the narrow column and other parts of the site (like repetitive short versions of documents and such). They are "snippets" or "partials". Parts of HTML code (ok, you got me... it's HAML), that can be static or dynamic. Like in [Rails](http://rubyonrails.org), they have an underscore at the beginning of the filename. While this may be a convention in rails, it's hard coded here. For now.
+      
+      
+    Content, oh, wonderful content
+    ------------------------------
+      
+    Content resides in - you have probably guessed it - in the **./content** directory.
+    
+    Have a look at the content, the directories and filenames. They map directly to URLs. That way you are free to name your directory structure (and therefore site structure) arbitrarily. Naming directories **./content/categories** or **./content/blog** is arbitrary. We could name them **./content/foo** or **./content/bar** and it would make no difference, only your URLs would be quite daft.
+    
+    The content files are written in [YAML](http://www.yaml.org). Currently soxer requires a yaml file to have a **content:** and content is formated in HAML. This is hard coded at the moment, but might be configurable in the future.
+  
+    
+    What now?
+    ---------
+    
+    Well, play with the source of this blog, find bugs, send me fixes and visit <http://soxer.mutsu.org> for more information.

data/lib/soxer/skel/blog/content/blog.atom.yaml

@@ -0,0 +1,29 @@
+uuid: 4198d730-dcb4-012d-f731-001e378a2988
+date: 2010-11-28T01:27:03+01:00
+class: [index]
+author:
+  name: Toni Anzlovar
+title: The blog Atom feed
+summary:
+content: |
+  -#---------------------------------------------------------------[controller]
+  :ruby
+    all = categories = Dir.glob( File.join( settings.origin, 'categories/*' ) )
+    categories.map!{|c| c.split('/').last.split('.').first }.delete 'index'
+    
+    documents = get_list do |d| 
+      #if params['category'] and categories.include? params['category']
+      #  d if d['category'] and d['category'].include? params['category']
+      #end
+      
+      if d['category'] and d['category'].include? params['category']
+        d
+      elsif d['category'] and !params['category']
+        d
+      end
+    end.sort{|a,b| a['date']<=>b['date'] }.reverse
+  -#---------------------------------------------------------------------[view]
+  -documents.each do |doc|
+    =atom doc
+  
+  =params['category']

data/lib/soxer/skel/blog/content/categories/index.yaml

@@ -0,0 +1,51 @@
+uuid: 4198f780-dcb4-012d-f732-001e378a2988
+date: 2010-11-24T23:48:55+01:00
+class: [aggregate]
+title: Blog
+summary: |
+  There are many things on this planet, but blogs are obviously one of the most important ones. If they weren't, we'd all be solving the nuclear crisis, feeding the poor, or exploring the unknown reaches of our planet.
+content: |
+  -#---------------------------------------------------------------[controller]
+  :ruby
+    # We create an array of categories from names of files in this
+    # directory. These are simple soft links to this index file.
+    # We exclude the index, as it's not category at all.
+    all = categories = Dir.glob( File.join( settings.origin, 'categories/*' ) )
+    categories.map!{|c| c.split('/').last.split('.').first }.delete 'index'
+    
+    # now we check if URL's last word coresponds to any of the categories found.
+    # If it does, the we set categories to that category, otherwise, all
+    # categories, found previously are used.
+    category = params[:splat].first.split('/').last
+    categories = [category] if categories.include? category
+    
+    # We now filter out the documents, that do not have the category or have
+    # a wrong set of categories.
+    # We sort the set of documents
+    documents = get_list do |doc|
+      doc if doc['category'] and (doc['category'] & categories).length > 0
+    end.sort{|a,b| b['date']<=>a['date'] }
+    
+    # This just ads the category name to the end of UUID for this file.
+    # not very nice, but better, than having all categories share one UUID.
+    page['uuid'] += '-'+categories[0] if categories.length == 1
+    
+    # Ok, we need to slightly alter the title of the page, so we know what are
+    # we watching.
+    title_addition = category.capitalize
+  -#---------------------------------------------------------------------[view]
+  %h1= page['title'] + ' - ' + title_addition
+  .summary
+    %p= page['summary']
+  
+  %h2 Topics covered
+  %ul
+    %li= link_to 'All topics combined', '/categories'
+    -all.each do |category|
+      %li
+        = link_to category.capitalize, '/categories/'+category
+        and the coresponding
+        = link_to 'atom feed', '/blog.atom?category='+category
+  
+  -documents.each do |doc|
+    =partial :doc_short, :locals => { :doc => doc }

data/lib/soxer/skel/blog/content/index.yaml

@@ -0,0 +1,32 @@
+uuid: 4cc0a810-d9d9-012d-f718-001e378a2988
+date: 2010-11-24T00:08:19+01:00
+class: [index]
+title: Simple, elegant, fast, flexible
+summary: |
+  %p Fully themable, featherweight blog using #{link_to 'Soxer', 'http://soxer.mutsu.org'} and #{link_to 'Sinatra', 'http://www.sinatrarb.com'}.
+content: |
+  -#---------------------------------------------------------------[controller]
+  :ruby
+    documents = get_list do |d| 
+      d if d['category']
+    end.sort{|a,b| a['date']<=>b['date'] }.reverse
+  -#---------------------------------------------------------------------[view]
+  %h1= page['title']
+  .summary= haml page['summary']
+  
+  %p You are welcome to explore the code, adapt it to your needs and use it. A couple of stylesheets have been included which should provide a base to develop your own beautiful CSS themes. They written in SASS, showcasing the awsome power of dynamic css generation.
+  
+  %h2 Available themes
+  %ul.themelist
+    %li= link_to 'Blossom brush', '?theme=blossom'
+    %li= link_to 'DNA brush', '?theme=dna'
+    -#%li= link_to 'Trashed', '?theme=trashed'
+  
+  -documents.each do |doc|
+    .short
+      %small= doc['date']
+      %h2
+        %a{ :href => doc['url'] }
+          = doc['title']
+      %p= doc['summary']
+  

data/lib/soxer/skel/blog/views/_block_about.haml

@@ -0,0 +1,6 @@
+.block
+  %h2 About
+  .content
+    %h3 Soxer
+    %p The simplest and most flexible web publishing solution on the planet.
+    %p This is my first generic blog. You are welcome to poke around my source.

data/lib/soxer/skel/blog/views/_block_categories.haml

@@ -0,0 +1,12 @@
+-#-----------------------------------------------------------------[controller]
+:ruby
+  categories = Dir.glob( File.join( settings.origin, 'categories/*' ) )
+  categories.map!{|c| c.split('/').last.split('.').first }.delete 'index'
+-#-----------------------------------------------------------------------[view]
+.block
+  %h2 Categories
+  .content
+    %ul
+      %li= link_to 'All categories combined', '/categories'
+      -categories.each do |category|
+        %li= link_to category.capitalize, '/categories/'+category

data/lib/soxer/skel/blog/views/_block_history.haml

@@ -0,0 +1,23 @@
+-#-----------------------------------------------------------------[controller]
+:ruby
+  history ||= {}
+  
+  documents = get_list {|d| d if d['category'] }.sort{|b,a| a['date']<=>b['date'] }
+  documents.each do |d|
+    y, m = d['date'].year, d['date'].month
+    history[y] ||= {}
+    history[y][m] ||= [] 
+    history[y][m] << d['url']
+  end
+-#-----------------------------------------------------------------------[view]
+.block
+  %h2 History
+  .content
+    h4 This block is currently not working properly.
+    %ul
+      -history.each_pair do |y,m|
+        -m.each_pair do |mm,dd|
+          %li
+            %b #{y}
+            #{link_to Date::MONTHNAMES[mm], '#'}
+            %i (#{dd.count})

data/lib/soxer/skel/blog/views/_block_recent.haml

@@ -0,0 +1,16 @@
+-#-----------------------------------------------------------------[controller]
+:ruby
+  documents = get_list do |d| 
+    d if d['category']
+  end.sort{|a,b| b['date']<=>a['date'] }[0..4]
+-#-----------------------------------------------------------------------[view]
+.block.recent-entries
+  %h2 Recent blog entries
+  .content
+    %ul
+      -documents.each do |doc|
+        %li
+          .date 
+            %small= doc['date']
+          %a{:href=>doc['url']}= doc['title']
+      

data/lib/soxer/skel/blog/views/_doc_docinfo.haml

@@ -0,0 +1,6 @@
+.docinfo
+  Published:
+  = page['date']
+  -page['category'].each do |cat|
+    |
+    =link_to cat, '/categories/'+cat

data/lib/soxer/skel/blog/views/_doc_short.haml

@@ -0,0 +1,10 @@
+.short
+  %small
+    = doc['date']
+    -doc['category'].each do |cat|
+      |
+      =link_to cat, '/categories/'+cat
+  %h2
+    %a{ :href => doc['url'] }
+      = doc['title']
+  %p= doc['summary']

data/lib/soxer/skel/blog/views/css/blossom/css.sass

@@ -0,0 +1,155 @@
+/*
+  -----------------------------------------------------------------------------
+  Blossom Brush Blog Theme for Soxer | http://soxer.mutsu.org
+  Copyright 2010 Toni Anzlovar, toni[at]formalibre.si
+  Attribution-ShareAlike 3.0 | http://creativecommons.org/licenses/by-sa/3.0/
+  -----------------------------------------------------------------------------
+@import "../common"
+
+
+// COLORS
+//-----------------------------------------------------------------------------
+$white: #ffffff
+$link: #ff5555
+$important: #ff5555
+$grey: #808080
+$lite: #dadada
+$normal: #4d4d4d
+
+// GENERAL
+//-----------------------------------------------------------------------------
+body
+  color: $normal
+  font:
+    size: 13px
+    family: "Trebuchet MS", Verdana, Arial, Helvetica, Swiss, Sans-Serif
+  margin: 0
+  padding: 0
+  
+a
+  color: $important
+  text-decoration: none
+  @include corners(3)
+  
+  &:hover
+    color: $white
+    background: $important
+    padding: 0px 3px
+    margin: -0px -3px
+
+h1, h2, h3, h4, h5, h6
+  +n
+
+h1, h2
+  color: $grey
+  font:
+    family: GeoSans
+    weight: normal
+h1
+  font-size: 38px
+  margin:
+    bottom: 30px
+
+h2
+  font-size: 28px
+  a
+    @include corners(7)
+    &:hover
+      @include corners(0)
+      +n
+      color: $important
+      background: none
+      border-bottom: 1px solid $important
+
+hr
+  display: none
+
+// COMMON
+//-----------------------------------------------------------------------------
+body
+  background: url(/css/blossom/blossom.jpg) center top no-repeat
+  // @include sh(inset 0px 0px 200px rgba(0, 0, 0, .25))
+  
+#header, #content
+  width: 750px
+  +center
+
+#header
+  height: 260px
+  color: $white
+  text-shadow: black 1px 1px 5px
+  .slogan
+    font:
+      family: GeoSans
+      size: 42px
+    
+    padding-top: 10px
+      
+#content
+  padding-top: 20px
+  &:after
+    +clear
+
+#footer
+  width: 100%
+  background: $lite
+  border-top: 1px solid $grey
+  margin-top: 30px
+  @include sh(inset 0px 0px 100px rgba(0, 0, 0, .25))
+  
+  .content
+    width: 750px
+    height: 180px
+    +center
+
+// MAIN & SIDEBAR
+//-----------------------------------------------------------------------------
+#main, #sidebar
+  float: left
+  min-height: 300px
+  
+#main
+  width: 450px
+  margin:
+    top: 10px
+    right: 14px
+
+  .short
+    margin-top: 30px
+    small
+      color: $grey
+      font:
+        style: italic
+        size: 13px
+    p
+      +n
+  .shot:after
+    +clear
+
+#sidebar
+  width: 286px
+  margin:
+    top: 19px
+
+
+// BLOCKS
+//-----------------------------------------------------------------------------
+.block
+  margin-bottom: 20px
+  ul
+    +cu
+    margin-top: 10px
+    li
+      display: block
+      clear: both
+      +cl
+      margin-bottom: 5px
+  &:after
+    +clear
+
+  &.recent-entries
+    small
+      font-style: italic
+    a
+      display: block
+      margin-left: 20px

data/lib/soxer/skel/blog/views/css/common.sass

@@ -0,0 +1,72 @@
+//
+  -----------------------------------------------------------------------------
+  Common theme presets for Soxer | http://soxer.mutsu.org
+  Copyright 2010 Toni Anzlovar, toni[at]formalibre.si
+  Attribution-ShareAlike 2.5 | http://creativecommons.org/licenses/by-sa/2.5/
+  -----------------------------------------------------------------------------
+
+// FONTS
+//-----------------------------------------------------------------------------
+@font-face
+  font-family: GeoSans
+  src: url(/fonts/GeosansLight.ttf)
+
+// SUGAR
+//-----------------------------------------------------------------------------
+// $h = horizontal position
+// $v = vertical position
+// $r = radius
+@mixin corner($h,$v,$r)
+  :-moz-border-radius-#{$h+$v} $r+px
+  :-webkit-border-#{$v+$h}-radius $r+px
+  :border-#{$v+$h}-radius $r+px
+
+@mixin corners($r)
+  :-moz-border-radius $r+px
+  :-webkit-border-radius $r+px
+  :border-radius $r+px
+
+// $x = horizontal offset
+// $y = vertical offset
+// $r = radius
+// $red = red component
+// $green = green component
+// $blue = blue component
+// $alpha = transparency (opacity)
+@mixin shaddow($x,$y,$r,$red,$green,$blue,$alpha)
+  :box-shadow #{$x}px #{$y}px #{$r}px rgba($red, $green, $blue, $alpha)
+  :-webkit-box-shadow #{$x}px #{$y}px #{$r}px rgba($red, $green, $blue, $alpha)
+  :-moz-box-shadow #{$x}px #{$y}px #{$r}px rgba($red, $green, $blue, $alpha)
+
+@mixin sh($sh)
+  :box-shadow $sh
+  :-webkit-box-shadow $sh
+  :-moz-box-shadow $sh
+
+=n
+  margin: 0 0 0 0
+  padding: 0 0 0 0
+
+=cu
+  +n
+  list-style: none
+
+=cl
+  float: left
+  +n
+  list-style: none
+  list-style-image: none
+  list-style-type: none
+
+
+=center
+  margin:
+    left: auto
+    right: auto
+
+=clear
+  content: "."
+  display: block
+  height: 0
+  clear: both
+  visibility: hidden

data/lib/soxer/skel/blog/views/css/dna/css.sass

@@ -0,0 +1,152 @@
+/*
+  -----------------------------------------------------------------------------
+  DNA Brush Blog Theme for Soxer | http://soxer.mutsu.org
+  Copyright 2010 Toni Anzlovar, toni[at]formalibre.si
+  Attribution-ShareAlike 3.0 | http://creativecommons.org/licenses/by-sa/3.0/
+  -----------------------------------------------------------------------------
+@import "../common"
+
+
+// COLORS
+//-----------------------------------------------------------------------------
+$white: #ffffff
+$link: #375d9d
+$important: #375d9d
+$grey: #808080
+$lite: #dadada
+$normal: #4d4d4d
+
+// GENERAL
+//-----------------------------------------------------------------------------
+body
+  color: $normal
+  font:
+    size: 13px
+    family: "Trebuchet MS", Verdana, Arial, Helvetica, Swiss, Sans-Serif
+  margin: 0
+  padding: 0
+    
+a
+  color: $important
+  text-decoration: none
+  @include corners(3)
+  
+  &:hover
+    color: $white
+    background: $important
+    padding: 0px 3px
+    margin: -0px -3px
+
+h1, h2, h3, h4, h5, h6
+  +n
+
+h1, h2
+  color: $grey
+  font:
+    family: GeoSans
+    weight: normal
+h1
+  font-size: 38px
+  margin:
+    bottom: 30px
+
+h2
+  font-size: 28px
+  a
+    @include corners(7)
+    &:hover
+      @include corners(0)
+      +n
+      color: $important
+      background: none
+      border-bottom: 1px solid $important
+
+hr
+  display: none
+
+// COMMON
+//-----------------------------------------------------------------------------
+body
+  background: url(/css/dna/sequence.jpg) center top no-repeat
+  // @include sh(inset 0px 0px 200px rgba(0, 0, 0, .25))
+  
+#header, #content
+  width: 750px
+  +center
+
+#header
+  height: 260px
+  color: $white
+  text-shadow: black 1px 1px 5px
+  .slogan
+    font:
+      family: GeoSans
+      size: 42px
+    
+    padding-top: 10px
+      
+#content
+  padding-top: 20px
+  &:after
+    +clear
+
+#footer
+  width: 100%
+  background: $lite
+  border-top: 1px solid $grey
+  margin-top: 30px
+  @include sh(inset 0px 0px 100px rgba(0, 0, 0, .25))
+  
+  .content
+    width: 750px
+    height: 180px
+    +center
+
+// MAIN & SIDEBAR
+//-----------------------------------------------------------------------------
+#main, #sidebar
+  float: left
+  min-height: 300px
+  
+#main
+  width: 464px
+  margin:
+    top: 10px
+    left: 286px
+
+  .short
+    margin-top: 30px
+    small
+      color: $grey
+      font:
+        style: italic
+        size: 13px
+    p
+      +n
+  .shot:after
+    +clear
+
+#sidebar
+  width: 272px
+  margin:
+    top: 19px
+    left: -750px
+
+// BLOCKS
+//-----------------------------------------------------------------------------
+.block
+  margin-bottom: 20px
+  ul
+    +cu
+    margin-top: 10px
+    li
+      display: block
+      clear: both
+      +cl
+      margin-bottom: 5px
+  &:after
+    +clear
+
+  &.recent-entries
+    a
+      display: block

data/lib/soxer/skel/blog/views/css/trashed/css.sass

@@ -0,0 +1,152 @@
+/*
+  -----------------------------------------------------------------------------
+  Trashed Blog Theme for Soxer | http://soxer.mutsu.org
+  Copyright 2010 Toni Anzlovar, toni[at]formalibre.si
+  Attribution-ShareAlike 3.0 | http://creativecommons.org/licenses/by-sa/3.0/
+  -----------------------------------------------------------------------------
+@import "../common"
+
+
+// COLORS
+//-----------------------------------------------------------------------------
+$white: #ffffff
+$link: #375d9d
+$important: #375d9d
+$grey: #808080
+$lite: #dadada
+$normal: #4d4d4d
+
+// GENERAL
+//-----------------------------------------------------------------------------
+body
+  color: $normal
+  font:
+    size: 13px
+    family: "Trebuchet MS", Verdana, Arial, Helvetica, Swiss, Sans-Serif
+  margin: 0
+  padding: 0
+    
+a
+  color: $important
+  text-decoration: none
+  @include corners(3)
+  
+  &:hover
+    color: $white
+    background: $important
+    padding: 0px 3px
+    margin: -0px -3px
+
+h1, h2, h3, h4, h5, h6
+  +n
+
+h1, h2
+  color: $grey
+  font:
+    family: GeoSans
+    weight: normal
+h1
+  font-size: 38px
+  margin:
+    bottom: 30px
+
+h2
+  font-size: 28px
+  a
+    @include corners(7)
+    &:hover
+      @include corners(0)
+      +n
+      color: $important
+      background: none
+      border-bottom: 1px solid $important
+
+hr
+  display: none
+
+// COMMON
+//-----------------------------------------------------------------------------
+body
+  background: url(/css/dna/sequence.jpg) center top no-repeat
+  // @include sh(inset 0px 0px 200px rgba(0, 0, 0, .25))
+  
+#header, #content
+  width: 750px
+  +center
+
+#header
+  height: 260px
+  color: $white
+  text-shadow: black 1px 1px 5px
+  .slogan
+    font:
+      family: GeoSans
+      size: 42px
+    
+    padding-top: 10px
+      
+#content
+  padding-top: 20px
+  &:after
+    +clear
+
+#footer
+  width: 100%
+  background: $lite
+  border-top: 1px solid $grey
+  margin-top: 30px
+  @include sh(inset 0px 0px 100px rgba(0, 0, 0, .25))
+  
+  .content
+    width: 750px
+    height: 180px
+    +center
+
+// MAIN & SIDEBAR
+//-----------------------------------------------------------------------------
+#main, #sidebar
+  float: left
+  min-height: 300px
+  
+#main
+  width: 464px
+  margin:
+    top: 10px
+    left: 286px
+
+  .short
+    margin-top: 30px
+    small
+      color: $grey
+      font:
+        style: italic
+        size: 13px
+    p
+      +n
+  .shot:after
+    +clear
+
+#sidebar
+  width: 272px
+  margin:
+    top: 19px
+    left: -750px
+
+// BLOCKS
+//-----------------------------------------------------------------------------
+.block
+  margin-bottom: 20px
+  ul
+    +cu
+    margin-top: 10px
+    li
+      display: block
+      clear: both
+      +cl
+      margin-bottom: 5px
+  &:after
+    +clear
+
+  &.recent-entries
+    a
+      display: block

data/lib/soxer/skel/blog/views/layout.haml

@@ -0,0 +1,37 @@
+!!! 5
+%html( lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" )
+  %head
+    %title= "Soxer demo blog: "+page['title']
+    %meta(charset="utf-8")
+    %link(href='/blog.atom' rel='alternate' title='News' type='application/atom+xml')
+    %link( href="/css/#{session[:theme]}/css.css" media="screen" rel="stylesheet" type="text/css" )
+  %body{:class => page['class']}
+    #header
+      .slogan Eternal search for perfection
+      .tagline Soxer, the web publishing tool
+      %hr.hidden
+    #content
+      = breadcrumb
+      #main
+        = yield
+        -if page['category']
+          = partial :doc_docinfo, :locals => { :page => page }
+        %hr.hidden
+      #sidebar
+        =partial :block_about
+        =partial :block_recent
+        =partial :block_categories
+        =partial :block_history
+    #footer
+      %hr.hidden
+      .content
+        :markdown
+          Copyright (C) 2010 Toni Anžlovar
+          
+          [Soxer](http://soxer.mutsu.org) is free software, released under [GPL V3](http://www.gnu.org/licenses/gpl.html).  
+          Stylesheets are subject to [Attribution-ShareAlike 3.0 Unported](http://creativecommons.org/licenses/by-sa/3.0/) license by [Creative Commons](http://creativecommons.org).  
+          
+          _Photo: DNA Sequence:_ Flavio Takemoto, <http://www.takemoto.com.br>  
+          _Photo: Cherry blossoms:_ David Hamel, <http://www.davehamel.com>
+          
+          If you like the concept and/or are using [Soxer](http://soxer.mutsu.org) for a project, please let me know: #{obfuscate 'toni@formalibre.si'}.

data/lib/soxer/skel/empty/SETUP.rb

@@ -0,0 +1,3 @@
+def initSkel dest
+  %w[bin log public].each {|d| Dir.mkdir "#{dest}/#{d}" unless Dir.exists? "#{dest}/#{d}" }
+end

data/soxer.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.7'
 
   s.name              = 'soxer'
-  s.version           = '0.9.9'
-  s.date              = '2011-03-03'
+  s.version           = '0.9.10'
+  s.date              = '2011-03-21'
   s.rubyforge_project = 'soxer'
 
   s.summary     = "Dynamic web site generator engine"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soxer
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Toni Anzlovar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +01:00
+date: 2011-03-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,10 +114,35 @@ files:
 - lib/soxer/views/google_analytics.haml
 - lib/soxer/views/google_ads.haml
 - lib/soxer/views/breadcrumb.haml
-- lib/soxer/skel/empty/bin/EMPTY
+- lib/soxer/skel/blog/content/index.yaml
+- lib/soxer/skel/blog/content/blog/2010-09-06-lorem_ipsum.yaml
+- lib/soxer/skel/blog/content/blog/2010-11-24-what_is_where.yaml
+- lib/soxer/skel/blog/content/blog/2010-10-12-how_to_spend_your_time_wisely.yaml
+- lib/soxer/skel/blog/content/blog/2010-04-16-ecce_quomdo_moritur_iustus.yaml
+- lib/soxer/skel/blog/content/blog/2009-06-02-meum_est_propositum.yaml
+- lib/soxer/skel/blog/content/blog.atom.yaml
+- lib/soxer/skel/blog/content/categories/index.yaml
+- lib/soxer/skel/blog/SETUP.rb
+- lib/soxer/skel/blog/public/css/dna/sequence.jpg
+- lib/soxer/skel/blog/public/css/blossom/blossom.jpg
+- lib/soxer/skel/blog/public/fonts/trashed.ttf
+- lib/soxer/skel/blog/public/fonts/GeosansLight.ttf
+- lib/soxer/skel/blog/config.yml
+- lib/soxer/skel/blog/config.ru
+- lib/soxer/skel/blog/views/_doc_short.haml
+- lib/soxer/skel/blog/views/layout.haml
+- lib/soxer/skel/blog/views/_block_history.haml
+- lib/soxer/skel/blog/views/css/common.sass
+- lib/soxer/skel/blog/views/css/trashed/css.sass
+- lib/soxer/skel/blog/views/css/dna/css.sass
+- lib/soxer/skel/blog/views/css/blossom/css.sass
+- lib/soxer/skel/blog/views/_block_categories.haml
+- lib/soxer/skel/blog/views/_block_about.haml
+- lib/soxer/skel/blog/views/_doc_docinfo.haml
+- lib/soxer/skel/blog/views/_block_recent.haml
+- lib/soxer/skel/blog/app.rb
 - lib/soxer/skel/empty/content/index.yaml
-- lib/soxer/skel/empty/log/EMPTY
-- lib/soxer/skel/empty/public/EMPTY
+- lib/soxer/skel/empty/SETUP.rb
 - lib/soxer/skel/empty/config.yml
 - lib/soxer/skel/empty/config.ru
 - lib/soxer/skel/empty/views/layout.haml