markdown 0.1.0 → 0.2.0.beta1

data/Rakefile

@@ -14,6 +14,7 @@ Hoe.spec 'markdown' do
   self.email   = 'webslideshow@googlegroups.com'
   
   self.extra_deps = [
+    ['props','>= 0.1.0'],
     ['kramdown','>= 0.13.6']
   ]
   

data/lib/markdown.rb

@@ -13,6 +13,17 @@ require 'optparse'
 require 'fileutils'
 
 
+# rubygems
+
+require 'props'   # manage properties/settings/env  
+
+class Env
+  def self.markdown_lib
+      ENV['MARKDOWN_LIB']
+  end    
+end # class Env
+
+
 # our own code
 
 require 'markdown/config'
@@ -28,7 +39,7 @@ require 'markdown/gen'
 
 module Markdown
 
-  VERSION = '0.1.0'
+  VERSION = '0.2.0.beta1'
 
   # version string for generator meta tag (includes ruby version)
   def self.banner

data/lib/markdown/config.rb

@@ -1,67 +1,5 @@
 module Markdown
 
-  class Env
-    def self.home
-      path = if( ENV['HOME'] || ENV['USERPROFILE'] )
-               ENV['HOME'] || ENV['USERPROFILE']
-             elsif( ENV['HOMEDRIVE'] && ENV['HOMEPATH'] )
-               "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
-             else
-               begin
-                 File.expand_path('~')
-               rescue
-                 if File::ALT_SEPARATOR
-                   'C:/'
-                 else
-                   '/'
-                 end
-               end
-             end
-      
-      puts "env home=>#{path}<"
-      path
-    end
-    
-    def self.markdown_lib
-      ENV['MARKDOWN_LIB']
-    end    
-  end # class Env
-
-  class Props
-
-    attr_reader :path
-    attr_reader :parent
-    
-    def initialize( hash, path, parent=nil)
-      @hash   = hash
-      @path   = path
-      @parent = parent
-    end
-    
-    def self.load_file( path, parent=nil )
-      h = YAML.load_file( path )
-      puts "dump of >#{path}<:"      
-      pp h    # todo: add debug flag (turn off for default)
-      Props.new( h, path, parent )
-    end
-    
-    def [](key)  get( key );  end
-    
-    def fetch(key, default)
-      value = get( key )
-      value.nil? ? default : value
-    end
-
-private
-    def get( key )
-      value = @hash[ key.to_s ]
-      # if not found try lookup in parent hash
-      (value.nil? && parent) ? parent[key] : value
-    end
-    
-  end # class props
-
-
   class Config
 
 # note: only kramdown is listed as a dependency in gem specs (because it's Ruby only and, thus, easy to install)
@@ -80,7 +18,20 @@ private
 #                'kramdown' ] }
 
 # note: make kramdown default engine
-DEFAULTS = { 'libs' => [ 'kramdown' ] }
+
+DEFAULTS = { 'libs' => [
+                'kramdown' ],
+             'extnames' => [
+                '.markdown',
+                '.m',
+                '.mark',
+                '.mkdn',
+                '.md',
+                '.mdown',
+                '.markdn',
+                '.txt',
+                '.text' ]  # todo: check - add .wiki??? ext
+           }
 
   
     def initialize
@@ -107,7 +58,11 @@ DEFAULTS = { 'libs' => [ 'kramdown' ] }
       @libs   = []
       @mn     = nil   # markdown converter method name (mn) e.g. kramdown_to_html
       
-      require_markdown_libs()      
+      require_markdown_libs()
+    end
+
+    def markdown_extnames
+      @props.fetch( 'extnames', nil )
     end
 
     def known_markdown_libs

data/lib/markdown/gen.rb

@@ -3,16 +3,12 @@ module Markdown
 
   class Opts
   
-    def initialize
-      @hash = {}
+    def output_path=(value)
+      @output_path = value
     end
-    
-    def put( key, value )
-      @hash[ key.to_s ] = value
-    end    
   
     def output_path
-      @hash.fetch( 'output', '.' )
+      @output_path ||= '.'
     end
 
   end # class Opts
@@ -30,18 +26,6 @@ module Markdown
     end
 
 
-### fix/todo:
-#    make configureable
-    DEFAULT_MARKDOWN_EXTENSIONS = [
-      '.markdown',
-      '.m',
-      '.mark',
-      '.mkdn',
-      '.md',
-      '.txt',
-      '.text' ]
-
-
     def with_output_path( dest, output_path )
       dest_full = File.expand_path( dest, output_path )
       logger.debug "dest_full=#{dest_full}"
@@ -113,7 +97,7 @@ module Markdown
 
       return false if extname.empty?   # no extension
       
-      DEFAULT_MARKDOWN_EXTENSIONS.include?( extname.downcase )
+      Markdown.extnames.include?( extname.downcase )
     end
     
     def find_file_with_markdown_extension( fn )
@@ -122,7 +106,7 @@ module Markdown
       extname  = File.extname( fn )
       logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
 
-      DEFAULT_MARKDOWN_EXTENSIONS.each do |e|
+      Markdown.extnames.each do |e|
         logger.debug "File.exists? #{dirname}/#{basename}#{e}"
         return "#{dirname}/#{basename}#{e}" if File.exists?( "#{dirname}/#{basename}#{e}" )
       end  # each extension (e)
@@ -186,7 +170,7 @@ module Markdown
         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}{#{DEFAULT_MARKDOWN_EXTENSIONS.join(',')}}'..."
+            puts "  skipping missing file '#{file_or_dir_or_pattern}{#{Markdown.extnames.join(',')}}'..."
           else
             logger.debug "  adding file '#{file}'..."
             filtered_files << file
@@ -202,7 +186,7 @@ module Markdown
     
         cmd.banner = "Usage: markdown [options] name"
     
-        cmd.on( '-o', '--output PATH', 'Output Path' ) { |s| opts.put( 'output', s ) }
+        cmd.on( '-o', '--output PATH', 'Output Path' ) { |path| opts.output_path = path }
 
         # todo: find different letter for debug trace switch (use v for version?)
         cmd.on( "-v", "--verbose", "Show debug trace" )  do
@@ -210,22 +194,26 @@ module Markdown
            logger.level = Logger::DEBUG
         end
  
-   ## todo: add #{Markdown.lib} to help message?? yes/no
  
+        usage =<<EOS
+
+markdown - Lets you convert plain text documents (#{Markdown.extnames.join(', ')}) to hypertext (.html) with your Markdown engine of choice (#{Markdown.lib}).
+
+#{cmd.help}
+
+Examples:
+  markdown                   # Process all documents in working folder (that is, .)
+  markdown ruby_tut          # Process document or folder using Markdown
+  markdown ruby_tut.text     # Process document using Markdown
+  markdown -o site ruby_tut  # Output documents to site folder
+
+Further information:
+  http://geraldb.github.com/markdown
+  
+EOS
+
         cmd.on_tail( "-h", "--help", "Show this message" ) do
-           puts 
-           puts "markdown - Lets you convert plain text documents (#{DEFAULT_MARKDOWN_EXTENSIONS.join(', ')}) to hypertext (.html) with your Markdown engine of choice."
-           puts
-           puts cmd.help
-           puts
-           puts "Examples:"
-           puts "  markdown                   # Process all documents in working folder (that is, .)"
-           puts "  markdown ruby_tut          # Process document or folder using Markdown"
-           puts "  markdown ruby_tut.text     # Process document using Markdown"
-           puts "  markdown -o site ruby_tut  # Output documents to site folder"
-           puts
-           puts "Further information:"
-           puts "  http://geraldb.github.com/markdown" 
+           puts usage
            exit
         end
       end

data/lib/markdown/wrapper.rb

@@ -26,15 +26,22 @@ module Markdown
 
   @@config = nil
   
-  def self.lib( value = nil )
-    if value.nil?    
-      if @@config.nil?
-        @@config = Config.new
-      end
-      @@config.markdown_lib
-    else
-      ## todo: lets you select your library
+  def self.lib=( value )
+      ## todo: lets you select your library    
+  end
+  
+  def self.lib
+    if @@config.nil?
+      @@config = Config.new
+    end
+    @@config.markdown_lib
+  end
+  
+  def self.extnames
+    if @@config.nil?
+      @@config = Config.new
     end
+    @@config.markdown_extnames
   end
   
   def self.new( content, options={} )

data/test/test_kramdown.rb

@@ -18,7 +18,7 @@ require 'lib/markdown'
 class TestKramdown < Test::Unit::TestCase
   
   def setup
-    Markdown.lib( 'kramdown' )
+    Markdown.lib = 'kramdown'
   end
   
   def test_lib

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: markdown
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 792793622
+  prerelease: 6
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  - beta
+  - 1
+  version: 0.2.0.beta1
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,12 +17,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-02 00:00:00 Z
+date: 2012-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: kramdown
+  name: props
   prerelease: false
   requirement: &id001 !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: *id001
+- !ruby/object:Gem::Dependency 
+  name: kramdown
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,11 +50,11 @@ dependencies:
         - 6
         version: 0.13.6
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +65,11 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,7 +80,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Markdown Engine Wrapper - Use Your Markdown Library of Choice
 email: webslideshow@googlegroups.com
 executables: 
@@ -110,12 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: markdown