slideshow 1.0.0 → 1.0.1

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec 'slideshow' do
   
   self.extra_deps = [
     ['RedCloth','>= 4.2.9'],
-    ['kramdown','>= 0.13.5']
+    ['markdown_select','>= 0.1.2']
   ]
   
   self.remote_rdoc_dir = 'doc'
@@ -21,4 +21,13 @@ Hoe.spec 'slideshow' do
   # switch extension to .rdoc for gihub formatting
   self.readme_file  = 'README.rdoc'
   self.history_file = 'History.rdoc'
-end
+  
+  self.post_install_message =<<EOS
+******************************************************************************
+
+Questions? Comments? Send them along to the mailing list.
+https://groups.google.com/group/webslideshow
+
+******************************************************************************
+EOS
+end

data/config/slideshow.builtin.yml

@@ -35,20 +35,4 @@ rest:
   extnames: [ .rst, .rest ]
     
 markdown:
-  extnames: [ .markdown, .m, .mark, .mkdn, .md, .txt, .text ]
-
-# note: only kramdown 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, kramdown (fallback, always present)
-
-  libs:
-    - pandoc-ruby
-    - rdiscount
-    - rpeg-markdown
-    - maruku
-    - bluecloth
-    - kramdown
-    
+  extnames: [ .markdown, .m, .mark, .mkdn, .md, .txt, .text ]

data/config/slideshow.yml

@@ -68,9 +68,7 @@ helper:
 filters: []
     
 textile:
-  extnames: []  
+  extnames: []
   
 markdown:
-  extnames: []
-  libs:     []
-  
+  extnames: []

data/lib/slideshow.rb

@@ -18,9 +18,8 @@ require 'yaml'
 require 'cgi'
 
 # required gems
-require 'redcloth'  # default textile library
-require 'kramdown'  # default markdown library
-
+require 'redcloth'          # default textile library
+require 'markdown_select'   # default markdown library 
 
 # our own code
 require 'slideshow/opts'
@@ -55,7 +54,7 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   # version string for generator meta tag (includes ruby version)
   def Slideshow.generator

data/lib/slideshow/config.rb

@@ -41,17 +41,6 @@ class Config
     end    
      
   end
-
-  def markdown_to_html_method( lib )    
-    method = @hash.fetch( 'user', {} ).fetch( lib, {} ).fetch( 'converter', nil )
-    
-    # use default name
-    if method.nil?
-      method = "#{lib.downcase}_to_html"
-    end
-    
-    method.tr('-','_').to_sym
-  end
   
   def markdown_post_processing?( lib )
     @hash.fetch( 'user', {} ).fetch( lib, {} ).fetch( 'post-processing', true )
@@ -76,16 +65,6 @@ class Config
     @hash[ 'markdown' ][ 'extnames' ] + @hash[ 'builtin' ][ 'markdown' ][ 'extnames' ]   
   end
   
-  def known_markdown_libs
-    # returns an array of known markdown engines e.g.
-    # [ pandoc-ruby, rdiscount, rpeg-markdown, maruku, bluecloth, kramdown ]
-    
-    libs      = @hash[ 'markdown' ][ 'libs' ] + @hash[ 'builtin' ][ 'markdown' ][ 'libs' ]
-    user_libs = @hash.fetch( 'user', {} ).fetch( 'markdown', {} ).fetch( 'libs', [] )
-    
-    user_libs + libs
-  end
-
   def known_extnames
     # ruby check: is it better self. ?? or more confusing
     #  possible conflict only with write access (e.g. prop=) 

data/lib/slideshow/filters/text_filter.rb

@@ -33,7 +33,7 @@ def directives_percent_style( content )
   # - pandoc uses % for its own markdown extension
   # - don't process % pass it along/through to pandoc
 
-  return content  if @markup_type == :markdown && @markdown_libs.first == 'pandoc-ruby'
+  return content  if @markup_type == :markdown && MarkdownSelect.lib == 'pandoc-ruby'
     
     
   directive_unparsed  = 0
@@ -101,7 +101,7 @@ def comments_percent_style( content )
   # skip filter for pandoc
   # - pandoc uses % for its own markdown extension
 
-  return content  if @markup_type == :markdown && @markdown_libs.first == 'pandoc-ruby'
+  return content  if @markup_type == :markdown && MarkdownSelect.lib == 'pandoc-ruby'
     
     # remove comments
     # % comments

data/lib/slideshow/gen.rb

@@ -171,7 +171,7 @@ class Gen
     
     # 1) add slide break  
   
-    if (@markup_type == :markdown && @markdown_libs.first == 'pandoc-ruby') || @markup_type == :rest
+    if (@markup_type == :markdown && MarkdownSelect.lib == 'pandoc-ruby') || @markup_type == :rest
       content = add_slide_directive_before_div_h1( content )
     else
       content = add_slide_directive_before_h1( content )
@@ -370,7 +370,7 @@ class Gen
   # make content2 and slide2 available to erb template
     # -- todo: cleanup variable names and use attr_readers for content and slide
   
-  if @markup_type == :markdown && config.markdown_post_processing?( @markdown_libs.first ) == false
+  if @markup_type == :markdown && config.markdown_post_processing?( MarkdownSelect.lib ) == false
     puts "  Skipping post-processing (passing content through as is)..."
     @content = content  # content all-in-one - make it available in erb templates
   else
@@ -503,7 +503,6 @@ def run( args )
   elsif opts.fetch?
     fetch_slideshow_templates
   else
-    load_markdown_libs
     load_plugins  # check for optional plugins/extension in ./lib folder
     
     args.each { |fn| create_slideshow( fn ) }

data/lib/slideshow/markup/markdown.rb

@@ -1,90 +1,14 @@
 module Slideshow
   module MarkdownEngines
 
-  def pandoc_ruby_to_html( content )
-    content = PandocRuby.new( content, :from => :markdown, :to => :html ).convert
-  end
-  
-  def pandoc_ruby_to_html_incremental( content )
-    content = PandocRuby.new( content, :from => :markdown, :to => :html ).convert
-    content = content.gsub(/<(ul|ol)/) do |match|
-      "#{Regexp.last_match(0)} class='step'"
-    end
-    content
-  end
-  
-  # sample how to use your own converter
-  # configure in slideshow.yml
-  # pandoc-ruby:
-  #  converter: pandoc-ruby-to-s5
-  
-  def pandoc_ruby_to_s5( content )
-    content = PandocRuby.new( content, {:from => :markdown, :to => :s5}, :smart ).convert
-    content = content.gsub(/class="incremental"/,'class="step"')
-    content = content.to_a[13..-1].join # remove the layout div
-  end
-
-  def pandoc_ruby_to_s5_incremental( content )
-    content = PandocRuby.new( content, {:from => :markdown, :to => :s5 }, :incremental, :smart ).convert
-    content = content.gsub(/class="incremental"/,'class="step"')
-    content = content.to_a[13..-1].join # remove the layout div
-  end
-    
-  def rdiscount_to_html( content )
-    RDiscount.new( content ).to_html
-  end
-  
-  def rpeg_markdown_to_html( content )
-    PEGMarkdown.new( content ).to_html
-  end
-  
-  def maruku_to_html( content )
-    Maruku.new( content, {:on_error => :raise} ).to_html
-  end
-  
-  def bluecloth_to_html( content )
-    BlueCloth.new( content ).to_html
-  end
-  
-  def kramdown_to_html( content )
-    Kramdown::Document.new( content ).to_html
-  end
-  
-  
-  ### code for managing multiple markdown libs
-  
-  def load_markdown_libs
-    # check for available markdown libs/gems
-    # try to require each lib and remove any not installed
-    @markdown_libs = []
-
-    config.known_markdown_libs.each do |lib|
-      begin
-        require lib
-        @markdown_libs << lib
-      rescue LoadError => ex
-        logger.debug "Markdown library #{lib} not found. Use gem install #{lib} to install."
-      end
-    end
-
-    puts "  Found #{@markdown_libs.length} Markdown libraries: #{@markdown_libs.join(', ')}"
-  end
- 
+  ## note: code move to its own gem, that is, markdown_select
+  ## see https://github.com/geraldb/markdown_select
   
   def markdown_to_html( content )
-    # call markdown filter; turn markdown lib name into method_name (mn)
-    # eg. rpeg-markdown =>  rpeg_markdown_to_html
-
-    # lets you use differnt options/converters for a single markdown lib
-    mn = config.markdown_to_html_method( @markdown_libs.first )    
-    
-    puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library '#{@markdown_libs.first}' calling '#{mn}'..."
+    ##  puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library '#{@markdown_libs.first}' calling '#{mn}'..."
     
-    send mn, content   # call 1st configured markdown engine e.g. kramdown_to_html( content )
+    MarkdownSelect.new( content ).to_html
   end
-  
-  
-  
 
 end   # module MarkdownEngines
 end # module Slideshow

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-04 00:00:00 +01:00
-default_executable: 
+date: 2012-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -35,35 +34,34 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: kramdown
+  name: markdown_select
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 31
         segments: 
         - 0
-        - 13
-        - 5
-        version: 0.13.5
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 19
         segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -72,14 +70,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 29
         segments: 
         - 2
-        - 6
-        - 1
-        version: 2.6.1
+        - 15
+        version: "2.15"
   type: :development
   version_requirements: *id004
 description: |-
@@ -93,7 +90,9 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- History.rdoc
 - Manifest.txt
+- README.rdoc
 - templates/s6.txt
 files: 
 - History.rdoc
@@ -140,11 +139,17 @@ files:
 - templates/slides.html.erb
 - templates/slides.pdf.html.erb
 - templates/style.css.erb
-has_rdoc: true
 homepage: http://slideshow.rubyforge.org
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  ******************************************************************************
+  
+  Questions? Comments? Send them along to the mailing list.
+  https://groups.google.com/group/webslideshow
+  
+  ******************************************************************************
+
 rdoc_options: 
 - --main
 - README.rdoc
@@ -171,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: slideshow
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Slide Show (S9) - A Free Web Alternative to PowerPoint and KeyNote in Ruby