toto 0.1.3 → 0.1.4

data/README.md

@@ -30,8 +30,10 @@ synopsis
 --------
 
 One would start by forking or cloning the toto-skeleton repo, to get a basic skeleton:
-
-    $ git clone git://github.com/cloudhead/toto-skeleton.git
+    
+    $ mkdir weblog/
+    $ cd weblog/
+    $ git clone git://github.com/cloudhead/toto-skeleton.git .
 
 One would then edit the template at will, it has the following structure:
 
@@ -94,6 +96,11 @@ Toto was designed to work well with heroku:(http://heroku.com), it makes the mos
 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`.
 
+    $ heroku create
+    $ heroku rename weblog
+    $ git push heroku master
+    $ heroku open
+
 ### configuration
 
 You can configure toto, by modifying the _config.ru_ file. For example, if you want to set the blog author to 'John Galt',

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/test/test_helper.rb

@@ -7,13 +7,11 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'toto'
 
-module Riot
-  class Assertion
-    assertion(:includes) do |actual, expected|
-      actual.include?(expected) ? pass : fail("expected #{actual} to include #{expected}")
-    end
+module Toto
+  class IncludesHTMLMacro < Riot::AssertionMacro
+    register :includes_html
 
-    assertion(:includes_html) do |actual, expected|
+    def evaluate(actual, expected)
       doc = Hpricot.parse(actual)
       expected = expected.to_a.flatten
 
@@ -25,13 +23,21 @@ module Riot
         pass
       end
     end
+  end
+
+  class IncludesElementsMacro < Riot::AssertionMacro
+    register :includes_elements
 
-    assertion(:includes_elements) do |actual, selector, count|
+    def evaluate(actual, selector, count)
       doc = Hpricot.parse(actual)
       (doc/selector).size == count ? pass : fail("expected #{actual} to contain #{count} #{selector}(s)")
     end
+  end
+
+  class WithinMacro < Riot::AssertionMacro
+    register :within
 
-    assertion(:within) do |actual, expected|
+    def evaluate(actual, expected)
       expected.include?(actual) ? pass : fail("expected #{actual} to be within #{expected}")
     end
   end

data/toto.gemspec

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