markd 0.1.2 → 0.2.0

data/Gemfile

@@ -4,8 +4,6 @@ gem "bluecloth"
 gem "nokogiri"
 
 group :development do
-  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
 end

data/README.md

@@ -1,9 +1,9 @@
 markd
 ===========================
-markd is rich html builder for markdown, and is especially focused on printing purpose.
+markd is rich html builder for markdown, wiki and textile format. It is especially focused on printing purpose.
 You can get well-formatted printings (or PDF by preview) when you print html using modern browser (such as Google Chrome, Firefox, Safari).
 
-markd is based on [bluecloth][1] and [google code prittify][2].
+markd is based on [BlueCloth][1], [RedCloth][2], [Wikitext][3] and [google code prittify][4].
 
 features:
 
@@ -13,7 +13,9 @@ features:
  - Code Highlighting
 
 [1]: http://deveiate.org/projects/BlueCloth
-[2]: http://code.google.com/p/google-code-prettify/
+[2]: http://redcloth.org/
+[3]: https://wincent.com/products/wikitext
+[4]: http://code.google.com/p/google-code-prettify/
 
 
 ## Installation
@@ -34,19 +36,28 @@ Use -h (or --help) option to show detail.
 
     $ markd -h
 
+## Engines
+markd has three engines:
+
+ - Markdown (default)
+ - Textile
+ - Wiki
+
+markd automatically select engine by file extention (.md for Markdown, .textile for Textile, .wiki for Wiki).
+
 ## Instructions
 See more instructions:
 
- - [my blog post (in Japanese)][3]
+ - [my blog post (in Japanese)][5]
 
-[3]: http://opentechnica.blogspot.com/2011/08/markd.html
+[5]: http://opentechnica.blogspot.com/2011/08/markd.html
 
 ## License
 markd is released under the MIT license.
 
 ## Copyright
-Copyright (c) 2011 [daisuke sugimori][4] ([@daixque][5]).
+Copyright (c) 2011 [daisuke sugimori][6] ([@daixque][7]).
 
-[4]: http://blognewart.blogspot.com/
-[5]: http://twitter.com/daixque
+[6]: http://blognewart.blogspot.com/
+[7]: http://twitter.com/daixque
 

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "markd"
   gem.homepage = "http://github.com/daixque/markd"
   gem.license = "MIT"
-  gem.summary = %Q{html report builder for markdown}
-  gem.description = %Q{markd is html report builder for markdown. markd makes well-formatted html with CSS and prittfied code by Google Code Prettify.}
+  gem.summary = %Q{html report builder for markdown, textile and wiki}
+  gem.description = %Q{markd is html report builder for markdown, textile and wiki. markd makes well-formatted html with CSS and prittfied code by Google Code Prettify.}
   gem.email = "daixque@gmail.com"
   gem.authors = ["daisuke sugimori"]
   gem.executables << "markd"
@@ -34,14 +34,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/markd/engines.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+class MarkdownEngine
+  def initialize
+    require 'bluecloth'
+  end
+  
+  def to_html(src)
+    BlueCloth.new(src).to_html
+  end
+end
+
+class WikiEngine
+  def initialize
+    require 'wikitext'
+  end
+  
+  def to_html(src)
+    Wikitext::Parser.new.parse(src)
+  end
+end
+
+class TextileEngine
+  def initialize
+    require 'RedCloth'
+  end
+
+  def to_html(src)
+    RedCloth.new(src).to_html
+  end
+end

data/lib/markd/markd.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'markd/engines'
+require 'erubis'
+require 'nokogiri'
+
+class MarkD
+  ENGINES = {
+    /md/      => MarkdownEngine,
+    /wiki/    => WikiEngine,
+    /textile/ => TextileEngine,
+  }
+  ENGINES.default = MarkdownEngine
+  
+  def create_engine(extname)
+    ENGINES.each do |regex, engine|
+      return engine.new if regex =~ extname
+    end
+    ENGINES[nil].new
+  end
+  
+  def publish(filename, out_dir_path)
+    ext = File.extname(filename)
+    engine = create_engine ext
+    src = File.read filename
+    
+    # parse
+    @html = engine.to_html(src)
+    
+    doc = Nokogiri::HTML::Document.parse @html
+    @title = doc.css("h1:first").text
+    
+    # render
+    erb_src = File.read "#{APP_ROOT}/template/template.html.erb"
+    eruby = Erubis::Eruby.new(erb_src)
+    html = eruby.result(binding)
+    
+    # output
+    FileUtils.mkdir_p out_dir_path
+    File.open("#{out_dir_path}/index.html", "w") { |f| f.puts html }
+    dirs = ::RESOURCES.map { |d| "#{APP_ROOT}/template/#{d}"}
+    FileUtils.cp_r(dirs, out_dir_path)
+  end
+end

data/lib/markd.rb

@@ -2,11 +2,10 @@
 # -*- coding: utf-8 -*-
 
 require 'rubygems'
-require 'bluecloth'
-require 'erubis'
 require 'optparse'
 require 'fileutils'
-require 'nokogiri'
+
+require 'markd/markd'
 
 APP_NAME = 'markd'
 APP_ROOT = File.dirname File.expand_path(__FILE__ + "/..")
@@ -61,28 +60,8 @@ USAGE
     
     filename = argv.first
     force_exit("#{filename} not file or exists") unless File.file? filename
-    md_src = File.read filename
+    #md_src = File.read filename
     out_dir = @options[:out_dir] || "docs"
-    MarkD.new.publish(md_src, out_dir)
-  end
-end
-
-class MarkD
-  def publish(md_src, out_dir_path)
-    # parse
-    @md_html = BlueCloth.new(md_src).to_html
-    doc = Nokogiri::HTML::Document.parse @md_html
-    @title = doc.css("h1:first").text
-    
-    # render
-    erb_src = File.read "#{APP_ROOT}/template/template.html.erb"
-    eruby = Erubis::Eruby.new(erb_src)
-    html = eruby.result(binding)
-    
-    # output
-    FileUtils.mkdir_p out_dir_path
-    File.open("#{out_dir_path}/index.html", "w") { |f| f.puts html }
-    dirs = ::RESOURCES.map { |d| "#{APP_ROOT}/template/#{d}"}
-    FileUtils.cp_r(dirs, out_dir_path)
+    MarkD.new.publish(filename, out_dir)
   end
 end

data/markd.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{markd}
-  s.version = "0.1.2"
+  s.name = "markd"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["daisuke sugimori"]
-  s.date = %q{2011-08-26}
-  s.description = %q{markd is html report builder for markdown. markd makes well-formatted html with CSS and prittfied code by Google Code Prettify.}
-  s.email = %q{daixque@gmail.com}
+  s.date = "2012-02-27"
+  s.description = "markd is html report builder for markdown, textile and wiki. markd makes well-formatted html with CSS and prittfied code by Google Code Prettify."
+  s.email = "daixque@gmail.com"
   s.executables = ["markd", "markd"]
   s.extra_rdoc_files = [
     "README.md"
@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/markd",
     "lib/markd.rb",
+    "lib/markd/engines.rb",
+    "lib/markd/markd.rb",
     "markd.gemspec",
     "template/css/markd-print.css",
     "template/css/markd-screen.css",
@@ -36,11 +38,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_markd.rb"
   ]
-  s.homepage = %q{http://github.com/daixque/markd}
+  s.homepage = "http://github.com/daixque/markd"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{html report builder for markdown}
+  s.rubygems_version = "1.8.17"
+  s.summary = "html report builder for markdown, textile and wiki"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -49,27 +51,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_runtime_dependency(%q<bluecloth>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/template/template.html.erb

@@ -13,7 +13,7 @@
 
 <body>
   
-<%= @md_html %>
+<%= @html %>
 
 <script lang="text/javascript" src="js/jquery.min.js"></script>
 <script type="text/javascript" src="js/prettify.js"></script>

metadata

@@ -2,7 +2,7 @@
 name: markd
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - daisuke sugimori
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 Z
+date: 2012-02-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -45,20 +45,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,23 +66,11 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id007
-description: markd is html report builder for markdown. markd makes well-formatted html with CSS and prittfied code by Google Code Prettify.
+  version_requirements: *id005
+description: markd is html report builder for markdown, textile and wiki. markd makes well-formatted html with CSS and prittfied code by Google Code Prettify.
 email: daixque@gmail.com
 executables: 
 - markd
-- markd
 extensions: []
 
 extra_rdoc_files: 
@@ -106,6 +83,8 @@ files:
 - VERSION
 - bin/markd
 - lib/markd.rb
+- lib/markd/engines.rb
+- lib/markd/markd.rb
 - markd.gemspec
 - template/css/markd-print.css
 - template/css/markd-screen.css
@@ -130,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2320192445188682873
+      hash: -454336790150292475
       segments: 
       - 0
       version: "0"
@@ -143,9 +122,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: html report builder for markdown
+summary: html report builder for markdown, textile and wiki
 test_files: []