conversio 0.1.1 → 0.1.2

data/CONTRIBUTORS

@@ -0,0 +1,2 @@
+Mykhaylo Zynovyev
+Dennis KLein

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 0.1.2
+
+* supporting files with suffix `.md`
+* fixing bug with input files without suffix
+* check that destination is a directory
+
 ## 0.1.1
 
 * finishing Kramdown support

data/README.md

@@ -2,11 +2,7 @@ Conversio by Jörg Behrendt and Victor Penso
 
 # Description
 
-Renders plain text files with [Markdown][1] syntax to XHTML pages. 
-User can define their own Ruby ERB templates to customize the 
-XHTML page generation. Also the creation of a table of content 
-using the HTML header elements (like `<h1>`) and the syntax
-high-lighting of code snippets is supported.
+Renders plain text files with [Markdown][1] syntax to XHTML pages.  User can define their own Ruby ERB templates to customize the XHTML page generation. Also the creation of a table of content using the HTML header elements (like `<h1>`) and the syntax high-lighting of code snippets is supported.
 
 ## Installation 
 
@@ -14,7 +10,7 @@ Conversio RubyGem:
 
     gem install conversio
 
-Syntax high-lighting is done with Pyhton [Pygments][2]:
+Syntax high-lighting is done with Phyton [Pygments][2]:
 
     easy_install pygments
 
@@ -24,9 +20,7 @@ Take a look to the help text:
 
     conversio -h
 
-Convert all files called `*.markdown` inside a defined directory 
-and all sub-directories into HTML and store the in the destination
-directory.
+Convert all files called `*.markdown` or `*.md` inside a defined directory and all sub-directories into HTML and store them in the destination directory.
 
     conversio ~/docs/path/to/files ~/public/path
 
@@ -35,6 +29,15 @@ using the 'dark' template:
 
     conversio -t -p dark readme.markdown
 
+### Syntax High-Lighting
+
+Using the `-c` option syntax colorization can be enabled. Conversio will inspect all code blocks for a syntax tag in the first line. This tag needs to be part of the code block (indented with four spaces) and is prefixed with two dashes followed by the language definition. For example to high-light a code block as Ruby write `--ruby` as first line or for C++ `--c++`. If this tag is not present Conversio will not apply any high-lighting. The tag itself is passes to Pygments, therefore any
+language supported by it can be high-lighted.
+
+For a list of supported languages type:
+
+    pygmentize -L lexers
+
 ## License
 
 GPLv3 - see the COPYING file.

data/bin/conversio

@@ -42,7 +42,10 @@ Options
 
 -c, --colorize:
 
-  Enable syntax high-lighting for marked code blocks.
+  Enable syntax high-lighting for taged code blocks. Tags need
+  to be in the first line of the code block and have the form
+  of two dashes followed by the language like '--ruby' or
+  '--c++'.
 
 -e, --engine:
 
@@ -104,15 +107,6 @@ def overwrite?(*str)
 end
 
 
-# -------------------------------------------------------------
-# class extensions
-# -------------------------------------------------------------
-
-class Array
-  def resolv_path
-    Hash[ *self.collect { |e| [e,e.gsub(/.markdown/,'.html') ] }.flatten ]
-  end
-end
 
 # -------------------------------------------------------------
 # main program
@@ -176,9 +170,12 @@ begin
   end
 
 
-  # get the input source
+  # get the input source 
   src = ARGV[0] || raise("no input defined")
-  dst = ARGV[1] # optional parameter!
+  unless ARGV[1].nil? 
+    raise('destination not a directory') unless File.directory?(ARGV[1])
+  end
+  dst = ARGV[1] 
 
   # read the default configuration of the user  
   if not options.ignore_config and  File.exists? user_config then
@@ -217,22 +214,32 @@ begin
   # get all the input files
   input_files = Array.new
   if File.directory?(src) then
-    input_files = Dir["#{src}/**/*.markdown"]
+    input_files = Dir["#{src}/**/*.markdown"] + Dir["#{src}/**/*.md"]
   else
     file = File.expand_path(src)
     input_files << file
     src = File.dirname(file) 
   end
-  src_dst_pairs = input_files.resolv_path
-  # fix the destination path if needed
+  sdp = Hash.new # source destination pairs
+  input_files.each do |s|
+    case s
+    when /.markdown/
+      sdp[s] = s.gsub(/.markdown/,'.html')
+    when /.md/
+      sdp[s] = s.gsub(/.md/,'.html')
+    else
+      # make sure we have the always the right suffix
+      sdp[s] = s << '.html'
+    end
+  end
   unless dst.nil? then
-    src_dst_pairs.each_pair do |src_path,dst_path|
-      src_dst_pairs[src_path] = dst_path.gsub(/#{src}/,dst)      
+    sdp.each_pair do |s,d|
+      sdp[s] = d.gsub(/#{src}/,dst)      
     end
   end
   # render the XHTML docs
   STDERR.puts 'Created files:' if options.verbose
-  src_dst_pairs.each_pair do |s,d| 
+  sdp.each_pair do |s,d|
     converter.markdown_to_xhtml(s,d)
     STDERR.print '  ', d, "\n" if options.verbose
   end

data/conversio.gemspec

@@ -3,11 +3,11 @@
 Gem::Specification.new do |s|
   
 s.name = %q{conversio}
-s.version = "0.1.1"
+s.version = "0.1.2"
 
 s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
 s.authors = ["Jörg Behrendt","Victor Penso"]
-s.date = %q{2010-11-19}
+s.date = %q{2010-12-10}
 s.default_executable = %q{conversio}
 s.homepage = 'https://github.com/vpenso/conversio'
 
@@ -29,6 +29,7 @@ s.extra_rdoc_files = [
   "lib/conversio/pygmentizer.rb"
 ]
 s.files = [
+  'CONTRIBUTORS', 
   "README.md", 
   "HISTORY.md", 
   "bin/conversio", 
@@ -49,7 +50,7 @@ s.rubygems_version = %q{1.3.6}
 s.summary = %q{Renders Markdown plain text files to HTML}
 
 s.add_dependency('bluecloth', '>= 2.0.9')
-s.add_dependency('kramdown')
+s.add_dependency('kramdown', '>= 0.6.0')
 s.requirements << 'Pygments  (http://pygments.org/)'
 s.licenses = 'GPLv3'
 

data/lib/conversio/converter.rb

@@ -2,36 +2,6 @@ require 'fileutils'
 
 module Conversio
 
-class Hash
-
- def deep_merge(hash)
-    target = dup
-    
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge(hash[key])
-        next
-      end
-      
-      target[key] = hash[key]
-    end
-    
-    target
-  end
-
-
-  def deep_merge!(second)
-    second.each_pair do |k,v|
-      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
-        self[k].deep_merge!(second[k])
-      else
-        self[k] = second[k]
-      end
-    end
-  end
-end
-
-
 class Converter
 
   attr_accessor :table_of_content, :color
@@ -40,11 +10,6 @@ class Converter
     @template = template
     @table_of_content = false
     @color = false
-    #user_config = "#{ENV['HOME']}/.conversiorc"
-    #if File.exists?(user_config)
-      # overwrite defaults
-      #@meta_data = @meta_data.deep_merge(YAML.load_file(user_config))
-    #end
     # Holds the input Markdown plain text
     @source = nil
     # Hold Markdown rendered to HTML
@@ -85,25 +50,6 @@ class Converter
 
   private
 
-  def configure()
-    config = nil
-    # read the header of the source file
-    start = @source.index("|--")
-    ende = @source.index("--|")
-    #if start != nil and ende != nil then
-    if false
-      STDERR.puts 'Meta data found in file!' if $DEBUG
-      yamlheader = @source[start+3,ende-start-3]
-      # overwrite defaults
-      config = @meta_data.deep_merge(YAML.load(yamlheader))
-      splitted =  @source.split('--|',2)
-      @source = splitted[1]
-    else
-      config = @meta_data
-    end
-    return config
-  end
-
   def load_template(tpl)
     puts "Loading template : "+tpl.to_s
     raise "Couldn't open ERB template: #{tpl}" unless File.exists?(File.expand_path(tpl))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - "J\xC3\xB6rg Behrendt"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +01:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: conversio
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id002
 description: |
@@ -63,6 +65,7 @@ extra_rdoc_files:
 - lib/conversio/htmltoc.rb
 - lib/conversio/pygmentizer.rb
 files: 
+- CONTRIBUTORS
 - README.md
 - HISTORY.md
 - bin/conversio