markdown 1.1.0 → 1.1.1

data/Manifest.txt

@@ -17,11 +17,18 @@ lib/markdown/engines/redcarpet.rb
 lib/markdown/engines/rpeg_markdown.rb
 lib/markdown/server.rb
 lib/markdown/server/public/style.css
+lib/markdown/server/views/_about.erb
 lib/markdown/server/views/_debug.erb
+lib/markdown/server/views/_libs.erb
+lib/markdown/server/views/_libs_service.erb
+lib/markdown/server/views/_notepad.erb
+lib/markdown/server/views/_service.erb
 lib/markdown/server/views/_version.erb
 lib/markdown/server/views/debug.erb
 lib/markdown/server/views/index.erb
 lib/markdown/server/views/layout.erb
+lib/markdown/server/views/notepad.erb
+lib/markdown/server/views/service.erb
 lib/markdown/version.rb
 lib/markdown/wrapper.rb
 test/helper.rb

data/README.markdown

@@ -17,6 +17,7 @@ your markdown library of choice. Preconfigured markdown libraries include
 * `rdiscount`
 * `pandoc-ruby`
 
+
 ## Usage - Ruby Code
 
     require 'markdown'
@@ -26,25 +27,44 @@ your markdown library of choice. Preconfigured markdown libraries include
     # => "<p>Hello World</p>\n"
 
 
+## Usage - Web Service / HTTP (JSON) API - `GET /markdown`
+
+Try the `markdown` HTTP (JSON) API running
+on Heroku [`hypertext.herokuapp.com`](http://hypertext.herokuapp.com).
+
+Example:
+
+    GET /markdown?text=Hello+World!
+    
+    <p>Hello World!</p>
+
+
+To start your own server/service use `markdown serve`. See command line below.
+
+
 ## Usage - Command Line
 
 The `markdown` gem includes a little command line tool. Try `markdown -h` for details:
 
-```
-markdown - Lets you convert plain text documents to hypertext with your Markdown engine of choice
-  and preprocessing text filters.
-
-Usage: markdown [options] files_or_dirs
-    -o, --output PATH                Output Path
-    -v, --verbose                    Show debug trace
 
+    markdown - Lets you convert plain text documents to hypertext with your Markdown engine of choice
+      and preprocessing text filters.
+    
+    Usage: markdown [options] files_or_dirs
+        -o, --output PATH                Output Path
+        -v, --verbose                    Show debug trace
+    
+    
+    Examples:
+      markdown                   # Process all documents in working folder (that is, .)
+      markdown quickref          # Process document or folder using Markdown
+      markdown quickref.text     # Process document using Markdown
+      markdown -o site quickref  # Output documents to site folder
+    
+    Note:
+      markdown server            # Starts builtin markdown server
+                                 #   (aliases for server include serve, service, s)
 
-Examples:
-  markdown                   # Process all documents in working folder (that is, .)
-  markdown quickref          # Process document or folder using Markdown
-  markdown quickref.text     # Process document using Markdown
-  markdown -o site quickref  # Output documents to site folder
-```
 
 ## Configuration - Markdown Engine Loading Order
 

data/lib/markdown/cli/runner.rb

@@ -150,7 +150,8 @@ Examples:
   markdown -o site quickref  # Output documents to site folder
 
 Note:
-  markdown server            # Starts builtin markdown server (alias for server include serve, service, s)
+  markdown server            # Starts builtin markdown server
+                             #  (aliases for server include serve, service, s)
 
 
 Further information:

data/lib/markdown/config.rb

@@ -9,40 +9,51 @@ module Markdown
 # 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)
 
-#  DEFAULTS = {
-#    'libs' => [ 'pandoc-ruby',
-#                'rdiscount',
-#                'rpeg-markdown',
-#                'maruku',
-#                'bluecloth',
-#                'kramdown' ] }
-
-# note: make kramdown default engine
-
-DEFAULTS = { 'libs' => [
-                'kramdown' ],
-             'extnames' => [
-                '.markdown',
-                '.m',
-                '.mark',
-                '.mkdn',
-                '.md',
-                '.mdown',
-                '.markdn',
-                '.txt',
-                '.text' ],  # todo: check - add .wiki??? ext
-             'redcarpet' => {
-                 'extensions' => [
-                    'no_intra_emphasis',
-                    'fenced_code_blocks',
-                    'tables',
-                    'strikethrough' ] },   # todo/fix:  merge nested hash??
-             'filters' => [
-                'comments-percent-style' ] # optional (preprocessing) text filters: e.g. comments-percent-style, skip-end-directive, etc. (see textutils gem)
+
+DEFAULT_EXTNAMES = [
+  '.markdown',
+  '.m',
+  '.mark',
+  '.mkdn',
+  '.md',
+  '.mdown',
+  '.markdn',
+  '.txt',
+  '.text' ]    # todo: check - add .wiki??? ext
+
+DEFAULT_REDCARPET = {
+  'extensions' => [
+    'no_intra_emphasis',
+    'fenced_code_blocks',
+    'tables',
+    'strikethrough' ] }
+
+DEFAULT_FILTERS = [
+  'comments-percent-style' ] # optional (preprocessing) text filters: e.g. comments-percent-style, skip-end-directive, etc. (see textutils gem)
+
+
+DEFAULTS = { 'libs'      => [ 'kramdown' ],    # note: make kramdown default engine
+             'extnames'  => DEFAULT_EXTNAMES,
+             'redcarpet' => DEFAULT_REDCARPET,   # todo/fix:  merge nested hash??
+             'filters' =>  DEFAULT_FILTERS
            }
 
-  
-    def initialize
+#
+# pandoc-ruby  - how to include - gemfile cannot install binary ??
+# rpeg-markdown  - build failure - still active, anyway?
+# rdiscount - # compilation error on heroku; sorry excluded for now
+
+DEFAULTS_SERVICE = { 'libs' => [
+                'kramdown',   # note: make kramdown default engine
+                'maruku',
+                'bluecloth',
+                'redcarpet'
+                ],
+             'extnames'  => DEFAULT_EXTNAMES,
+             'redcarpet' => DEFAULT_REDCARPET
+           }
+
+    def load_props
       @props = @props_default = Props.new( DEFAULTS, 'DEFAULTS' )
 
       # check for user settings (markdown.yml) in home folder
@@ -50,7 +61,7 @@ DEFAULTS = { 'libs' => [
       ## todo: use .markdown.yml?? or differnt name ??
       props_home_file = File.join( Env.home, 'markdown.yml' )
       if File.exists?( props_home_file )
-        puts "Loading settings from '#{props_home_file}'..."
+        puts "Loading home settings from '#{props_home_file}'..."
         @props = @props_home = Props.load_file( props_home_file, @props )
       end
       
@@ -58,10 +69,25 @@ DEFAULTS = { 'libs' => [
     
       props_work_file = File.join( '.', 'markdown.yml' )
       if File.exists?( props_work_file )
-        puts "Loading settings from '#{props_work_file}'..."
+        puts "Loading work settings from '#{props_work_file}'..."
         @props = @props_work = Props.load_file( props_work_file, @props )
       end
+    end
+
+    def load_props_service
+      puts "Loading service settings..."
+      @props = @props_default = Props.new( DEFAULTS_SERVICE, 'DEFAULTS' )
+    end
+
+    def initialize
 
+      # for an example see ./boot.rb
+      if $MARKDOWN_USE_SERVICE_CONFIG == true
+        load_props_service
+      else
+        load_props
+      end
+      
       @libs   = []
       
       require_markdown_libs()
@@ -148,13 +174,24 @@ DEFAULTS = { 'libs' => [
       @libs.first
     end
     
-    def markdown_lib_defaults
-      ## todo: return props ? that acts like a hash?? (lets us support section lookup without deep merge???)
-      opts = @props.fetch( @libs.first, {} )
+    def markdown_libs
+      @libs  # NB: return all libs - should we return a clone?
     end
     
-    def markdown_to_html_method
-      lib  = @libs.first
+    def markdown_lib_defaults( lib=nil )
+      lib = @libs.first   if lib.nil?
+      ## todo: return props ? that acts like a hash?? (lets us support section lookup without deep merge???)
+      opts = @props.fetch( lib, {} )
+    end
+
+    def markdown_version_method( lib=nil )
+      lib  = @libs.first   if lib.nil?
+      method = "#{lib.downcase}_version"  # default to <lib>_to_html if converter prop not found    
+      method.tr('-','_').to_sym
+    end
+
+    def markdown_to_html_method( lib=nil )
+      lib  = @libs.first   if lib.nil?
       method = @props.fetch_from_section( lib, 'converter', "#{lib.downcase}_to_html" )  # default to <lib>_to_html if converter prop not found    
       method.tr('-','_').to_sym
     end

data/lib/markdown/engines/bluecloth.rb

@@ -1,6 +1,10 @@
 module Markdown
   module Engine
 
+    def bluecloth_version
+      BlueCloth::VERSION
+    end
+
     def bluecloth_to_html( content, options={} )
       puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library bluecloth..."
 

data/lib/markdown/engines/kramdown.rb

@@ -1,6 +1,10 @@
 module Markdown
   module Engine
 
+    def kramdown_version
+      Kramdown::VERSION
+    end
+
     def kramdown_to_html( content, options={} )
 
       h = {}
@@ -34,7 +38,7 @@ module Markdown
        #  only add banner if some newlines and size > treshold?
       
       banner_begin =<<EOS
-<!-- === begin markdown block =====================================================
+<!-- === begin markdown block ===
 
       generated by #{Markdown.banner}
                 on #{Time.now} with Markdown engine kramdown (#{Kramdown::VERSION})
@@ -43,7 +47,7 @@ module Markdown
 EOS
 
        banner_end =<<EOS
-<!-- === end markdown block ===================================================== -->
+<!-- === end markdown block === -->
 EOS
         content = banner_begin + content + banner_end
       end # if show_banner

data/lib/markdown/engines/maruku.rb

@@ -1,6 +1,10 @@
 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..."
             

data/lib/markdown/engines/rdiscount.rb

@@ -1,11 +1,16 @@
 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,6 +1,10 @@
 module Markdown
   module Engine
 
+    def redcarpet_version
+      Redcarpet::VERSION
+    end
+
     def redcarpet_to_html( content, options={} )
       
       ## NB: uses redcarpet2
@@ -27,7 +31,7 @@ module Markdown
         #  only add banner if some newlines and size > treshold?
       
       banner_begin =<<EOS
-<!-- === begin markdown block =====================================================
+<!-- === begin markdown block ===
 
       generated by #{Markdown.banner}
                 on #{Time.now} with Markdown engine redcarpet (#{Redcarpet::VERSION}) w/ HTML render
@@ -36,7 +40,7 @@ module Markdown
 EOS
 
       banner_end =<<EOS
-<!-- === end markdown block ===================================================== -->
+<!-- === end markdown block === -->
 EOS
 
         content = banner_begin + content + banner_end

data/lib/markdown/server.rb

@@ -50,44 +50,111 @@ class Server < Sinatra::Base
   ##############################################
   # Controllers / Routing / Request Handlers
 
+
+  def welcome_markdown
+<<EOS
+# Header 1
+
+## Header 2
+
+### Header 3
+    
+Welcome to [Markdown](#{request.url}). We hope you **really** enjoy using this.
+
+Just type some [markdown](http://daringfireball.net/projects/markdown) on the left and see it on the right. *Simple as that.*
+
+> Quote goes here.
+
+A list:
+
+- One
+- Two
+- Three
+
+Some inline code `to_html` and a preformatted code block:
+
+```
+Markdown.new( 'Hello Markdown!' ).to_html
+```
+EOS
+  end
+
+
+  get %r{/(service|services|srv|s)} do
+    erb :service
+  end
+
+  get %r{/(notepad|note|notes|n)} do
+    @welcome_markdown = welcome_markdown
+    @welcome_html = Markdown.new( @welcome_markdown ).to_html
+
+    erb :notepad
+  end
+
   get '/' do
+    @welcome_markdown = welcome_markdown
+    @welcome_html = Markdown.new( @welcome_markdown ).to_html
+
     erb :index
   end
 
+
   ## todo: use 3rd party services from markdown.yml (lets you configure)
   #   e.g. http://johnmacfarlane.net/cgi-bin/pandoc-dingus?text=hi
 
-  ## return html
-  get '/html' do
+
+  def markdownify( params, opts={} )
+    pp params
+    text = params[:text]
+    lib  = params[:lib]   # optional
+    pp text
+    pp lib
 
     # fix: use activesupport -> .present?
-    if params[:lib].nil? == false && params[:lib].empty? == false
-      Markdown.lib = params[:lib]
+    if lib.nil? == false && lib.empty? == false
+      Markdown.lib = lib
     end
 
-    md = Markdown.new( params[:text] )
-    html = md.to_html
-    html
+    Markdown.new( text, opts ).to_html
   end
 
-  ## return html wrapped in json (follows babelfish2 dingus service api)
-  get '/dingus' do
 
-    # fix: use activesupport -> .present?
-    if params[:lib].nil? == false && params[:lib].empty? == false
-      Markdown.lib = params[:lib]
-    end
-    
-    md = Markdown.new( params[:text] )
-    html = md.to_html
+  # return hypertext (html)
+  get '/markdown' do
+    content_type 'text/html'
+    markdownify( params )
+  end
+
+
+  # return babelmark2/dingus-style json
+  get '/markdown/dingus' do
+    html = markdownify( params )
+
+    ## todo: use converter for markdownify
+    lib = Markdown.lib
+    conv = Markdown.create_converter( lib )
+            
+    data = {
+      name: lib,
+      html: html,
+      version: conv.version
+    }
     
-    ### todo: add/fill up version
-    ## ass helper  <lib>_version to engine
-    # {"name":"Pandoc","html":"<p>hi</p>","version":"1.9.4.2"}
+    json_or_jsonp( data.to_json )
+  end
+
+  # return html wrapped in json (follows babelfish2 dingus service api)
+  get '/dingus' do
+    html = markdownify( params, banner: false )
+
+    ## todo: use converter for markdownify
+    lib = Markdown.lib
+    conv = Markdown.create_converter( lib )
+            
     data = {
-      name: Markdown.lib,
+      name: lib,
       html: html,
-      version: 'x.x.x'  # to be done
+      version: conv.version
     }
     
     json_or_jsonp( data.to_json )
@@ -124,3 +191,5 @@ end #  module Markdown
 
 # say hello
 puts Markdown::Server.banner
+puts "  default markdown engine: #{Markdown.lib}" # force loading of settings/config
+puts "  markdown engines: #{Markdown.libs.inspect}"

data/lib/markdown/server/public/style.css

@@ -1,15 +1,14 @@
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
 
-a {
-  color: black;
+a, a:visited  {
+  color: #8B0000;
   text-decoration: none; }
+
   a:hover {
-    color: black;
-    background-color: aqua;
+    color:  #8B0000;
+    background-color: gold;
     text-decoration: underline; }
-  a:visited {
-    color: black; }
 
 .params {
   color: green;
@@ -23,6 +22,19 @@ pre {
   padding: 4px; }
 
 
+h3 {
+    border-bottom: 1px solid black;
+}
+
+/****************
+ * api
+ */
+
+.api a, .api a:visited {
+    color: black;
+  }
+
+
 /**********
  * version / powered by
  */
@@ -31,6 +43,70 @@ pre {
   text-align: center;
   margin-top: 10px;
   color: grey; }
-  .version a, .version span {
+  .version a,
+  .version a:visited,
+  .version span {
     font-size: 12px;
-    color: grey; }
+    color: grey; }
+    
+
+/************************
+ * markdown
+ *
+ * todo: use sass/scss and nest everything inside class .markdown
+ */
+
+  .markdown h3 {
+    border-bottom: none;
+  }
+
+  .markdown a,
+  .markdown a:visited {
+    color: #2e80d3;
+    text-decoration: underline;
+  }
+
+  .markdown em {
+    background-color: #fffeca;
+    padding: 0 0.08em;
+  }
+  
+  .markdown abbr {
+    border-bottom: 1px dashed;
+    cursor: help;
+  }
+    
+  .markdown blockquote {
+    border-left: 5px solid #ddd;
+    color: #555;
+    margin: 0 0 1em;
+    padding-left: 0.6em;
+  }
+  
+  .markdown pre {
+    background-color: #f8f8ff;
+    border: 1px solid #dedede;
+    color: #444;
+    font-family: "Bitstream Vera Sans Mono", Courier, monospace;
+    font-size: 0.8em;
+    line-height: 1.5em;
+    margin: 0 0 2em;
+    overflow: auto;
+    padding: 0.5em;
+  }
+
+   .markdown pre code {
+      background-color: #f8f8ff;
+      border: medium none;
+      font-size: 1em;
+      padding: 0;
+  }
+  
+  .markdown code {
+    background-color: #f8f8ff;
+    border: 1px solid #dedede;
+    color: #444;
+    padding: 0 0.2em;
+    font-family: "Bitstream Vera Sans Mono", Courier, monospace;
+    font-size: 0.8em;
+  }

data/lib/markdown/server/views/_about.erb

@@ -0,0 +1,23 @@
+
+
+<h3>Markdown Gem / About</h3>
+
+<p><b>
+What's the <code>markdown</code> gem?
+</b>
+
+The Markdown Engine Wrapper (<code>markdown</code>) Ruby gem lets you use
+your markdown library of choice in Ruby.
+<a href='https://github.com/geraldb/markdown'>Find out more »</a>
+</p>
+
+<p>
+<b>Questions? Comments?</b>  
+Send them along to the <a href='http://groups.google.com/group/webslideshow'>Free Web Slide Show Alternatives (S5, S6, S9, Slidy And Friends) Forum/Mailing List</a>.
+Thanks!
+</p>
+
+<p><b>License</b>
+The markdown scripts are dedicated to the public domain.
+Use it as you please with no restrictions whatsoever.
+</p>

data/lib/markdown/server/views/_debug.erb

@@ -1,6 +1,15 @@
 
 <h3>Debug</h3>
 
+<h4>Params</h4>
+
+<pre>
+  <%= params.inspect %>
+</pre>
+
+
+<h4>Request</h4>
+
 <pre>
   request.scheme          <%= request.scheme %>
   request.script_name     <%= request.script_name %>
@@ -15,3 +24,4 @@
   request.path            <%= request.path %>
   request.ip              <%= request.ip %>
 </pre>
+

data/lib/markdown/server/views/_libs.erb

@@ -0,0 +1,14 @@
+
+<h3>Markdown Libs</h3>
+
+<table>
+<%  Markdown.libs.each do |lib|
+      conv = Markdown.create_converter( lib )
+  %>
+<tr>
+  <td><%= lib %></td>
+  <td><%= conv.version %></td>
+  <td><!-- defaults to be done --></td>
+</tr>
+<% end %>
+</table>

data/lib/markdown/server/views/_libs_service.erb

@@ -0,0 +1,27 @@
+
+<h3>Markdown Libs / Live Examples</h3>
+
+<table class='api'>
+<%  Markdown.libs.each do |lib|
+      conv = Markdown.create_converter( lib )
+  %>
+<tr>
+  <td><%= lib %></td>
+  <td> / <%= conv.version %></td>
+  <td> - 
+ <code>GET
+     <a href='view-source:<%= url("/markdown?lib=#{lib}&text=Hello+World!") %>'>
+        /markdown?<span class='params'>lib=<em><%= lib %></em></span>&text=<em>Hello+World!</em>
+     </a>
+ </code>
+  </td>
+  <td>
+ <code>&bull; GET
+     <a href='<%= url("/dingus?lib=#{lib}&text=Hello+World!") %>'>
+        /dingus?<span class='params'>lib=<em><%= lib %></em></span>&text=<em>Hello+World!</em>
+     </a>
+ </code>
+  </td>
+</tr>
+<% end %>
+</table>

data/lib/markdown/server/views/_notepad.erb

@@ -0,0 +1,96 @@
+
+<script>
+
+ var show_html = false;
+
+ function toggle_output() {
+    var $toggle_output = $( '#toggle-output' );
+    var $output        = $( '#output' );
+    var $output_source = $( '#output-source' );
+    
+    show_html = !show_html;
+    
+    if( show_html ) {
+      $toggle_output.html( '[ Hide HTML ]' );
+      $output.hide();
+      $output_source.show();
+    }
+    else {
+      $toggle_output.html( '[ Show HTML ]' );
+      $output.show();
+      $output_source.hide();
+    }
+ }
+
+ function process_markdown() {
+    var params = $( '#notepad, #notepad-lib' ).serialize();
+    
+    // window.alert( params );
+    
+    $.get( '/markdown', params, function( data ){
+       
+       var $output        = $( '#output' );
+       var $output_source = $( '#output-source' );
+       // window.alert( html );
+       
+       // todo: check if data.html present? or content type js/json
+       //  allow dingus-style { 'html': 'dddddd' }
+       $output.html( data );
+       $output_source.html( data );
+    });
+ }
+ 
+</script>
+
+
+<table width='100%'>
+ <colgroup>
+   <col width='50%'>
+   <col width='50%'>
+ </colgroup>
+ <tr>
+   <td>
+     <!-- first column -->
+
+<div id='input'>
+    <textarea id='notepad' name='text' style='width: 100%; min-height: 500px;'><%= @welcome_markdown %></textarea>
+</div>
+
+   </td>
+   <td style='vertical-align: top;'>
+     <!-- second column -->
+
+<div id='output' class='markdown' style='width:100%; padding-left: 10px;'>
+   <%= @welcome_html %>
+</div>
+
+ <textarea id='output-source' style='display: none; width: 100%; min-height: 500px;'><%= @welcome_html %></textarea>
+
+  <div id='loading' style='display: none;'></div>
+ 
+   </td>
+ </tr>
+ <tr>
+  <td>
+    <!-- first column -->
+    <span>
+      Use
+       <select id='notepad-lib' name='lib'>
+         <% Markdown.libs.each_with_index do |lib,i| %>
+           <option value='<%= lib %>'
+               <% if i == 0 %>
+                  selected='selected'
+               <% end %> >
+             <%= lib %></option>
+          <% end %>
+       </select>
+    </span>
+
+    <a href='#' onclick='process_markdown();'>[ Update ]</a>
+
+  </td>
+  <td><!-- second column -->
+    <a id='toggle-output' href='#' onclick='toggle_output();'>[ Show HTML ]</a>
+  </td>
+ </tr>
+</table>

data/lib/markdown/server/views/_service.erb

@@ -0,0 +1,75 @@
+
+<h3>Markdown Web Service / HTTP JSON(P) API</h1>
+
+<h4>Render Markdown</h4>
+
+<pre><code>GET /markdown
+</code></pre>
+
+<p>
+ Input:
+</p>
+
+<ul>
+ <li><b>text</b> - <em>Required</em> string - The Markdown text to render</li>
+ <li><b>lib</b>  - <em>Optional</em> string - The Markdown library/engine to use
+      (e.g. <code>kramdown</code>, <code>redcarpet</code>, etc)</li>
+</ul>
+
+<p class='api'>
+ Example: 
+ <code>GET 
+     <a href='view-source:<%= url("/markdown?text=Hello+World!") %>'>
+        /markdown?<span class='params'>text=<em>Hello+World!</em></span>
+     </a>
+ </code>
+</p>
+
+<p>
+ Response:
+</p>
+
+<pre><code>Status: 200 OK
+Content-Type: text/html
+
+&lt;p&gt;Hello World!&lt;p&gt;
+</code></pre>
+
+
+<h4>Render Markdown (Babelmark2-Style)</h4>
+
+<pre><code>GET /dingus
+</code></pre>
+
+<p>
+ Input:
+</p>
+
+<ul>
+ <li><b>text</b> - <em>Required</em> string - The Markdown text to render</li>
+ <li><b>lib</b>  - <em>Optional</em> string - The Markdown library/engine to use
+      (e.g. <code>kramdown</code>, <code>redcarpet</code>, etc)</li>
+</ul>
+
+
+<p class='api'>Example:
+ <code>GET
+     <a href='<%= url("/dingus?text=Hello+World!") %>'>
+        /dingus?<span class='params'>text=<em>Hello+World!</em></span>
+     </a>
+ </code>
+</p>
+
+<p>
+ Response:
+</p>
+
+<pre><code>Status: 200 OK
+Content-Type: application/json
+
+{
+  'name': 'kramdown',
+  'html': '&lt;p&gt;Hello World!&lt;p&gt;',
+  'version': '1.0.2'
+}
+</code></pre>

data/lib/markdown/server/views/index.erb

@@ -1,23 +1,18 @@
 
-<h1>Markdown JSON(P) API</h1>
 
+<%= erb :'_notepad' %>
 
-<hr>
 
-<p>
- <code>
-     <a href='<%= url("/html?text=hello_world") %>'>
-        /html?<span class='params'>text</span>=hello_world
-     </a>
- </code>
-</p>
-
-<p>
- <code>
-     <a href='<%= url("/dingus?text=hello_world") %>'>
-        /dingus?<span class='params'>text</span>=hello_world
-     </a>
- </code>
-</p>
+<%= erb :'_libs' %>
+
+
+<%= erb :'_service' %>
+
+
+<%= erb :'_about' %>
+
+<!--
+<hr>
 
 <%= erb :'_debug' %>
+-->

data/lib/markdown/server/views/layout.erb

@@ -2,8 +2,9 @@
 <html>
 <head>
   <meta charset='UTF-8'>  
-  <title>markdown web service / HTTP JSON API</title>
+  <title>markdown ruby gem - use your markdown library of choice in ruby</title>
   <link href="<%= url('/style.css') %>" rel='stylesheet'>
+  <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
 </head>
 <body>
 

data/lib/markdown/server/views/notepad.erb

@@ -0,0 +1,8 @@
+
+<%= erb :'_notepad' %>
+
+<!--
+<hr>
+
+<%= erb :'_debug' %>
+-->

data/lib/markdown/server/views/service.erb

@@ -0,0 +1,10 @@
+
+<%= erb :'_service' %>
+
+<%= erb :'_libs_service' %>
+
+<!--
+<hr>
+
+<%= erb :'_debug' %>
+-->

data/lib/markdown/version.rb

@@ -1,3 +1,3 @@
 module Markdown
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/markdown/wrapper.rb

@@ -1,5 +1,28 @@
 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={} )
@@ -36,21 +59,28 @@ module Markdown
     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
@@ -59,6 +89,18 @@ module Markdown
   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
@@ -80,8 +122,8 @@ module Markdown
     end
 
     lib      = @@config.markdown_lib
-    mn       = @@config.markdown_to_html_method # lets you use differnt options/converters for a single markdown lib   
-    defaults = @@config.markdown_lib_defaults  ## todo/fix: use mn / converter from defaults hash?? mn no longer needed??    
+    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' ))
     

data/test/test_kramdown.rb

@@ -38,7 +38,7 @@ class TestKramdown < MiniTest::Unit::TestCase
     assert( html1 =~ /^<!-- === begin markdown block ===/ )
     assert( html1.include?( "<p>Hello World!</p>\n" ))
     assert( html2.include?( "<p>Hello World!</p>\n" ))
-    assert( html1 =~ /============ -->$/ )
+    assert( html1 =~ /=== -->$/ )
   end
 
 end # class TestKramdown

data/test/test_redcarpet.rb

@@ -31,7 +31,7 @@ class TestRedcarpet < MiniTest::Unit::TestCase
     html = Markdown.new( 'Hello World!', banner: true ).to_html
     assert( html =~ /^<!-- === begin markdown block ===/ )
     assert( html.include?( "<p>Hello World!</p>\n" ))
-    assert( html =~ /============ -->$/ )
+    assert( html =~ /=== -->$/ )
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &87448610 !ruby/object:Gem::Requirement
+  requirement: &77334260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *87448610
+  version_requirements: *77334260
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &87448390 !ruby/object:Gem::Requirement
+  requirement: &77334040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *87448390
+  version_requirements: *77334040
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &87448170 !ruby/object:Gem::Requirement
+  requirement: &77333820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *87448170
+  version_requirements: *77333820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &87447950 !ruby/object:Gem::Requirement
+  requirement: &77333600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *87447950
+  version_requirements: *77333600
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &87447730 !ruby/object:Gem::Requirement
+  requirement: &77333380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *87447730
+  version_requirements: *77333380
 description: Markdown Engine Wrapper - Use Your Markdown Library of Choice
 email: webslideshow@googlegroups.com
 executables:
@@ -93,11 +93,18 @@ files:
 - lib/markdown/engines/rpeg_markdown.rb
 - lib/markdown/server.rb
 - lib/markdown/server/public/style.css
+- lib/markdown/server/views/_about.erb
 - lib/markdown/server/views/_debug.erb
+- lib/markdown/server/views/_libs.erb
+- lib/markdown/server/views/_libs_service.erb
+- lib/markdown/server/views/_notepad.erb
+- lib/markdown/server/views/_service.erb
 - lib/markdown/server/views/_version.erb
 - lib/markdown/server/views/debug.erb
 - lib/markdown/server/views/index.erb
 - lib/markdown/server/views/layout.erb
+- lib/markdown/server/views/notepad.erb
+- lib/markdown/server/views/service.erb
 - lib/markdown/version.rb
 - lib/markdown/wrapper.rb
 - test/helper.rb