toto 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/toto.rb

@@ -79,21 +79,21 @@ module Toto
 
     def go route, type = :html
       route << self./ if route.empty?
-      type = type.to_sym
+      type, path = type.to_sym, route.join('/')
 
       body, status = if Context.new.respond_to?(:"to_#{type}")
         if route.first =~ /\d{4}/
           case route.size
             when 1..3
-              [Context.new(archives(route * '-'), @config).render(:archives, type), 200]
+              [Context.new(archives(route * '-'), @config, path).render(:archives, type), 200]
             when 4
-              [Context.new(article(route), @config).render(:article, type), 200]
+              [Context.new(article(route), @config, path).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]
+          [Context.new(send(route, type), @config, path).render(route, type), 200]
         else
-          [Context.new({}, @config).render(route.to_sym, type), 200]
+          [Context.new({}, @config, path).render(route.to_sym, type), 200]
         end
       else
         http 400
@@ -118,8 +118,8 @@ module Toto
     class Context
       include Template
 
-      def initialize ctx = {}, config = {}
-        @config, @ctx = config, ctx
+      def initialize ctx = {}, config = {}, path = "/"
+        @config, @ctx, @path = config, ctx, path
         ctx.each do |k, v|
           meta_def(k) { ctx.instance_of?(Hash) ? v : ctx.send(k) }
         end
@@ -200,6 +200,7 @@ module Toto
     def url
       "http://#{(@config[:url].sub("http://", '') + self.path).squeeze('/')}"
     end
+    alias :permalink url
 
     def body
       markdown self[:body].sub(@config[:summary][:delim], '') rescue markdown self[:body]

data/test/templates/archives.rhtml

@@ -1,3 +1,4 @@
+<h1><%= @path %></h1>
 <% for entry in archives %>
   <li class="entry"><%= entry.title %></li>
 <% end %>

data/test/toto_test.rb

@@ -53,6 +53,7 @@ context Toto do
       setup { @toto.get('/2009/12') }
       asserts("returns a 200")                      { topic.status }.equals 200
       should("includes the entries for that month") { topic.body }.includes_elements("li.entry", 2)
+      should("includes the year & month")           { topic.body }.includes_html("h1" => /2009\/12/)
     end
 
     context "through /archive" do

data/toto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-01-18}
+  s.date = %q{2010-01-25}
   s.description = %q{the tiniest blog-engine in Oz.}
   s.email = %q{self@cloudhead.net}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "test/articles/2009-12-04-some-random-article.txt",
      "test/articles/2009-12-11-the-dichotomy-of-design.txt",
      "test/autotest.rb",
+     "test/templates/about.rhtml",
      "test/templates/archives.rhtml",
      "test/templates/article.rhtml",
      "test/templates/feed.builder",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toto
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -05:00
+date: 2010-01-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - test/articles/2009-12-04-some-random-article.txt
 - test/articles/2009-12-11-the-dichotomy-of-design.txt
 - test/autotest.rb
+- test/templates/about.rhtml
 - test/templates/archives.rhtml
 - test/templates/article.rhtml
 - test/templates/feed.builder