toto 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/toto.rb

@@ -157,6 +157,7 @@ module Toto
 
     def initialize obj, config = {}
       @obj, @config = obj, config
+      self.load if obj.is_a? Hash
     end
 
     def load
@@ -169,7 +170,7 @@ module Toto
 
       self.taint
       self.update data
-      self[:date] = Time.parse(self[:date]) rescue Time.now
+      self[:date] = Time.parse(self[:date].gsub('/', '-')) rescue Time.now
       self
     end
 
@@ -208,8 +209,8 @@ module Toto
   private
 
     def markdown text
-      if (markdown = @config[:markdown])
-        Markdown.new(text.to_s.strip, *(markdown unless markdown.eql?(true))).to_html
+      if (options = @config[:markdown])
+        Markdown.new(text.to_s.strip, *(options.eql?(true) ? [] : options)).to_html
       else
         text.strip
       end
@@ -258,7 +259,7 @@ module Toto
       path, mime = @request.path_info.split('.')
       route = path.split('/').reject {|i| i.empty? }
 
-      response = Toto::Site.new(@config).go(route, *mime)
+      response = Toto::Site.new(@config).go(route, *(mime ? mime : []))
 
       @response.body = [response[:body]]
       @response['Content-Length'] = response[:body].length.to_s

data/test/test_helper.rb

@@ -1,5 +1,6 @@
-require 'riot'
+require 'rubygems'
 require 'hpricot'
+require 'riot'
 
 $:.unshift File.dirname(__FILE__)
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
@@ -7,24 +8,24 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'toto'
 
 module Riot
-  module AssertionMacros
-    def includes(expected)
+  class Assertion
+    assertion(:includes) do |actual, expected|
       actual.include?(expected) || fail("expected #{actual} to include #{expected}")
     end
 
-    def includes_html(expected)
+    assertion(:includes_html) do |actual, expected|
       doc = Hpricot.parse(actual)
-      expected = expected.flatten
+      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}")
     end
 
-    def includes_elements(selector, count)
+    assertion(:includes_elements) do |actual, selector, count|
       doc = Hpricot.parse(actual)
       (doc/selector).size == count || fail("expected #{actual} to contain #{count} #{selector}(s)")
     end
 
-    def within(expected)
+    assertion(:within) do |actual, expected|
       expected.include?(actual) || fail("expected #{actual} to be within #{expected}")
     end
   end

data/test/toto_test.rb

@@ -121,7 +121,7 @@ context Toto do
           Toto::Article.new({:body => "there ain't such thing as a free lunch\n" * 10}, @config)
         end
 
-        should("create a valid summary") { topic.summary.size }.within (75..80)
+        should("create a valid summary") { topic.summary.size }.within 75..80
       end
     end
   end

data/toto.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toto
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - cloudhead