toto 0.2.0 → 0.2.1

data/README.md

@@ -26,6 +26,8 @@ how it works
 - individual articles can be accessed through urls such as _/2009/11/21/blogging-with-toto_
 - the archives can be accessed by year, month or day, wih the same format as above.
 - arbitrary metadata can be included in articles files, and accessed from the templates.
+- summaries are generated intelligently by toto, following the `:max` setting you give it.
+- you can also define how long your summary is, by adding `~` at the end of it (`:delim`).
 
 synopsis
 --------
@@ -113,7 +115,7 @@ you could add `set :author, 'John Galt'` inside the `Toto::Server.new` block. He
     set :date,      lambda {|now| now.strftime("%d/%m/%Y") }  # date format for articles 
     set :markdown,  :smart                                    # use markdown + smart-mode 
     set :disqus,    false                                     # disqus id, or false 
-    set :summary,   150                                       # length of article summary 
+    set :summary,   :max => 150, :delim => /~\n/              # length of article summary and delimiter 
     set :ext,       'txt'                                     # file extension for articles 
 
 Copyright (c) 2009 cloudhead. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/toto.rb

@@ -187,8 +187,14 @@ module Toto
       self[:title].downcase.gsub(/&/, 'and').gsub(/\s+/, '-').gsub(/[^a-z0-9-]/, '')
     end
 
-    def summary length = @config[:summary]
-      markdown self[:body].match(/(.{1,#{length}}.*?)(\n|\Z)/m).to_s
+    def summary length = nil
+      length ||= (config = @config[:summary]).is_a?(Hash) ? config[:max] : config
+
+      if self[:body] =~ config[:delim]
+        markdown self[:body].split(config[:delim]).first
+      else
+        markdown self[:body].match(/(.{1,#{length}}.*?)(\n|\Z)/m).to_s
+      end
     end
 
     def url
@@ -228,7 +234,7 @@ module Toto
       :date => lambda {|now| now.strftime("%d/%m/%Y") },  # date function
       :markdown => :smart,                                # use markdown
       :disqus => false,                                   # disqus name
-      :summary => 150,                                    # length of summary
+      :summary => {:max => 150, :delim => /~\n/},         # length of summary and delimiter
       :ext => 'txt'                                       # extension for articles
     }
     def initialize obj

data/test/toto_test.rb

@@ -102,6 +102,17 @@ context Toto do
       should("have a url")                 { topic.url }.equals Time.now.strftime("#{URL}/%Y/%m/%d/toto-and-the-wizard-of-oz/")
     end
 
+    context "with a user-defined summary" do
+      setup do
+        Toto::Article.new({
+          :title => "Toto & The Wizard of Oz.",
+          :body => "Well,\nhello ~\n, *stranger*."
+        }, @config.merge(:markdown => false, :summary => {:max => 150, :delim => /~\n/}))
+      end
+
+      should("split the article at the delimiter") { topic.summary }.equals "Well,\nhello"
+    end
+
     context "with everything specified" do
       setup do
         Toto::Article.new({

data/toto.gemspec

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