toto 0.1.2 → 0.1.3

data/README.md

@@ -19,6 +19,7 @@ how it works
 
 - content is entirely managed trough **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**.
 - toto is built right on top of **Rack**.
 - comments are handled by disqus:(http://disqus.com)
@@ -70,13 +71,14 @@ Once he finishes writing his beautiful tale, one can push to the git repo, as us
 
 Where `remote` is the name of your remote git repository. The article is now published.
 
-### server
+### deployment
 
 Toto is built on top of **Rack**, and hence has a **rackup** file: _config.ru_.
 
-#### on your own
+#### on your own server
 
-You can run toto with any Rack compliant web server, such as **thin**, **mongrel** or **unicorn**.
+Once you have created the remote git repo, and pushed your changes to it, you can run toto with any Rack compliant web server, 
+such as **thin**, **mongrel** or **unicorn**.
 
 With thin, you would do something like:
 
@@ -89,7 +91,8 @@ With unicorn, you can just do:
 #### on heroku
 
 Toto was designed to work well with heroku:(http://heroku.com), it makes the most out of it's state-of-the-art caching, 
-by setting the _Cache-Control_ and _Etag_ HTTP headers.
+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`.
 
 ### configuration
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/test/test_helper.rb

@@ -10,23 +10,29 @@ require 'toto'
 module Riot
   class Assertion
     assertion(:includes) do |actual, expected|
-      actual.include?(expected) || fail("expected #{actual} to include #{expected}")
+      actual.include?(expected) ? pass : fail("expected #{actual} to include #{expected}")
     end
 
     assertion(:includes_html) do |actual, expected|
       doc = Hpricot.parse(actual)
       expected = expected.to_a.flatten
-      !(doc/expected.first).empty? || fail("expected #{actual} to contain a <#{expected.first}>")
-      (doc/expected.first).inner_html.match(expected.last) || fail("expected <#{expected.first}> to contain #{expected.last}")
+
+      if (doc/expected.first).empty?
+        fail("expected #{actual} to contain a <#{expected.first}>")
+      elsif !(doc/expected.first).inner_html.match(expected.last)
+        fail("expected <#{expected.first}> to contain #{expected.last}")
+      else
+        pass
+      end
     end
 
     assertion(:includes_elements) do |actual, selector, count|
       doc = Hpricot.parse(actual)
-      (doc/selector).size == count || fail("expected #{actual} to contain #{count} #{selector}(s)")
+      (doc/selector).size == count ? pass : fail("expected #{actual} to contain #{count} #{selector}(s)")
     end
 
     assertion(:within) do |actual, expected|
-      expected.include?(actual) || fail("expected #{actual} to be within #{expected}")
+      expected.include?(actual) ? pass : fail("expected #{actual} to be within #{expected}")
     end
   end
 end

data/test/toto_test.rb

@@ -74,7 +74,7 @@ context Toto do
   context "creating an article" do
     setup do
       @config[:markdown] = true
-      @config[:date] = lambda {|t| "the time is #{t}" }
+      @config[:date] = lambda {|t| "the time is #{t.strftime("%Y/%m/%d %H:%M")}" }
       @config[:summary] = 50
     end
 
@@ -89,7 +89,7 @@ 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}"
+      should("set the date")               { topic.date }.equals "the time is #{Time.now.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/")

data/toto.gemspec

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