toto 0.4.4 → 0.4.5

data/README.md

@@ -58,7 +58,7 @@ synopsis
 
 One would start by installing _toto_, with `sudo gem install toto`, and then forking or
 cloning the `dorothy` repo, to get a basic skeleton:
-    
+
     $ git clone git://github.com/cloudhead/dorothy.git weblog
     $ cd weblog/
 
@@ -68,7 +68,7 @@ One would then edit the template at will, it has the following structure:
     |
     +- layout.rhtml      # the main site layout, shared by all pages
     |
-    +- feed.builder      # the builder template for the atom feed
+    +- index.builder     # the builder template for the atom feed
     |
     +- pages/            # pages, such as home, about, etc go here
        |
@@ -84,11 +84,11 @@ One could then create a .txt article file in the `articles/` folder, and make su
     author: Lyman Frank Baum
     date: 1900/05/17
 
-    Dorothy lived in the midst of the great Kansas prairies, with Uncle Henry, 
+    Dorothy lived in the midst of the great Kansas prairies, with Uncle Henry,
     who was a farmer, and Aunt Em, who was the farmer's wife.
-  
+
 If one is familiar with webby or aerial, this shouldn't look funny. Basically the top of the file is in YAML format,
-and the rest of it is the blog post. They are delimited by an empty line `/\n\n/`, as you can see above. 
+and the rest of it is the blog post. They are delimited by an empty line `/\n\n/`, as you can see above.
 None of the information is compulsory, but it's strongly encouraged you specify it.
 Note that one can also use `rake` to create an article stub, with `rake new`.
 
@@ -106,7 +106,7 @@ Toto is built on top of **Rack**, and hence has a **rackup** file: _config.ru_.
 
 #### on your own server
 
-Once you have created the remote git repo, and pushed your changes to it, you can run toto with any Rack compliant web server, 
+Once you have created the remote git repo, and pushed your changes to it, you can run toto with any Rack compliant web server,
 such as **thin**, **mongrel** or **unicorn**.
 
 With thin, you would do something like:
@@ -119,8 +119,8 @@ With unicorn, you can just do:
 
 #### on heroku
 
-Toto was designed to work well with [heroku](http://heroku.com), it makes the most out of it's state-of-the-art caching, 
-by setting the _Cache-Control_ and _Etag_ HTTP headers. Deploying on Heroku is really easy, just get the heroku gem, 
+Toto was designed to work well with [heroku](http://heroku.com), it makes the most out of it's state-of-the-art caching,
+by setting the _Cache-Control_ and _Etag_ HTTP headers. Deploying on Heroku is really easy, just get the heroku gem,
 create a heroku app with `heroku create`, and push with `git push heroku master`.
 
     $ heroku create weblog
@@ -130,20 +130,26 @@ create a heroku app with `heroku create`, and push with `git push heroku master`
 ### configuration
 
 You can configure toto, by modifying the _config.ru_ file. For example, if you want to set the blog author to 'John Galt',
-you could add `set :author, 'John Galt'` inside the `Toto::Server.new` block. Here are the defaults, to get you started: 
-
-    set :author,    ENV['USER']                               # blog author 
-    set :title,     Dir.pwd.split('/').last                   # site title
-    set :url,       'http://example.com'                      # site root URL
-    set :root,      "index"                                   # page to load on / 
-    set :date,      lambda {|now| now.strftime("%d/%m/%Y") }  # date format for articles 
-    set :markdown,  :smart                                    # use markdown + smart-mode 
-    set :disqus,    false                                     # disqus id, or false 
-    set :summary,   :max => 150, :delim => /~\n/              # length of article summary and delimiter 
-    set :ext,       'txt'                                     # file extension for articles 
-    set :cache,     28800                                     # cache site for 8 hours
-    set :to_html do |path, page, ctx|                         # returns an html, from a path & context
-        ERB.new(File.read("#{path}/#{page}.rhtml")).result(ctx)
+you could add `set :author, 'John Galt'` inside the `Toto::Server.new` block. Here are the defaults, to get you started:
+
+    set :author,      ENV['USER']                               # blog author
+    set :title,       Dir.pwd.split('/').last                   # site title
+    set :url,         'http://example.com'                      # site root URL
+    set :prefix,      ''                                        # common path prefix for all pages
+    set :root,        "index"                                   # page to load on /
+    set :date,        lambda {|now| now.strftime("%d/%m/%Y") }  # date format for articles
+    set :markdown,    :smart                                    # use markdown + smart-mode
+    set :disqus,      false                                     # disqus id, or false
+    set :summary,     :max => 150, :delim => /~\n/              # length of article summary and delimiter
+    set :ext,         'txt'                                     # file extension for articles
+    set :cache,       28800                                     # cache site for 8 hours
+
+    set :to_html   do |path, page, ctx|                         # returns an html, from a path & context
+      ERB.new(File.read("#{path}/#{page}.rhtml")).result(ctx)
+    end
+
+    set :error     do |code|                                    # The HTML for your error page
+      "<font style='font-size:300%'>toto, we're not in Kansas anymore (#{code})</font>"
     end
 
 thanks
@@ -153,4 +159,4 @@ To heroku for making this easy as pie.
 To adam wiggins, as I stole a couple of ideas from Scanty.
 To the developpers of Rack, for making such an awesome platform.
 
-Copyright (c) 2009 cloudhead. See LICENSE for details.
+Copyright (c) 2009-2010 cloudhead. See LICENSE for details.

data/TODO

@@ -0,0 +1,5 @@
+TODO
+====
+
+- write tests for :error setting
+- write tests for :prefix setting

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/toto.rb

@@ -128,7 +128,7 @@ module Toto
   protected
 
     def http code
-      return [@config[:error_page].call(code), code]
+      [@config[:error].call(code), code]
     end
 
     def articles
@@ -264,14 +264,15 @@ module Toto
       markdown self[:body].sub(@config[:summary][:delim], '') rescue markdown self[:body]
     end
 
+    def path
+      @config[:prefix] + self[:date].strftime("/%Y/%m/%d/#{slug}/")
+    end
+
     def title()   self[:title] || "an article"               end
     def date()    @config[:date].call(self[:date])           end
-    def path()    self[:date].strftime("/%Y/%m/%d/#{slug}/") end
     def author()  self[:author] || @config[:author]          end
     def to_html() self.load; super(:article, @config)        end
-
     alias :to_s to_html
-
   end
 
   class Config < Hash
@@ -279,7 +280,8 @@ module Toto
       :author => ENV['USER'],                               # blog author
       :title => Dir.pwd.split('/').last,                    # site title
       :root => "index",                                     # site index
-      :url => "http://127.0.0.1",
+      :url => "http://127.0.0.1",                           # root URL of the site
+      :prefix => "",                                        # common path prefix for the blog
       :date => lambda {|now| now.strftime("%d/%m/%Y") },    # date function
       :markdown => :smart,                                  # use markdown
       :disqus => false,                                     # disqus name
@@ -290,7 +292,7 @@ module Toto
       :to_html => lambda {|path, page, ctx|                 # returns an html, from a path & context
         ERB.new(File.read("#{path}/#{page}.rhtml")).result(ctx)
       },
-      :error_page => lambda {|code|                         # The HTML for your error page
+      :error => lambda {|code|                              # The HTML for your error page
         "<font style='font-size:300%'>toto, we're not in Kansas anymore (#{code})</font>"
       }
     }

data/toto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-04-02}
   s.description = %q{the tiniest blog-engine in Oz.}
   s.email = %q{self@cloudhead.net}
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.md",
      "Rakefile",
+     "TODO",
      "VERSION",
      "lib/ext/ext.rb",
      "lib/toto.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toto
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -04:00
+date: 2010-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - VERSION
 - lib/ext/ext.rb
 - lib/toto.rb