toto-bongo 1.0.2 → 1.0.3

data/README.md

@@ -1,14 +1,15 @@
-toto bongo
+Toto bongo
 ====
 
+
 Minimal blog forked from toto to use for your existing app's. 
 This is very useful for SEO optimization
+See http://toto-bongo.heroku.com/
 
-
-introduction
+Introduction
 ------------
 
-toto-bongo is a git-powered, minimalist blog engine forked from toto. 
+Toto-bongo is a git-powered, minimalist blog engine forked from toto. 
 There is no toto client, and there probably will never be, everything goes through git.
 From the security stand point, this makes toto-bongo very secure. By
 reducing the attack surface( we don't handle any user input) we've made
@@ -18,92 +19,40 @@ to security vulnerabilities, toto-bongo has non of that.
 
 blog in your app in 10 seconds
 ------------------
-
-Toto-bongo was designed to be used with a reverse-proxy cache, such as [Varnish](http://varnish-cache.org).
-This makes it an ideal candidate for **[heroku](http://heroku.com)**.
-
 This is how to deploy in your existing app:
 
 1. git clone git@github.com:danpal/toto-bongo-blog.git
+
 2. Look at toto-bongo-blog Gemfile, add the following gems to your
    Gemfile.
+
+  - gem 'toto-bongo'
+
+  - gem 'RedCloth'
+
+  - gem 'haml'
+
+  - gem 'sass' #if you want to use the sass stylesheet
   
-  gem 'toto-bongo'
-  gem 'builder'
-  gem 'RedCloth'
-  gem 'haml'
   
-3. Toto-bongo runs on rack, you need to modify your existing config.ru
-we provide you with an already existing config.ru, take a look at
-toto-bongo-blog config.ru
-(note this file might be outdated here, look at the one in the
-toto-bongo-blog)
-<pre><code>
-    # This file is used by Rack-based servers to start the application.
-    require 'toto-bongo'
-    require ::File.expand_path('../config/environment', __FILE__)
-    
-    #point to your rails apps /public directory
-    use Rack::Static, :urls => ['/stylesheets', '/javascripts', '/images', '/favicon.ico'], :root => 'public'
-    
-    use Rack::ShowExceptions
-    use Rack::CommonLogger
+3. Replace the config.ru on your application to the one from toto-bongo-blog. Then modify accordingly.
     
-    #run the toto application
-    toto_bongo = TotoBongo::Server.new do
-    
-      #override the default location for the toto directories
-      TotoBongo::Paths = {
-        :templates => "blog/templates",
-        :pages => "blog/templates/pages",
-        :articles => "blog/articles"
-      }
-    
-      # set your config variables here
-      set :title, 'toto-bongo blog'
-      set :date, lambda {|now| now.strftime("%B #{now.day.ordinal} %Y") }
-      set :summary, :max => 500
-      set :root, 'index'
-      set :prefix, 'blog'
-    
-      if RAILS_ENV != 'production'
-        set :url, "http://localhost:3000/blog/"
-      else
-        set :url, "http://toto-bongo.heroku.com/blog/" #EDIT THIS TO ADD YOUR OWN URL
-      end
-    end
-    
-    #create a rack app
-    app = Rack::Builder.new do
-      use Rack::CommonLogger
-    
-      #map requests to /blog to toto
-      map '/blog' do
-        run toto_bongo
-      end
-    
-      #map all the other requests to rails
-      map '/' do
-        if Rails.version.to_f >= 3.0
-          ActionDispatch::Static
-          #run [ApplicationName]::Application
-          run TotoBongoBlog::Application #change for your application name
-        else # Rails 2
-          use Rails::Rack::Static
-          run ActionController::Dispatcher.new
-        end
-      end
-    end.to_app
-    
-</code></pre>
-
-Then make the following changes
-  1. Change :title
-  2. Run TotoBongoBlog::Application #change for your application name
+    Toto-bongo runs on rack, you need to modify your existing config.ru
+    we provide you with an already existing config.ru, take a look at toto-bongo-blog
+    config.ru
   
+  make the following changes
+    1. Change :title
+    2. Run TotoBongoBlog::Application #change for your application name
+
+
+4. Copy the blog directory into your application root folder.
 
+5. Copy the blog.sass stylesheet or blog.css from /public/stylesheets/sass/blog.sass or /public/stylesheets/sass/blog.css
+to your app stylesheets.
 
 
+You are done.
 
 
 how it works

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/toto-bongo.rb

@@ -4,7 +4,7 @@ require 'haml'
 require 'rack'
 require 'digest'
 require 'open-uri'
-require 'RedCloth'
+require 'rdiscount'
 require 'builder'
 require 'logger'
 $:.unshift File.dirname(__FILE__)
@@ -51,12 +51,12 @@ module TotoBongo
   if(ENV['TOTODEBUG'])
     @logger.level = Logger::DEBUG
   end
-  
+ 
   #
   # Handles all templating options
   # Is responsible for:
   # 1. Calling the Haml engine on pages to render them to html
-  # 2. Calling the Textile engine on textile text to render them to html
+  # 2. Calling the markdown engine on markdown text to render them to html
   # 3. Registering All the classes at initialization 
   #
   module Template
@@ -73,11 +73,17 @@ module TotoBongo
     end
 
     #
-    #Converst a textile text into html
+    #Converst a markdown text into html
     #
-    def textile text
-     TotoBongo::logger.debug("Called Template::Textile")
-     RedCloth.new(text.to_s.strip).to_html
+    def markdown text
+     TotoBongo::logger.debug("Called Template::Markdown")
+     if (options = @config[:markdown])
+        Markdown.new(text.to_s.strip, *(options.eql?(true) ? [] : options)).to_html
+      else
+        text.strip
+      end
+     
+     Markdown.new(text.to_s.strip).to_html
     end
 
     #
@@ -385,7 +391,7 @@ module TotoBongo
       else
         self[:body].match(/(.{1,#{length || config[:length] || config[:max]}}.*?)(\n|\Z)/m).to_s
       end
-      textile(sum.length == self[:body].length ? sum : sum.strip.sub(/\.\Z/, '…'))
+      markdown(sum.length == self[:body].length ? sum : sum.strip.sub(/\.\Z/, '…'))
     end
 
     def url
@@ -396,7 +402,7 @@ module TotoBongo
 
     def body
       TotoBongo::logger.debug("Article::body")
-      textile self[:body].sub(@config[:summary][:delim], '') rescue textile self[:body]
+      markdown self[:body].sub(@config[:summary][:delim], '') rescue markdown self[:body]
     end
     
     #Path returns a SEO friendly URL path
@@ -453,6 +459,7 @@ module TotoBongo
       :author => ENV['USER'],                               # blog author
       :title => Dir.pwd.split('/').last,                    # blog index title
       :description => "Blog for your existing rails app",   # blog meta description
+      :markdown => :smart,                                  # use markdown
       :keywords => "blog rails existing",                   # blog meta keywords
       :root => "index",                                     # site index
       :url => "http://127.0.0.1",                           # root URL of the site
@@ -470,9 +477,8 @@ module TotoBongo
       }
     }
 
-    
     def initialize obj
-    
+
       self.update Defaults
       self.update obj
     end
@@ -494,14 +500,13 @@ module TotoBongo
   # The HTTP server
   class Server
     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 = TotoBongo::Site.new(@config)
     end
 
-  
     #
     # This is the entry point of the request
     # On each request, this is the first method that gets

data/toto-bongo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toto-bongo}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Palacio"]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-06-07}
   s.description = %q{Minimal blog to use with your existing app}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Daniel Palacio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -05:00
+date: 2011-06-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency