markdown 1.1.1 → 1.2.0

data/bin/markdown

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-###################
-# == DEV TIPS:
-#
-# For local testing run like:
-#
-#    ruby -Ilib bin/markdown
-#
-# Set the executable bit in Linux. Example:
-#
-#    % chmod a+x bin/markdown
-#
-
-require 'markdown'
-
-Markdown.main

data/lib/markdown/cli/gen.rb

@@ -1,89 +0,0 @@
-module Markdown
-
-class Gen
-
-  include TextUtils::Filter   # include filters such as comments_percent_style, etc. (see textutils gem)
-
-  attr_reader :logger
-  attr_reader :opts
-    
-  def initialize( logger, opts )
-    @logger = logger
-    @opts   = opts
-  end
-
-    def create_doc( fn )
-      dirname  = File.dirname(  fn )
-      basename = File.basename( fn, '.*' )
-      extname  = File.extname(  fn )
-
-      logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
-
-      if opts.output_path == '.'
-        # expand output path in current dir
-        outpath = File.expand_path( dirname ) 
-      else
-        # expand output path in user supplied dir and make sure output path exists
-        outpath = File.expand_path( opts.output_path ) 
-        FileUtils.makedirs( outpath ) unless File.directory? outpath 
-      end
-      logger.debug "outpath=#{outpath}"
-      
-      # todo: add a -c option to commandline? to let you set cwd?
-
-
-      # change working dir to sourcefile dir (that is, dirname); push working folder/dir
-      newcwd  = File.expand_path( dirname )
-      oldcwd  = File.expand_path( Dir.pwd )
-    
-      unless newcwd == oldcwd
-        logger.debug "oldcwd=>#{oldcwd}<, newcwd=>#{newcwd}<"
-        Dir.chdir( newcwd )
-      end  
-
-      inname  = "#{basename}#{extname}"
-      outname = "#{basename}.html"
-      
-      logger.debug "inname=#{inname}, outname=#{outname}"
-      
-      puts "*** #{inname} (#{dirname}) => #{outname} (#{(opts.output_path == '.') ? dirname : opts.output_path})..."
-      
-      content = File.read( inname )
-      
-      # step 1) run (optional) preprocessing text filters
-      Markdown.filters.each do |filter|
-        mn = filter.tr( '-', '_' ).to_sym  # construct method name (mn)
-        content = send( mn, content )   # call filter e.g.  include_helper_hack( content )  
-      end
-
-      # step 2) convert light-weight markup to hypertext
-      content = Markdown.new( content ).to_html
-
-
-## todo: add Markdown.lib_options inspect/dump to banner
-            
-      banner =<<EOS
-<!-- ======================================================================
-      generated by #{Markdown.banner}
-                on #{Time.now} with Markdown engine '#{Markdown.lib}'
-     ====================================================================== -->
-EOS
-      
-      out = File.new( File.join( outpath, outname ), "w+" )
-####      out << banner
-      out << content
-      out.flush
-      out.close
-
-      ## pop/restore working folder/dir
-      unless newcwd == oldcwd
-        logger.debug "oldcwd=>#{oldcwd}<, newcwd=>#{newcwd}<"
-        Dir.chdir( oldcwd )
-      end  
-            
-    end # method create_doc
-
-
-    
-end # class Gen
-end # module Markdown

data/lib/markdown/cli/opts.rb

@@ -1,14 +0,0 @@
-module Markdown
-
-class Opts
-  
-  def output_path=(value)
-    @output_path = value
-  end
-  
-  def output_path
-    @output_path || '.'
-  end
-
-end # class Opts
-end # module Markdown

data/lib/markdown/cli/runner.rb

@@ -1,202 +0,0 @@
-module Markdown
-
-class Runner
-
-  attr_reader :logger
-  attr_reader :opts
-    
-  def initialize
-    @logger       = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-    @opts         = Opts.new
-  end
-
-  def has_markdown_extension?( fn )
-    dirname  = File.dirname( fn )
-    basename = File.basename( fn, '.*' )
-    extname  = File.extname( fn )
-    logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
-
-    return false if extname.empty?   # no extension
-      
-    Markdown.extnames.include?( extname.downcase )
-  end
-    
-  def find_file_with_markdown_extension( fn )
-    dirname  = File.dirname( fn )
-    basename = File.basename( fn, '.*' )
-    extname  = File.extname( fn )
-    logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
-
-    Markdown.extnames.each do |e|
-      newname = File.join( dirname, "#{basename}#{e}" ) 
-      logger.debug "File.exists? #{newname}"
-      return newname if File.exists?( newname )
-    end  # each extension (e)
-      
-    nil   # not found; return nil
-  end
-
-    
-  def find_files( file_or_dir_or_pattern )
-
-    filtered_files = []
-      
-    # assume pattern if includes * or ? or {} or []
-    if file_or_dir_or_pattern =~ /[*?{}\[\]]/
-      puts "searching glob pattern '#{file_or_dir_or_pattern}'..."
-      Dir.glob( file_or_dir_or_pattern ).each do |file|
-        if File.directory?( file )  # skip (sub)directories
-          puts "  skipping folder '#{file}'..."
-          next
-        else
-          if has_markdown_extension?( file )
-            logger.debug "  adding file '#{file}'..."
-            filtered_files << file
-          else
-            puts "  skipping file   '#{file}'..."
-          end
-        end
-      end
-    elsif File.directory?(file_or_dir_or_pattern)
-      puts "searching folder '#{file_or_dir_or_pattern}'..."
-      Dir.entries( file_or_dir_or_pattern ).each do |entry|
-        next if entry == '.' || entry == '..' # silently skip current and up dirs
-          
-        if file_or_dir_or_pattern == '.'
-          file = entry
-        else  # add dir (if not working dir)
-          file = File.join( file_or_dir_or_pattern, entry )  
-        end
-           
-        if File.directory?( file )  # skip (sub)directories
-          puts "  skipping folder '#{file}'..."
-          next
-        else
-          if has_markdown_extension?( file )
-            logger.debug "  adding file '#{file}'..."
-            filtered_files << file
-          else
-            puts "  skipping file   '#{file}'..."
-          end
-        end
-      end
-    else  # assume it's a single file (check for missing extension)
-      if File.exists?( file_or_dir_or_pattern )
-        file = file_or_dir_or_pattern
-        if has_markdown_extension?( file )
-          logger.debug "  adding file '#{file}'..."
-          filtered_files << file
-        else
-          puts "  skipping file   '#{file}'..."
-        end
-      else  # check for existing file w/ missing extension
-        file = find_file_with_markdown_extension( file_or_dir_or_pattern )
-        if file.nil?
-          puts "  skipping missing file '#{file_or_dir_or_pattern}{#{Markdown.extnames.join(',')}}'..."
-        else
-          logger.debug "  adding file '#{file}'..."
-          filtered_files << file
-        end
-      end
-    end
-
-    filtered_files
-  end  # find_files
-  
-    
-    def run( args )
-      opt=OptionParser.new do |cmd|
-    
-        cmd.banner = "Usage: markdown [options] files_or_dirs"
-    
-        cmd.on( '-o', '--output PATH', "Output Path (default is #{opts.output_path})" ) { |path| opts.output_path = path }
-
-        cmd.on( '-v', '--version', "Show version" ) do
-          puts Markdown.banner
-          exit
-        end
-        
-        cmd.on( '--about', "(Debug) Show more version info" ) do
-          puts
-          puts Markdown.banner
-          puts
-
-          # dump settings
-          Markdown.dump
-          puts
-          
-          exit
-        end
-
-        cmd.on( "--verbose", "(Debug) Show debug trace" )  do
-          logger.datetime_format = "%H:%H:%S"
-          logger.level = Logger::DEBUG
-        end
- 
-## todo: add markdown.lib options (e.g. extensions,etc)
- 
-        cmd.on_tail( "-h", "--help", "Show this message" ) do
-           puts <<EOS
-
-markdown - Lets you convert plain text documents (#{Markdown.extnames.join(', ')}) to hypertext (.html) with your Markdown engine of choice (#{Markdown.lib}) and preprocessing text filters (#{Markdown.filters.join(', ')}).
-
-#{cmd.help}
-
-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)
-
-
-Further information:
-  https://github.com/geraldb/markdown
-
-EOS
-           exit
-        end
-      end
-
-      opt.parse!( args )
-  
-      puts Markdown.banner
-      
-      # force loading of config
-      Markdown.lib
-      
-      Markdown.dump   if logger.level == Logger::DEBUG   # dump settings if verbose/debug flag on
-
-      
-      logger.debug "args.length: #{args.length}"
-      logger.debug "args: >#{args.join(',')}<"
-
-      if args.length == 1 && ['server', 'serve', 'service', 's' ].include?( args[0] )
-         # start service/server
-         # NB: server (HTTP service) not included in standard default require
-        require 'markdown/server'
-
-        Markdown::Server.run!
-      else
-
-        # if no file args given; default to working folder (that is, .)
-        args = ['.'] if args.length == 0
-
-        args.each do |arg|
-          files = find_files( arg )
-          files.each do |file|
-            Gen.new( logger, opts ).create_doc( file )
-          end
-        end
-      end
-
-      puts 'Done. Bye.'
-      
-    end   # method run 
-
-end # class Runner
-end # module Markdown

data/lib/markdown/server.rb

@@ -1,195 +0,0 @@
-######
-# NB: use rackup to startup Sinatra service (see config.ru)
-#
-#  e.g. config.ru:
-#   require './boot'
-#   run Markdown::Server
-
-
-# 3rd party libs/gems
-
-require 'sinatra/base'
-
-
-# our own code
-
-# require 'logutils'
-# require 'logutils/db'
-
-
-
-module Markdown
-
-class Server < Sinatra::Base
-
-  def self.banner
-    "markdown-service #{Markdown::VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] on Sinatra/#{Sinatra::VERSION} (#{ENV['RACK_ENV']})"
-  end
-
-  PUBLIC_FOLDER = "#{Markdown.root}/lib/markdown/server/public"
-  VIEWS_FOLDER  = "#{Markdown.root}/lib/markdown/server/views"
-
-  puts "[debug] markdown-service - setting public folder to: #{PUBLIC_FOLDER}"
-  puts "[debug] markdown-service - setting views folder to: #{VIEWS_FOLDER}"
-
-  set :public_folder, PUBLIC_FOLDER   # set up the static dir (with images/js/css inside)   
-  set :views,         VIEWS_FOLDER    # set up the views dir
-
-  set :static, true   # set up static file routing
-
-
-  ##################
-  # Helpers
-  
-    helpers do
-      def path_prefix
-        request.env['SCRIPT_NAME']
-      end
-    end 
-
-  ##############################################
-  # 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
-
-
-  def markdownify( params, opts={} )
-    pp params
-    text = params[:text]
-    lib  = params[:lib]   # optional
-    pp text
-    pp lib
-
-    # fix: use activesupport -> .present?
-    if lib.nil? == false && lib.empty? == false
-      Markdown.lib = lib
-    end
-
-    Markdown.new( text, opts ).to_html
-  end
-
-
-  # 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
-    }
-    
-    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: lib,
-      html: html,
-      version: conv.version
-    }
-    
-    json_or_jsonp( data.to_json )
-  end
-
-
-  get '/d*' do
-    erb :debug
-  end
-
-
-### helper for json or jsonp response (depending on callback para)
-
-private
-def json_or_jsonp( json )
-  callback = params.delete('callback')
-  response = ''
-
-  if callback
-    content_type :js
-    response = "#{callback}(#{json})"
-  else
-    content_type :json
-    response = json
-  end
-  
-  response
-end
-
-
-end # class Server
-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}"