toto 0.4.1 → 0.4.2

data/README.md

@@ -142,9 +142,9 @@ you could add `set :author, 'John Galt'` inside the `Toto::Server.new` block. He
     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,   lambda {|path, page, ctx|                 # returns an html, from a path & context
+    set :to_html do |path, page, ctx|                         # returns an html, from a path & context
         ERB.new(File.read("#{path}/#{page}.rhtml")).result(ctx)
-    }
+    end
 
 thanks
 ------

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/toto.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'time'
+require 'date'
 require 'erb'
 require 'rack'
 require 'digest'
@@ -143,7 +143,7 @@ module Toto
     end
 
     def self.articles ext
-      Dir["#{Paths[:articles]}/*.#{ext}"]
+      Dir["#{Paths[:articles]}/*.#{ext}"].sort_by {|entry| File.basename(entry) }
     end
 
     class Context
@@ -228,14 +228,17 @@ module Toto
     def load
       data = if @obj.is_a? String
         meta, self[:body] = File.read(@obj).split(/\n\n/, 2)
-        YAML.load(meta)
+
+        # use the date from the filename, or else toto won't find the article
+        @obj =~ /\/(\d{4}-\d{2}-\d{2})[^\/]*$/
+        ($1 ? {:date => $1} : {}).merge(YAML.load(meta))
       elsif @obj.is_a? Hash
         @obj
       end.inject({}) {|h, (k,v)| h.merge(k.to_sym => v) }
 
       self.taint
       self.update data
-      self[:date] = Time.parse(self[:date].gsub('/', '-')) rescue Time.now
+      self[:date] = Date.parse(self[:date].gsub('/', '-')) rescue Date.today
       self
     end
 

data/test/toto_test.rb

@@ -1,4 +1,5 @@
 require 'test/test_helper'
+require 'date'
 
 URL = "http://toto.oz"
 AUTHOR = "toto"
@@ -136,11 +137,11 @@ context Toto do
       should("have a title")               { topic.title }.equals "Toto & The Wizard of Oz."
       should("parse the body as markdown") { topic.body }.equals "<h1>Chapter I</h1>\n\n<p>hello, <em>stranger</em>.</p>\n"
       should("create an appropriate slug") { topic.slug }.equals "toto-and-the-wizard-of-oz"
-      should("set the date")               { topic.date }.equals "the time is #{Time.now.strftime("%Y/%m/%d %H:%M")}"
+      should("set the date")               { topic.date }.equals "the time is #{Date.today.strftime("%Y/%m/%d %H:%M")}"
       should("create a summary")           { topic.summary == topic.body }
       should("have an author")             { topic.author }.equals AUTHOR
-      should("have a path")                { topic.path }.equals Time.now.strftime("/%Y/%m/%d/toto-and-the-wizard-of-oz/")
-      should("have a url")                 { topic.url }.equals Time.now.strftime("#{URL}/%Y/%m/%d/toto-and-the-wizard-of-oz/")
+      should("have a path")                { topic.path }.equals Date.today.strftime("/%Y/%m/%d/toto-and-the-wizard-of-oz/")
+      should("have a url")                 { topic.url }.equals Date.today.strftime("#{URL}/%Y/%m/%d/toto-and-the-wizard-of-oz/")
     end
 
     context "with a user-defined summary" do

data/toto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-26}
   s.description = %q{the tiniest blog-engine in Oz.}
   s.email = %q{self@cloudhead.net}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toto
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-02-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency