toto 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/toto.rb

@@ -66,17 +66,10 @@ module Toto
     end
 
     def index type = :html
-      case type
-        when :html
-          {:articles => self.articles.reverse.map do |article|
-              Article.new article, @config
-          end }.merge archives
-        when :xml, :json
-          return :articles => self.articles.map do |article|
-            Article.new article, @config
-          end
-        else return {}
-      end
+      articles = type == :html ? self.articles.reverse : self.articles
+      {:articles => articles.map do |article|
+        Article.new article, @config
+      end}.merge archives
     end
 
     def archives filter = ""
@@ -135,7 +128,7 @@ module Toto
   protected
 
     def http code
-      return ["<font style='font-size:300%'>toto, we're not in Kansas anymore (#{code})</font>", code]
+      return [@config[:error_page].call(code), code]
     end
 
     def articles
@@ -165,7 +158,8 @@ module Toto
       end
 
       def render page, type
-        type == :html ? to_html(:layout, @config, &Proc.new { to_html page, @config }) : send(:"to_#{type}", :feed)
+        content = to_html page, @config
+        type == :html ? to_html(:layout, @config, &Proc.new { content }) : send(:"to_#{type}", page)
       end
 
       def to_xml page
@@ -175,7 +169,7 @@ module Toto
       alias :to_atom to_xml
 
       def method_missing m, *args, &blk
-        @context.respond_to?(m) ? @context.send(m) : super
+        @context.respond_to?(m) ? @context.send(m, *args, &blk) : super
       end
     end
   end
@@ -295,6 +289,9 @@ module Toto
       :github => {:user => "", :repos => [], :ext => 'md'}, # Github username and list of repos
       :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
+        "<font style='font-size:300%'>toto, we're not in Kansas anymore (#{code})</font>"
       }
     }
     def initialize obj

data/test/templates/index.builder

@@ -0,0 +1,21 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  xml.title @config[:title]
+  xml.id @config[:url]
+  xml.updated articles.first[:date].iso8601 unless articles.empty?
+  xml.author { xml.name @config[:author] }
+
+  articles.each do |article|
+    xml.entry do
+      xml.title article.title
+      xml.link "rel" => "alternate", "href" => article.url
+      xml.id article.url
+      xml.published article[:date].iso8601
+      xml.updated article[:date].iso8601
+      xml.author { xml.name @config[:author] }
+      xml.summary article.summary, "type" => "html"
+      xml.content article.body, "type" => "html"
+    end
+  end
+end
+

data/toto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-03-17}
   s.description = %q{the tiniest blog-engine in Oz.}
   s.email = %q{self@cloudhead.net}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "test/templates/archives.rhtml",
      "test/templates/article.rhtml",
      "test/templates/feed.builder",
+     "test/templates/index.builder",
      "test/templates/index.rhtml",
      "test/templates/layout.rhtml",
      "test/templates/repo.rhtml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toto
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-03-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,7 @@ files:
 - test/templates/archives.rhtml
 - test/templates/article.rhtml
 - test/templates/feed.builder
+- test/templates/index.builder
 - test/templates/index.rhtml
 - test/templates/layout.rhtml
 - test/templates/repo.rhtml