fnando-kitabu 0.3.6 → 0.3.7

data/Rakefile

@@ -20,7 +20,7 @@ TXT
 	gem.bindir = "bin"
 	gem.executables = "kitabu"
 	
-	gem.add_dependency "discount"
+	gem.add_dependency "rdiscount"
   gem.add_dependency "hpricot"
   gem.add_dependency "unicode"
   gem.add_dependency "main"

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/kitabu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kitabu}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2009-08-03}
+  s.date = %q{2009-08-13}
   s.default_executable = %q{kitabu}
   s.description = %q{A framework for creating e-books from Markdown/Textile text markup using Ruby. 
 Using the Prince PDF generator, you'll be able to get high quality PDFs.
@@ -59,14 +59,14 @@ Using the Prince PDF generator, you'll be able to get high quality PDFs.
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<discount>, [">= 0"])
+      s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<unicode>, [">= 0"])
       s.add_runtime_dependency(%q<main>, [">= 0"])
       s.add_runtime_dependency(%q<ultraviolet>, [">= 0"])
       s.add_runtime_dependency(%q<colorize>, [">= 0"])
     else
-      s.add_dependency(%q<discount>, [">= 0"])
+      s.add_dependency(%q<rdiscount>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<unicode>, [">= 0"])
       s.add_dependency(%q<main>, [">= 0"])
@@ -74,7 +74,7 @@ Using the Prince PDF generator, you'll be able to get high quality PDFs.
       s.add_dependency(%q<colorize>, [">= 0"])
     end
   else
-    s.add_dependency(%q<discount>, [">= 0"])
+    s.add_dependency(%q<rdiscount>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<unicode>, [">= 0"])
     s.add_dependency(%q<main>, [">= 0"])

data/lib/kitabu.rb

@@ -19,5 +19,5 @@ rescue LoadError => e
 end
 
 module Kitabu
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/kitabu/base.rb

@@ -3,6 +3,7 @@ module Kitabu
     DEFAULT_LAYOUT = 'boom'
     DEFAULT_THEME = 'eiffel'
     DEFAULT_SYNTAX = 'plain_text'
+    DEFAULT_MARKDOWN_PROCESSOR = 'rdiscount'
     GEM_ROOT = File.expand_path(File.dirname(__FILE__) + "/../../")
     
     extend self
@@ -113,7 +114,7 @@ module Kitabu
             if markup_file =~ /\.textile$/
               markup = BlackCloth.new(markup_contents)
             else
-              markup = Discount.new(markup_contents)
+              markup = markdown_processor_class.new(markup_contents)
             end
           rescue Exception => e
             $stdout << "\nSkipping #{markup_file} (#{e.message})"
@@ -211,6 +212,23 @@ module Kitabu
       DEFAULT_LAYOUT
     end
     
+    def default_markdown_processor
+      DEFAULT_MARKDOWN_PROCESSOR
+    end
+    
+    def markdown_processor
+      config['markdown'] || default_markdown_processor
+    end
+    
+    def markdown_processor_class
+      case markdown_processor
+      when 'maruku' then Maruku
+      when 'bluecloth' then BlueCloth
+      when 'peg_markdown' then PEGMarkdown
+      else RDiscount
+      end
+    end
+    
     def syntaxes
       Uv.syntaxes
     end

data/lib/kitabu/tasks.rb

@@ -1,10 +1,10 @@
 require "kitabu"
 
 begin
-  require "discount"
+  require Kitabu::Base.markdown_processor.downcase
 rescue LoadError => e
-  puts  "\nDiscount gem not found. NO MARKDOWN for you.\n" +
-        "Install using `sudo gem install discount`.\n"
+  puts  "\n#{Kitabu::Base.markdown_processor} gem not found. NO MARKDOWN for you.\n" +
+        "Install using `sudo gem install #{Kitabu::Base.markdown_processor}`.\n"
 end
 
 require File.dirname(__FILE__) + "/redcloth"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-kitabu
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Nando Vieira
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-03 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: kitabu
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: discount
+  name: rdiscount
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement