toto 0.4.5 → 0.4.6

data/Rakefile

@@ -13,7 +13,11 @@ begin
     gem.add_development_dependency "riot"
     gem.add_dependency "builder"
     gem.add_dependency "rack"
-    gem.add_dependency "rdiscount"
+    if RUBY_PLATFORM =~ /win32/
+      gem.add_dependency "maruku"
+    else
+      gem.add_dependency "rdiscount"
+    end
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/TODO

@@ -1,5 +1,2 @@
 TODO
 ====
-
-- write tests for :error setting
-- write tests for :prefix setting

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/toto.rb

@@ -5,7 +5,13 @@ require 'rack'
 require 'digest'
 require 'open-uri'
 
-require 'rdiscount'
+if RUBY_PLATFORM =~ /win32/
+  require 'maruku'
+  Markdown = Maruku
+else
+  require 'rdiscount'
+end
+
 require 'builder'
 
 $:.unshift File.dirname(__FILE__)
@@ -265,7 +271,7 @@ module Toto
     end
 
     def path
-      @config[:prefix] + self[:date].strftime("/%Y/%m/%d/#{slug}/")
+      "/#{@config[:prefix]}#{self[:date].strftime("/%Y/%m/%d/#{slug}/")}".squeeze('/')
     end
 
     def title()   self[:title] || "an article"               end
@@ -311,11 +317,12 @@ module Toto
   end
 
   class Server
-    attr_reader :config
+    attr_reader :config, :site
 
     def initialize config = {}, &blk
       @config = config.is_a?(Config) ? config : Config.new(config)
       @config.instance_eval(&blk) if block_given?
+      @site = Toto::Site.new(@config)
     end
 
     def call env
@@ -327,7 +334,7 @@ module Toto
       path, mime = @request.path_info.split('.')
       route = (path || '/').split('/').reject {|i| i.empty? }
 
-      response = Toto::Site.new(@config).go(route, *(mime ? mime : []))
+      response = @site.go(route, *(mime ? mime : []))
 
       @response.body = [response[:body]]
       @response['Content-Length'] = response[:body].length.to_s unless response[:body].empty?
@@ -340,7 +347,7 @@ module Toto
         "no-cache, must-revalidate"
       end
 
-      @response['Etag'] = Digest::SHA1.hexdigest(response[:body])
+      @response['ETag'] = %("#{Digest::SHA1.hexdigest(response[:body])}")
 
       @response.status = response[:status]
       @response.finish

data/test/toto_test.rb

@@ -42,6 +42,8 @@ context Toto do
       asserts("content type is set properly") { topic.content_type }.equals "text/html"
       should("include a couple of article")   { topic.body }.includes_elements("#articles li", 3)
       should("include an archive")            { topic.body }.includes_elements("#archives li", 2)
+      asserts("Etag header present")          { topic.headers.include? "ETag" }
+      asserts("Etag header has a value")      { not topic.headers["ETag"].empty? }
     end
   end
 
@@ -78,9 +80,14 @@ context Toto do
     end
   end
 
-  context "GET to an unknown route" do
-    setup { @toto.get('/unknown') }
+  context "GET to an unknown route with a custom error" do
+    setup do
+      @config[:error] = lambda {|code| "error: #{code}" }
+      @toto.get('/unknown')
+    end
+
     should("returns a 404") { topic.status }.equals 404
+    should("return the custom error") { topic.body }.equals "error: 404"
   end
 
   context "Request is invalid" do
@@ -184,6 +191,47 @@ context Toto do
         should("create a valid summary") { topic.summary.size }.within 75..80
       end
     end
+
+    context "in a subdirectory" do
+      context "with implicit leading forward slash" do
+        setup do
+          conf = Toto::Config.new({})
+          conf.set(:prefix, "blog")
+          Toto::Article.new({
+            :title => "Toto & The Wizard of Oz.",
+            :body => "#Chapter I\nhello, *stranger*."
+          }, conf)
+        end
+
+        should("be in the directory") { topic.path }.equals Date.today.strftime("/blog/%Y/%m/%d/toto-and-the-wizard-of-oz/")
+      end
+
+      context "with explicit leading forward slash" do
+        setup do
+          conf = Toto::Config.new({})
+          conf.set(:prefix, "/blog")
+          Toto::Article.new({
+            :title => "Toto & The Wizard of Oz.",
+            :body => "#Chapter I\nhello, *stranger*."
+          }, conf)
+        end
+
+        should("be in the directory") { topic.path }.equals Date.today.strftime("/blog/%Y/%m/%d/toto-and-the-wizard-of-oz/")
+      end
+
+      context "with explicit trailing forward slash" do
+        setup do
+          conf = Toto::Config.new({})
+          conf.set(:prefix, "blog/")
+          Toto::Article.new({
+            :title => "Toto & The Wizard of Oz.",
+            :body => "#Chapter I\nhello, *stranger*."
+          }, conf)
+        end
+
+        should("be in the directory") { topic.path }.equals Date.today.strftime("/blog/%Y/%m/%d/toto-and-the-wizard-of-oz/")
+      end
+    end
   end
 
   context "using Config#set with a hash" do
@@ -207,8 +255,19 @@ context Toto do
     should("set the value to a proc") { topic[:to_html] }.respond_to :call
   end
 
-  context "extensions to the core Ruby library" do
+  context "testing individual configuration parameters" do
+    context "generate error pages" do
+      setup do
+        conf = Toto::Config.new({})
+        conf.set(:error) {|code| "error code #{code}" }
+        conf
+      end
+
+      should("create an error page") { topic[:error].call(400) }.equals "error code 400"
+    end
+  end
 
+  context "extensions to the core Ruby library" do
     should("respond to iso8601") { Date.today }.respond_to?(:iso8601)
   end
 end

data/toto.gemspec

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