toto 0.2.7 → 0.2.8

data/README.md

@@ -9,6 +9,14 @@ introduction
 toto is a git-powered, minimalist blog engine for the hackers of Oz. The engine weights around ~300 sloc at its worse.
 There is no toto client, at least for now; everything goes through git.
 
+blog in 10 seconds
+------------------
+
+    $ git clone git://github.com/cloudhead/dorothy.git myblog
+    $ cd myblog
+    $ heroku create myblog
+    $ git push heroku master
+
 philosophy
 ----------
 
@@ -24,7 +32,7 @@ Oh, and everything that can be done with git, _is_.
 how it works
 ------------
 
-- content is entirely managed trough **git**; you get full fledged version control for free.
+- content is entirely managed through **git**; you get full fledged version control for free.
 - articles are stored as _.txt_ files, with embeded metadata (in yaml format).
 - articles are processed through a markdown converter (rdiscount) by default.
 - templating is done through **ERB**.
@@ -38,14 +46,21 @@ how it works
 - summaries are generated intelligently by toto, following the `:max` setting you give it.
 - you can also define how long your summary is, by adding `~` at the end of it (`:delim`).
 
+dorothy
+-------
+
+Dorothy is toto's default template, you can get it at <http://github.com/cloudhead/dorothy>. It
+comes with a very minimalistic but functional template, and a _config.ru_ file to get you started.
+It also includes a _.gems_ file, for heroku.
+
 synopsis
 --------
 
-One would start by forking or cloning the `dorothy` repo, to get a basic skeleton:
+One would start by installing _toto_, with `sudo gem install toto`, and then forking or
+cloning the `dorothy` repo, to get a basic skeleton:
     
-    $ mkdir weblog/
+    $ git clone git://github.com/cloudhead/dorothy.git weblog
     $ cd weblog/
-    $ git clone git://github.com/cloudhead/dorothy.git .
 
 One would then edit the template at will, it has the following structure:
 
@@ -108,8 +123,7 @@ Toto was designed to work well with [heroku](http://heroku.com), it makes the mo
 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
-    $ heroku rename weblog
+    $ heroku create weblog
     $ git push heroku master
     $ heroku open
 
@@ -120,12 +134,14 @@ you could add `set :author, 'John Galt'` inside the `Toto::Server.new` block. He
 
     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
 
 thanks
 ------

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/{ext.rb → ext/ext.rb}

@@ -6,6 +6,16 @@ class Object
   end
 end
 
+class String
+  def slugize
+    self.downcase.gsub(/&/, 'and').gsub(/\s+/, '-').gsub(/[^a-z0-9-]/, '')
+  end
+
+  def humanize
+    self.capitalize.gsub(/[-_]+/, ' ')
+  end
+end
+
 class Fixnum
   def ordinal
     # 1 => 1st

data/lib/toto.rb

@@ -9,7 +9,7 @@ require 'builder'
 
 $:.unshift File.dirname(__FILE__)
 
-require 'ext'
+require 'ext/ext'
 
 module Toto
   Paths = {
@@ -18,6 +18,14 @@ module Toto
     :articles => "articles"
   }
 
+  def self.env
+    ENV['RACK_ENV'] || 'production'
+  end
+
+  def self.env= env
+    ENV['RACK_ENV'] = env
+  end
+
   module Template
     def to_html page, &blk
       path = (page == :layout ? Paths[:templates] : Paths[:pages])
@@ -58,10 +66,10 @@ module Toto
       end
     end
 
-    def archives filter = //
+    def archives filter = ""
       entries = ! self.articles.empty??
         self.articles.select do |a|
-          File.basename(a) =~ /^#{filter}/
+          filter !~ /^\d{4}/ || File.basename(a) =~ /^#{filter}/
         end.reverse.map do |article|
           Article.new File.new(article), @config
         end : []
@@ -85,24 +93,24 @@ module Toto
         if route.first =~ /\d{4}/
           case route.size
             when 1..3
-              [Context.new(archives(route * '-'), @config, path).render(:archives, type), 200]
+              Context.new(archives(route * '-'), @config, path).render(:archives, type)
             when 4
-              [Context.new(article(route), @config, path).render(:article, type), 200]
+              Context.new(article(route), @config, path).render(:article, type)
             else http 400
           end
         elsif respond_to?(route = route.first.to_sym)
-          [Context.new(send(route, type), @config, path).render(route, type), 200]
+          Context.new(send(route, type), @config, path).render(route, type)
         else
-          [Context.new({}, @config, path).render(route.to_sym, type), 200]
+          Context.new({}, @config, path).render(route.to_sym, type)
         end
       else
         http 400
       end
 
     rescue Errno::ENOENT => e
-      body, status = http 404
-    ensure
-      return :body => body, :type => type, :status => status
+      return :body => http(404).first, :type => :html, :status => 404
+    else
+      return :body => body || "", :type => type, :status => status || 200
     end
 
   protected
@@ -195,17 +203,15 @@ module Toto
     end
 
     def slug
-      self[:slug] ||
-      self[:title].downcase.gsub(/&/, 'and').gsub(/\s+/, '-').gsub(/[^a-z0-9-]/, '')
+      self[:slug] || self[:title].slugize
     end
 
     def summary length = nil
-      length ||= (config = @config[:summary]).is_a?(Hash) ? config[:max] : config
-
+      config = @config[:summary]
       sum = if self[:body] =~ config[:delim]
         self[:body].split(config[:delim]).first
       else
-        self[:body].match(/(.{1,#{length}}.*?)(\n|\Z)/m).to_s
+        self[:body].match(/(.{1,#{length || config[:length]}}.*?)(\n|\Z)/m).to_s
       end
       markdown(sum.length == self[:body].length ? sum : sum.strip.sub(/\.\Z/, '…'))
     end
@@ -252,7 +258,8 @@ module Toto
       :markdown => :smart,                                # use markdown
       :disqus => false,                                   # disqus name
       :summary => {:max => 150, :delim => /~\n/},         # length of summary and delimiter
-      :ext => 'txt'                                       # extension for articles
+      :ext => 'txt',                                      # extension for articles
+      :cache => 28800                                     # cache duration (seconds)
     }
     def initialize obj
       self.update Defaults
@@ -287,11 +294,16 @@ module Toto
       response = Toto::Site.new(@config).go(route, *(mime ? mime : []))
 
       @response.body = [response[:body]]
-      @response['Content-Length'] = response[:body].length.to_s
+      @response['Content-Length'] = response[:body].length.to_s unless response[:body].empty?
       @response['Content-Type']   = Rack::Mime.mime_type(".#{response[:type]}")
 
-      # Cache for one day
-      @response['Cache-Control'] = "public, max-age=86400"
+      # Set http cache headers
+      @response['Cache-Control'] = if Toto.env == 'production'
+        "public, max-age=#{@config[:cache]}"
+      else
+        "no-cache, must-revalidate"
+      end
+
       @response['Etag'] = Digest::SHA1.hexdigest(response[:body])
 
       @response.status = response[:status]

data/test/toto_test.rb

@@ -83,7 +83,7 @@ context Toto do
     setup do
       @config[:markdown] = true
       @config[:date] = lambda {|t| "the time is #{t.strftime("%Y/%m/%d %H:%M")}" }
-      @config[:summary] = 50
+      @config[:summary] = {:length => 50}
     end
 
     context "with the bare essentials" do

data/toto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-02-06}
   s.description = %q{the tiniest blog-engine in Oz.}
   s.email = %q{self@cloudhead.net}
   s.extra_rdoc_files = [
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
-     "lib/ext.rb",
+     "lib/ext/ext.rb",
      "lib/toto.rb",
      "test/articles/1900-05-17-the-wonderful-wizard-of-oz.txt",
      "test/articles/2001-01-01-two-thousand-and-one.txt",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toto
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -05:00
+date: 2010-02-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- lib/ext.rb
+- lib/ext/ext.rb
 - lib/toto.rb
 - test/articles/1900-05-17-the-wonderful-wizard-of-oz.txt
 - test/articles/2001-01-01-two-thousand-and-one.txt