toto 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/toto.rb

@@ -121,8 +121,10 @@ module Toto
       include Template
 
       def initialize ctx = {}, config = {}
-        @config = config
-        ctx.each {|k, v| meta_def(k) { v } }
+        @config, @ctx = config, ctx
+        ctx.each do |k, v|
+          meta_def(k) { ctx.instance_of?(Hash) ? v : ctx.send(k) }
+        end
       end
 
       def title
@@ -182,7 +184,6 @@ module Toto
       super
     end
 
-
     def slug
       self[:slug] ||
       self[:title].downcase.gsub(/&/, 'and').gsub(/\s+/, '-').gsub(/[^a-z0-9-]/, '')

data/test/articles/1900-05-17-the-wonderful-wizard-of-oz.txt

@@ -1,5 +1,5 @@
 title: The Wonderful Wizard of Oz
 date: 17/05/1900
 
-Once upon a time...
+_Once upon a time_...
 

data/test/toto_test.rb

@@ -5,7 +5,7 @@ AUTHOR = "toto"
 
 context Toto do
   setup do
-    @config = Toto::Config.new(:author => AUTHOR, :url => URL)
+    @config = Toto::Config.new(:markdown => true, :author => AUTHOR, :url => URL)
     @toto = Rack::MockRequest.new(Toto::Server.new(@config))
     Toto::Paths[:articles] = "test/articles"
     Toto::Paths[:pages] = "test/templates"
@@ -33,7 +33,7 @@ context Toto do
     setup { @toto.get("/1900/05/17/the-wonderful-wizard-of-oz") }
     asserts("returns a 200")                { topic.status }.equals 200
     asserts("content type is set properly") { topic.content_type }.equals "text/html"
-    should("contain the article")           { topic.body }.includes_html("p" => /Once upon a time/)
+    should("contain the article")           { topic.body }.includes_html("p" => /<em>Once upon a time<\/em>/)
   end
 
   context "GET to the archive" do

data/toto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-01-16}
+  s.date = %q{2010-01-17}
   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.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -05:00
+date: 2010-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency