markdown 0.2.0 → 0.3.0

data/Rakefile

@@ -15,6 +15,7 @@ Hoe.spec 'markdown' do
   
   self.extra_deps = [
     ['props','>= 0.1.0'],
+    ['textutils','>=0.1.0'],
     ['kramdown','>= 0.13.6']
   ]
   

data/lib/markdown.rb

@@ -15,7 +15,7 @@ require 'fileutils'
 
 # rubygems
 
-require 'props'   # manage properties/settings/env  
+require 'props'   # manage properties/settings/env
 
 class Env
   def self.markdown_lib
@@ -24,6 +24,8 @@ class Env
 end # class Env
 
 
+require 'textutils'  # text filters and helpers
+
 # our own code
 
 require 'markdown/config'
@@ -40,7 +42,7 @@ require 'markdown/gen'
 
 module Markdown
 
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   # version string for generator meta tag (includes ruby version)
   def self.banner

data/lib/markdown/config.rb

@@ -36,9 +36,9 @@ DEFAULTS = { 'libs' => [
                     'no_intra_emphasis',
                     'fenced_code_blocks',
                     'tables',
-                    'strikethrough' ]   # todo/fix:  merge nested hash??
-              },
-            }
+                    'strikethrough' ] },   # todo/fix:  merge nested hash??
+             'filters' => [] # optional (preprocessing) text filters: e.g. comments-percent-style, skip-end-directive, etc. (see textutils gem)
+           }
 
   
     def initialize
@@ -69,6 +69,10 @@ DEFAULTS = { 'libs' => [
     def markdown_extnames
       @props.fetch( 'extnames', nil )
     end
+    
+    def markdown_filters
+      @props.fetch( 'filters', nil )
+    end
 
     def known_markdown_libs
       # returns an array of known markdown engines e.g.

data/lib/markdown/gen.rb

@@ -16,6 +16,8 @@ module Markdown
 
   class Gen
 
+    include TextUtils::Filter   # include filters such as comments_percent_style, etc. (see textutils gem)
+
     attr_reader :logger
     attr_reader :opts
     
@@ -62,7 +64,15 @@ module Markdown
       puts "*** #{inname} (#{dirname}) => #{outname} (#{(opts.output_path == '.') ? dirname : opts.output_path})..."
       
       content = File.read( inname )
-      content = Markdown.new( content ).to_html  # convert light-weight markup to hypertext
+      
+      # 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
@@ -195,10 +205,12 @@ EOS
            logger.level = Logger::DEBUG
         end
  
+
+## todo: add markdown.lib options (e.g. extensions,etc)
  
         usage =<<EOS
 
-markdown - Lets you convert plain text documents (#{Markdown.extnames.join(', ')}) to hypertext (.html) with your Markdown engine of choice (#{Markdown.lib}).
+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}
 

data/lib/markdown/wrapper.rb

@@ -41,6 +41,14 @@ module Markdown
     @@config.markdown_extnames
   end
   
+  def self.filters
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.markdown_filters
+  end
+  
+  
   def self.new( content, options={} )
 
     ## todo: allow options to pass in
@@ -55,7 +63,7 @@ module Markdown
     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??    
 
-    props = Props.new( options, 'USER', Props.new( defaults, 'SYSTEM' ))    
+    props = Props.new( options, 'USER', Props.new( defaults, 'SYSTEM' ))
     
     Wrapper.new( lib, mn, content, props )
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: markdown
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: props
@@ -34,9 +34,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: kramdown
+  name: textutils
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: kramdown
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +64,11 @@ dependencies:
         - 6
         version: 0.13.6
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +79,11 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,7 +94,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Markdown Engine Wrapper - Use Your Markdown Library of Choice
 email: webslideshow@googlegroups.com
 executables: