markdown 1.2.0 → 1.2.1

data/lib/markdown/engines/maruku.rb

@@ -1,17 +1,17 @@
-# encoding: utf-8
-
-module Markdown
-  module Engine
-
-    def maruku_version
-      Maruku::VERSION
-    end
-
-    def maruku_to_html( content, options={} )
-      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library maruku..."
-            
-      Maruku.new( content, {:on_error => :raise} ).to_html
-    end
-
-  end # module Engine
+# encoding: utf-8
+
+module Markdown
+  module Engine
+
+    def maruku_version
+      Maruku::VERSION
+    end
+
+    def maruku_to_html( content, options={} )
+      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library maruku..."
+            
+      Maruku.new( content, {:on_error => :raise} ).to_html
+    end
+
+  end # module Engine
 end # module Markdown

data/lib/markdown/engines/pandoc_ruby.rb

@@ -1,38 +1,38 @@
-# encoding: utf-8
-
-module Markdown
-  module Engine
-   
-    def pandoc_ruby_to_html( content, options={} )
-      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library pandoc_ruby..."
-
-      content = PandocRuby.new( content, :from => :markdown, :to => :html ).convert
-    end
-
-    def pandoc_ruby_to_html_incremental( content, options={} )
-      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 markdown.yml
-    # pandoc-ruby:
-    #  converter: pandoc-ruby-to-s5
-
-    def pandoc_ruby_to_s5( content, options={} )
-      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, options={} )
-      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
-    
-  end # module Engine
+# encoding: utf-8
+
+module Markdown
+  module Engine
+   
+    def pandoc_ruby_to_html( content, options={} )
+      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library pandoc_ruby..."
+
+      content = PandocRuby.new( content, :from => :markdown, :to => :html ).convert
+    end
+
+    def pandoc_ruby_to_html_incremental( content, options={} )
+      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 markdown.yml
+    # pandoc-ruby:
+    #  converter: pandoc-ruby-to-s5
+
+    def pandoc_ruby_to_s5( content, options={} )
+      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, options={} )
+      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
+    
+  end # module Engine
 end # module Markdown

data/lib/markdown/engines/rdiscount.rb

@@ -1,18 +1,18 @@
-# encoding: utf-8
-
-module Markdown
-  module Engine
-
-    def rdiscount_version
-      RDiscount::VERSION
-    end
-
-    def rdiscount_to_html( content, options={} )
-      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library rdiscount..."      
-      
-      RDiscount.new( content ).to_html
-    end
-
-
-  end # module Engine
+# encoding: utf-8
+
+module Markdown
+  module Engine
+
+    def rdiscount_version
+      RDiscount::VERSION
+    end
+
+    def rdiscount_to_html( content, options={} )
+      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library rdiscount..."      
+      
+      RDiscount.new( content ).to_html
+    end
+
+
+  end # module Engine
 end # module Markdown    

data/lib/markdown/engines/redcarpet.rb

@@ -1,56 +1,56 @@
-# encoding: utf-8
-
-module Markdown
-  module Engine
-
-    def redcarpet_version
-      Redcarpet::VERSION
-    end
-
-    def redcarpet_to_html( content, options={} )
-      
-      ## NB: uses redcarpet2
-      #
-      # see https://github.com/tanoku/redcarpet
-      
-      extensions_ary = options.fetch( 'extensions', [] )
-      show_banner = options.fetch( 'banner', true )
-
-      extensions_hash = {}
-      extensions_ary.each do |e|
-        extensions_hash[ e.to_sym ] = true
-      end
-
-      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library redcarpet (#{Redcarpet::VERSION}) w/ HTML render"
-      puts "  using extensions: #{extensions_ary.to_json}"
-      
-      redcarpet = Redcarpet::Markdown.new( Redcarpet::Render::HTML, extensions_hash )
-      content = redcarpet.render( content )
-
-      if show_banner
-        # todo: check content size and newlines
-        #  check banner option?
-        #  only add banner if some newlines and size > treshold?
-      
-      banner_begin =<<EOS
-<!-- === begin markdown block ===
-
-      generated by #{Markdown.banner}
-                on #{Time.now} with Markdown engine redcarpet (#{Redcarpet::VERSION}) w/ HTML render
-                  using extensions: #{extensions_ary.to_json}
-  -->
-EOS
-
-      banner_end =<<EOS
-<!-- === end markdown block === -->
-EOS
-
-        content = banner_begin + content + banner_end
-      end # if show_banner
-
-      content
-      
-    end
-
-  end # module Engine
-end # module Markdown
+# encoding: utf-8
+
+module Markdown
+  module Engine
+
+    def redcarpet_version
+      Redcarpet::VERSION
+    end
+
+    def redcarpet_to_html( content, options={} )
+      
+      ## NB: uses redcarpet2
+      #
+      # see https://github.com/tanoku/redcarpet
+      
+      extensions_ary = options.fetch( 'extensions', [] )
+      show_banner = options.fetch( 'banner', true )
+
+      extensions_hash = {}
+      extensions_ary.each do |e|
+        extensions_hash[ e.to_sym ] = true
+      end
+
+      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library redcarpet (#{Redcarpet::VERSION}) w/ HTML render"
+      puts "  using extensions: #{extensions_ary.to_json}"
+      
+      redcarpet = Redcarpet::Markdown.new( Redcarpet::Render::HTML, extensions_hash )
+      content = redcarpet.render( content )
+
+      if show_banner
+        # todo: check content size and newlines
+        #  check banner option?
+        #  only add banner if some newlines and size > treshold?
+      
+      banner_begin =<<EOS
+<!-- === begin markdown block ===
+
+      generated by #{Markdown.banner}
+                on #{Time.now} with Markdown engine redcarpet (#{Redcarpet::VERSION}) w/ HTML render
+                  using extensions: #{extensions_ary.to_json}
+  -->
+EOS
+
+      banner_end =<<EOS
+<!-- === end markdown block === -->
+EOS
+
+        content = banner_begin + content + banner_end
+      end # if show_banner
+
+      content
+      
+    end
+
+  end # module Engine
+end # module Markdown

data/lib/markdown/engines/rpeg_markdown.rb

@@ -1,13 +1,13 @@
-# encoding: utf-8
-
-module Markdown
-  module Engine
-
-    def rpeg_markdown_to_html( content, options={} )
-      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library rpeg_markdown..."
-
-      PEGMarkdown.new( content ).to_html
-    end
-
-  end # module Engine
-end # module Markdown
+# encoding: utf-8
+
+module Markdown
+  module Engine
+
+    def rpeg_markdown_to_html( content, options={} )
+      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library rpeg_markdown..."
+
+      PEGMarkdown.new( content ).to_html
+    end
+
+  end # module Engine
+end # module Markdown

data/lib/markdown/version.rb

@@ -4,21 +4,21 @@ module Markdown
 
   MAJOR = 1
   MINOR = 2
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
     VERSION
   end
 
-
+  
   # version string for generator meta tag (includes ruby version)
   def self.banner
-    "markdown/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "markdown/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+    File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )
   end
 
 end # module Markdown

data/lib/markdown/wrapper.rb

@@ -1,135 +1,135 @@
-# encoding: utf-8
-
-module Markdown
-
-  ## todo: use Converter  inside Wrapper to avoid duplication
-
-  class Converter
-    def initialize( lib, mn_to_html, mn_version )
-      @lib         = lib
-      @mn_to_html  = mn_to_html
-      @mn_version  = mn_version
-    end
-
-    def convert( text, options={} )
-      # call markdown filter; turn markdown lib name into method_name (mn)
-      # eg. rpeg-markdown =>  rpeg_markdown_to_html
-      send( @mn_to_html, text, options )  # call 1st configured markdown engine e.g. kramdown_to_html( content )
-    end
-    
-    def version
-      send( @mn_version )  # call 1st configured markdown engine e.g. kramdown_version
-    end
-
-    include Engine
-  end
-
-
-  class Wrapper
-
-    def initialize( lib, mn, content, options={} )
-      @lib      = lib
-      @mn       = mn
-      @content  = content
-      @options  = options
-    end
-
-    def to_html
-      # call markdown filter; turn markdown lib name into method_name (mn)
-      # eg. rpeg-markdown =>  rpeg_markdown_to_html
-      send( @mn, @content, @options )  # call 1st configured markdown engine e.g. kramdown_to_html( content )
-    end
-
-    include Engine
-
-  end # class Wrapper
-
-
-
-  @@config = nil
-
-  def self.lib=( lib )
-    if @@config.nil?
-      @@config = Config.new
-    end
-    @@config.markdown_lib = lib
-  end
-
-  def self.lib
-    if @@config.nil?
-      @@config = Config.new
-    end
-    @@config.markdown_lib
-  end
-
-  def self.libs
-    if @@config.nil?
-      @@config = Config.new
-    end
-    @@config.markdown_libs
-  end
-
-  def self.extnames
-    if @@config.nil?
-      @@config = Config.new
-    end
-    @@config.markdown_extnames
-  end
-
-  def self.filters
-    if @@config.nil?
-      @@config = Config.new
-    end
-    @@config.markdown_filters
-  end
-
-  def self.dump   # dump settings for debug/verbose flag
-    if @@config.nil?
-      @@config = Config.new
-    end
-    @@config.dump
-  end
-
-
-  def self.create_converter( lib )
-    if @@config.nil?
-      @@config = Config.new
-    end
-
-    mn_to_html  = @@config.markdown_to_html_method( lib ) # lets you use differnt options/converters for a single markdown lib   
-    mn_version  = @@config.markdown_version_method( lib )
-
-    Converter.new( lib, mn_to_html, mn_version )
-  end
-
-
-  def self.new( content, options={} )
-
-    ## options
-    ## make sure keys are strings, that is, allow symbols for easy use
-    ##  but internally only use string (yaml gets use strings)
-
-    ## fix: use stringify_keys! from activesupport (include dependency ?? why? why not??)
-    options.keys.each do |key|
-      options[ key.to_s ] = options.delete(key)
-    end
-
-
-    ## todo: allow options to pass in
-    ##   lets you change markdown engine/converter for every call
-    ##   e.g. lets you add config properties (as headers) to your document (for example)
-    
-    if @@config.nil?
-      @@config = Config.new
-    end
-
-    lib      = @@config.markdown_lib
-    mn       = @@config.markdown_to_html_method( lib ) # lets you use differnt options/converters for a single markdown lib   
-    defaults = @@config.markdown_lib_defaults( lib )  ## todo/fix: use mn / converter from defaults hash?? mn no longer needed??    
-
-    props = Props.new( options, 'USER', Props.new( defaults, 'SYSTEM' ))
-    
-    Wrapper.new( lib, mn, content, props )
-  end
-
-end # module Markdown
+# encoding: utf-8
+
+module Markdown
+
+  ## todo: use Converter  inside Wrapper to avoid duplication
+
+  class Converter
+    def initialize( lib, mn_to_html, mn_version )
+      @lib         = lib
+      @mn_to_html  = mn_to_html
+      @mn_version  = mn_version
+    end
+
+    def convert( text, options={} )
+      # call markdown filter; turn markdown lib name into method_name (mn)
+      # eg. rpeg-markdown =>  rpeg_markdown_to_html
+      send( @mn_to_html, text, options )  # call 1st configured markdown engine e.g. kramdown_to_html( content )
+    end
+    
+    def version
+      send( @mn_version )  # call 1st configured markdown engine e.g. kramdown_version
+    end
+
+    include Engine
+  end
+
+
+  class Wrapper
+
+    def initialize( lib, mn, content, options={} )
+      @lib      = lib
+      @mn       = mn
+      @content  = content
+      @options  = options
+    end
+
+    def to_html
+      # call markdown filter; turn markdown lib name into method_name (mn)
+      # eg. rpeg-markdown =>  rpeg_markdown_to_html
+      send( @mn, @content, @options )  # call 1st configured markdown engine e.g. kramdown_to_html( content )
+    end
+
+    include Engine
+
+  end # class Wrapper
+
+
+
+  @@config = nil
+
+  def self.lib=( lib )
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.markdown_lib = lib
+  end
+
+  def self.lib
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.markdown_lib
+  end
+
+  def self.libs
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.markdown_libs
+  end
+
+  def self.extnames
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.markdown_extnames
+  end
+
+  def self.filters
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.markdown_filters
+  end
+
+  def self.dump   # dump settings for debug/verbose flag
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.dump
+  end
+
+
+  def self.create_converter( lib )
+    if @@config.nil?
+      @@config = Config.new
+    end
+
+    mn_to_html  = @@config.markdown_to_html_method( lib ) # lets you use differnt options/converters for a single markdown lib   
+    mn_version  = @@config.markdown_version_method( lib )
+
+    Converter.new( lib, mn_to_html, mn_version )
+  end
+
+
+  def self.new( content, options={} )
+
+    ## options
+    ## make sure keys are strings, that is, allow symbols for easy use
+    ##  but internally only use string (yaml gets use strings)
+
+    ## fix: use stringify_keys! from activesupport (include dependency ?? why? why not??)
+    options.keys.each do |key|
+      options[ key.to_s ] = options.delete(key)
+    end
+
+
+    ## todo: allow options to pass in
+    ##   lets you change markdown engine/converter for every call
+    ##   e.g. lets you add config properties (as headers) to your document (for example)
+    
+    if @@config.nil?
+      @@config = Config.new
+    end
+
+    lib      = @@config.markdown_lib
+    mn       = @@config.markdown_to_html_method( lib ) # lets you use differnt options/converters for a single markdown lib   
+    defaults = @@config.markdown_lib_defaults( lib )  ## todo/fix: use mn / converter from defaults hash?? mn no longer needed??    
+
+    props = Props.new( options, 'USER', Props.new( defaults, 'SYSTEM' ))
+    
+    Wrapper.new( lib, mn, content, props )
+  end
+
+end # module Markdown

data/lib/markdown.rb

@@ -1,43 +1,41 @@
-# encoding: utf-8
-
-# core and stlibs
-
-require 'yaml'
-require 'json'
-require 'pp'
-require 'logger'
-require 'optparse'
-require 'fileutils'
-
-
-# gems
-
-require 'props'   # manage properties/settings/env
-
-class Env
-  def self.markdown_lib
-      ENV['MARKDOWN_LIB']
-  end    
-end # class Env
-
-
-require 'textutils'  # text filters and helpers
-
-
-# our own code
-
-require 'markdown/version'      # Note: let version always go first
-require 'markdown/config'
-require 'markdown/engines/bluecloth'
-require 'markdown/engines/kramdown'
-require 'markdown/engines/maruku'
-require 'markdown/engines/pandoc_ruby'
-require 'markdown/engines/rdiscount'
-require 'markdown/engines/redcarpet'
-require 'markdown/engines/rpeg_markdown'
-require 'markdown/wrapper'
-
-
-
-# say hello
-puts Markdown.banner  if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)
+# core and stlibs
+
+require 'yaml'
+require 'json'
+require 'pp'
+require 'logger'
+require 'optparse'
+require 'fileutils'
+
+
+# gems
+
+require 'props'   # manage properties/settings/env
+
+class Env
+  def self.markdown_lib
+      ENV['MARKDOWN_LIB']
+  end    
+end # class Env
+
+
+require 'textutils'  # text filters and helpers
+
+
+# our own code
+
+require_relative 'markdown/version'      # Note: let version always go first
+require_relative 'markdown/config'
+require_relative 'markdown/engines/bluecloth'
+require_relative 'markdown/engines/kramdown'
+require_relative 'markdown/engines/maruku'
+require_relative 'markdown/engines/pandoc_ruby'
+require_relative 'markdown/engines/rdiscount'
+require_relative 'markdown/engines/redcarpet'
+require_relative 'markdown/engines/rpeg_markdown'
+require_relative 'markdown/wrapper'
+
+
+
+# say hello
+puts Markdown.banner  if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)