slideshow 0.7.2 → 0.7.3

data/lib/slideshow.rb

@@ -1,20 +1,21 @@
-$KCODE="U"
+$KCODE = 'utf'
 
 require 'optparse'
 require 'erb'
 require 'redcloth'
-require 'maruku'
 require 'logger'
 require 'fileutils'
 require 'ftools'
-require 'hpricot'
-require 'uv'
 require 'pp'
 
+# todo: move code highlighting in (optional) plugin/extension
+# require 'hpricot'
+# require 'uv'
+
 
 module Slideshow
 
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 
 class Params 
   
@@ -169,6 +170,20 @@ class Gen
 
   KNOWN_TEXTILE_EXTNAMES  = [ '.textile', '.t' ]
   KNOWN_MARKDOWN_EXTNAMES = [ '.markdown', '.mark', '.m', '.txt', '.text' ]
+  
+  # note: only bluecloth is listed as a dependency in gem specs (because it's Ruby only and, thus, easy to install)
+  #  if you want to use other markdown libs install the required/desired lib e.g.
+  #  use  gem install rdiscount for rdiscount and so on
+  #
+  # also note for now the first present markdown library gets used
+  #  the search order is first come, first serve, that is: rdiscount, rpeg-markdown, maruku, bluecloth (fallback, always present)
+  KNOWN_MARKDOWN_LIBS = [
+    [ 'rdiscount',      lambda { |content| RDiscount.new( content ).to_html } ],
+    [ 'rpeg-markdown',  lambda { |content| PEGMarkdown.new( content ).to_html } ],
+    [ 'maruku',         lambda { |content| Maruku.new( content, {:on_error => :raise} ).to_html }  ],
+    [ 'bluecloth',      lambda { |content| BlueCloth.new( content ).to_html } ]
+  ] 
+  
   BUILTIN_MANIFESTS       = [ 'fullerscreen.txt', 'fullerscreen.txt.gen',
                               's5.txt','s5.txt.gen',
                               's6.txt','s6.txt.gen' ]
@@ -186,6 +201,28 @@ class Gen
   def opts
     @opts
   end
+  
+  def check_markdown_libs
+    # check for available markdown libs/gems
+    # try to require each lib and remove any not installed
+    @markdown_libs = []
+
+    KNOWN_MARKDOWN_LIBS.each do |lib|
+      begin
+        require lib[0]
+        @markdown_libs << lib
+      rescue LoadError => ex
+        logger.debug "Markdown library #{lib[0]} not found. Use gem install #{lib[0]} to install."
+      end
+    end
+
+    logger.debug "Installed Markdown libraries: #{@markdown_libs.map{ |lib| lib[0] }.join(', ')}"
+    logger.debug "Using Markdown library #{@markdown_libs.first[0]}."
+  end
+  
+  def markdown_to_html( content )
+    @markdown_libs.first[1].call( content )
+  end
 
   def cache_dir
     PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".slideshow")
@@ -382,7 +419,8 @@ class Gen
   # convert light-weight markup to hypertext
   
   if KNOWN_MARKDOWN_EXTNAMES.include?( extname )
-    content = Maruku.new( content, {:on_error => :raise} ).to_html
+    content = markdown_to_html( content )
+    # old code: content = Maruku.new( content, {:on_error => :raise} ).to_html
     # old code: content = BlueCloth.new( content ).to_html
   else
     # turn off hard line breaks
@@ -562,6 +600,8 @@ def run( args )
   if opts.generate?
     create_slideshow_templates
   else
+    check_markdown_libs
+    
     args.each { |fn| create_slideshow( fn ) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 +01:00
+date: 2009-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,34 +23,14 @@ dependencies:
         version: 4.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: BlueCloth
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.6"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ultraviolet
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.2
+        version: 1.0.0
     version: 
 description: 
 email: webslideshow@googlegroups.com