toto 0.1.6 → 0.2.0

data/README.md

@@ -22,18 +22,19 @@ how it works
 - articles are processed through a markdown converter (rdiscount) by default.
 - templating is done through **ERB**.
 - toto is built right on top of **Rack**.
-- comments are handled by disqus:(http://disqus.com)
+- comments are handled by [disqus](http://disqus.com)
 - individual articles can be accessed through urls such as _/2009/11/21/blogging-with-toto_
 - the archives can be accessed by year, month or day, wih the same format as above.
+- arbitrary metadata can be included in articles files, and accessed from the templates.
 
 synopsis
 --------
 
-One would start by forking or cloning the toto-skeleton repo, to get a basic skeleton:
+One would start by forking or cloning the `dorothy` repo, to get a basic skeleton:
     
     $ mkdir weblog/
     $ cd weblog/
-    $ git clone git://github.com/cloudhead/toto-skeleton.git .
+    $ git clone git://github.com/cloudhead/dorothy.git .
 
 One would then edit the template at will, it has the following structure:
 
@@ -92,7 +93,7 @@ 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, 
+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`.
 
@@ -104,15 +105,15 @@ 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's the options hash with the defaults: 
-
-    :author   => ENV['USER'],                               # blog author 
-    :title    => Dir.pwd.split('/').last,                   # site title
-    :root     => "index",                                   # page to load on / 
-    :date     => lambda {|now| now.strftime("%d/%m/%Y") },  # date format for articles 
-    :markdown => :smart,                                    # use markdown + smart-mode 
-    :disqus   => false,                                     # disqus id, or false 
-    :summary  => 150,                                       # length of article summary 
-    :ext      => 'txt'                                      # file extension for articles 
+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 :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,   150                                       # length of article summary 
+    set :ext,       'txt'                                     # file extension for articles 
 
 Copyright (c) 2009 cloudhead. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/toto.rb

@@ -83,27 +83,25 @@ module Toto
 
       body, status = if Context.new.respond_to?(:"to_#{type}")
         if route.first =~ /\d{4}/
-          begin
-            case route.size
-              when 1..3
-                [Context.new(archives(route * '-'), @config).render(:archives, type), 200]
-              when 4
-                [Context.new(article(route), @config).render(:article, type), 200]
-              else http 400
-            end
-          rescue Errno::ENOENT => e
-            $stderr.puts e
-            http 404
+          case route.size
+            when 1..3
+              [Context.new(archives(route * '-'), @config).render(:archives, type), 200]
+            when 4
+              [Context.new(article(route), @config).render(:article, type), 200]
+            else http 400
           end
         elsif respond_to?(route = route.first.to_sym)
           [Context.new(send(route, type), @config).render(route, type), 200]
         else
-          http 401
+          [Context.new({}, @config).render(route.to_sym, type), 200]
         end
       else
         http 400
       end
 
+    rescue Errno::ENOENT => e
+      body, status = http 404
+    ensure
       return :body => body, :type => type, :status => status
     end
 

data/test/toto_test.rb

@@ -29,6 +29,12 @@ context Toto do
     end
   end
 
+  context "GET /about" do
+    setup { @toto.get('/about') }
+    asserts("returns a 200")                { topic.status }.equals 200
+    asserts("body is not empty")            { not topic.body.empty? }
+  end
+
   context "GET a single article" do
     setup { @toto.get("/1900/05/17/the-wonderful-wizard-of-oz") }
     asserts("returns a 200")                { topic.status }.equals 200
@@ -56,7 +62,7 @@ context Toto do
 
   context "GET to an unknown route" do
     setup { @toto.get('/unknown') }
-    should("returns a 401") { topic.status }.equals 401
+    should("returns a 404") { topic.status }.equals 404
   end
 
   context "Request is invalid" do

data/toto.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toto
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - cloudhead