md2review 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e89900431129c85303b2e0b6a88148e46aeaf0c8
-  data.tar.gz: a42c3ebdae24c58d1d94c316d2f7183a67211fc2
+  metadata.gz: a57ec7a51d60f3ee878b3744a749f25aa3d5567a
+  data.tar.gz: 860a29d7751752ba1715da6b10b7e8e9f3a9c0f5
 SHA512:
-  metadata.gz: cfef0533c707cddc1ba28ccd5367f6977dd03b14ca9cf6475527e4b79b77985fb5aeb00f5d6668b092cbdd9420bc44f9595dbf41962dfc5ad037c16b28bfe8a7
-  data.tar.gz: 1b8f74362eb313400d83a6ed906ad73a0c429301adf2d6cda2b5c086c785248f9cbd4b93f94a992409f14da4bedbb735cdac91aa8b13eeca2171f928dcbd6192
+  metadata.gz: 15bb56747f0611da2a5d34e6f59a163d3029a19cfb477df6936af6f9a7639298d0ee87edf8b0765b829f6fbe1c78267faf2442a5c8a2098106c61fd97dd1f052
+  data.tar.gz: 6f6f179e177c34a40cf0d000033ace1cf1bc04d28c9f158e3e63073bd5e38f7baa0d35d748225fc4a80a400c7b97af275a2cb840e3f36cba037585b0ced0a5e8

data/bin/md2review

@@ -17,17 +17,20 @@ require 'redcarpet'
 require 'redcarpet/render/review'
 
 render_extensions = {}
+render_extensions[:link_in_footnote] = false
 parse_extensions = {}
 parse_extensions[:tables] = true
 parse_extensions[:strikethrough] = true
 parse_extensions[:fenced_code_blocks] = true
-
+parse_extensions[:footnotes] = true
 
 renderer = Redcarpet::Render::ReVIEW
 
 ARGV.delete_if do |arg|
   if arg =~ /^--render-header-offset\s*=\s*([012])$/
     render_extensions[:header_offset] = $1.to_i
+  elsif arg =~ /^--render-disable-image-caption$/
+    render_extensions[:disable_image_caption] = true
   elsif arg =~ /^--render-([\w-]+)$/
     arg = $1.gsub('-', '_')
     render_extensions[arg.to_sym] = true

data/lib/md2review/version.rb

@@ -1,3 +1,3 @@
 module MD2ReVIEW
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/redcarpet/render/review.rb

@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 module Redcarpet
   module Render
     class ReVIEW < Base
@@ -7,9 +9,12 @@ module Redcarpet
         @table_num = 0
         @table_id_prefix = "tbl"
         @header_offset = 0
+        @link_in_footnote = render_extensions[:link_in_footnote]
+        @image_caption = !render_extensions[:disable_image_caption]
         if render_extensions[:header_offset]
           @header_offset = render_extensions[:header_offset]
         end
+        @links = {}
       end
 
       def normal_text(text)
@@ -69,6 +74,12 @@ module Redcarpet
           "\n=== #{title}\n"
         when 4
           "\n==== #{title}\n"
+        when 5
+          "\n===== #{title}\n"
+        when 6
+          "\n====== #{title}\n"
+        else
+          raise "too long header"
         end
       end
 
@@ -95,7 +106,11 @@ module Redcarpet
 
       def image(link, title, alt_text)
         filename = File.basename(link,".*")
-        "//image[#{filename}][#{alt_text}]{\n//}\n"
+        if @image_caption
+          "//image[#{filename}][#{alt_text}]{\n//}\n"
+        else
+          "//indepimage[#{filename}]\n"
+        end
       end
 
       def autolink(link, link_type)
@@ -103,7 +118,13 @@ module Redcarpet
       end
 
       def link(link, title, content)
-        "@<href>{#{escape_href(link)},#{escape_inline(content)}}"
+        if @link_in_footnote
+          key = Digest::MD5.hexdigest(link)
+          @links[key] ||= link
+          footnotes(content) + footnote_ref(key)
+        else
+          "@<href>{#{escape_href(link)},#{escape_inline(content)}}"
+        end
       end
 
       def double_emphasis(text)
@@ -149,6 +170,9 @@ module Redcarpet
       end
 
       def list_item(content, list_type)
+        content.gsub!(%r<\n//(image|indepimage)\[([^\]]*?)\][^\{]*({\n//})?\n>){
+          "@<icon>{"+$2+"}\n"
+        }
         case list_type
         when :ordered
           item = content.gsub(/\n(\s+[^0-9])/){$1}.gsub(/\n(\s+[0-9]+[^.])/){$1}.strip
@@ -176,14 +200,18 @@ module Redcarpet
       def footnote_ref(number)
         "@<fn>{#{number}}"
       end
+
       def footnotes(text)
         "#{text}"
       end
 
       def footnote_def(text,number)
-        "\n//footnote[#{number}][#{escape_inline(text).strip}]\n"
+        "\n//footnote[#{number}][#{text.strip}]\n"
       end
 
+      def postprocess(text)
+        text + @links.map { |key, link| footnote_def(link, key) }.join
+      end
     end
   end
 end

data/md2review.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["takahashimm@gmail.com"]
   gem.description   = %q{a converter from Markdown to Re:VIEW. It uses redcarpet.}
   gem.summary       = %q{a converter from Markdown to Re:VIEW}
-  gem.homepage      = ""
+  gem.homepage      = 'https://github.com/takahashim/md2review'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.add_dependency('redcarpet', '>2.0.0')
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit"
 end

data/test/review_test.rb

@@ -16,8 +16,9 @@ class ReVIEWTest < Test::Unit::TestCase
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::ReVIEW.new({}))
   end
 
-  def render_with(flags, text)
-    Redcarpet::Markdown.new(Redcarpet::Render::ReVIEW, flags).render(text)
+  def render_with(flags, text, render_flags = {})
+    renderer = Redcarpet::Render::ReVIEW.new(render_flags)
+    Redcarpet::Markdown.new(renderer, flags).render(text)
   end
 
   def test_that_simple_one_liner_goes_to_review
@@ -35,11 +36,31 @@ class ReVIEWTest < Test::Unit::TestCase
     assert_equal "\n\n@<href>{http://exmaple.com/foo\\,bar,example}\n\n", @markdown.render("[example](http://exmaple.com/foo,bar)")
   end
 
+  def test_href_in_footnote
+    text = %Q[aaa [foo](http://example.jp/foo), [bar](http://example.jp/bar), [foo2](http://example.jp/foo)]
+    rd = Redcarpet::Markdown.new(Redcarpet::Render::ReVIEW.new({:link_in_footnote => true})).render(text)
+    assert_equal %Q|\n\naaa foo@<fn>{3ccd7167b80081c737b749ad1c27dcdc}, bar@<fn>{9dcab303478e38d32d83ae19daaea9f6}, foo2@<fn>{3ccd7167b80081c737b749ad1c27dcdc}\n\n\n//footnote[3ccd7167b80081c737b749ad1c27dcdc][http://example.jp/foo]\n\n//footnote[9dcab303478e38d32d83ae19daaea9f6][http://example.jp/bar]\n|, rd
+  end
+
   def test_header
     assert_respond_to @markdown, :render
     assert_equal "\n= AAA\n\n\nBBB\n\n\n== ccc\n\n\nddd\n\n", @markdown.render("#AAA\nBBB\n\n##ccc\n\nddd\n")
   end
 
+  def test_header56
+    assert_respond_to @markdown, :render
+    assert_equal "\n===== AAA\n\n\nBBB\n\n\n====== ccc\n\n\nddd\n\n", @markdown.render("#####AAA\nBBB\n\n######ccc\n\nddd\n")
+  end
+
+  def test_image
+    assert_equal "\n\n//image[image][test]{\n//}\n\n\n", @markdown.render("![test](path/to/image.jpg)\n")
+  end
+
+  def test_indepimage
+    rev = render_with({}, "![test](path/to/image.jpg)\n",{:disable_image_caption => true})
+    assert_equal "\n\n//indepimage[image]\n\n\n", rev
+  end
+
   def test_nested_ulist
     assert_equal " * aaa\n ** bbb\n * ccc\n", @markdown.render("- aaa\n  - bbb\n- ccc\n")
   end
@@ -53,6 +74,14 @@ class ReVIEWTest < Test::Unit::TestCase
     assert_equal " 1. aaa\n 1. bbb\n 1. ccc\n", @markdown.render("1. aaa\n   2. bbb\n3. ccc\n")
   end
 
+  def test_olist_image
+    assert_equal " 1. aaa@<icon>{foo}\n 1. bbb\n 1. ccc\n", @markdown.render("1. aaa\n    ![test](foo.jpg)\n2. bbb\n3. ccc\n")
+  end
+
+  def test_olist_image2
+    assert_equal " 1. aaa@<br>{}@<icon>{foo}\n 1. bbb\n 1. ccc\n", @markdown.render("1. aaa  \n    ![test](foo.jpg)\n2. bbb\n3. ccc\n")
+  end
+
   def test_code_fence_with_caption
     rd = render_with({:fenced_code_blocks => true}, %Q[~~~ {caption="test"}\ndef foo\n  p "test"\nend\n~~~\n])
     assert_equal %Q[\n//emlist[test]{\ndef foo\n  p "test"\nend\n//}\n], rd
@@ -74,7 +103,7 @@ class ReVIEWTest < Test::Unit::TestCase
   end
 
   def test_footnote
-    rd = render_with({:footnotes=>true}, "これは脚注付き[^1]の段落です。\n\n\n[^1]: そして、これが脚注です。\n")
-    assert_equal %Q|\n\nこれは脚注付き@<fn>{1}の段落です。\n\n\n//footnote[1][そして、これが脚注です。]\n|, rd
+    rd = render_with({:footnotes=>true}, "これは*脚注*付き[^1]の段落です。\n\n\n[^1]: そして、これが脚注です。\n")
+    assert_equal %Q|\n\nこれは@<b>{脚注}付き@<fn>{1}の段落です。\n\n\n//footnote[1][そして、これが脚注です。]\n|, rd
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a converter from Markdown to Re:VIEW. It uses redcarpet.
 email:
 - takahashimm@gmail.com
@@ -58,7 +72,7 @@ files:
 - lib/redcarpet/render/review.rb
 - md2review.gemspec
 - test/review_test.rb
-homepage: ''
+homepage: https://github.com/takahashim/md2review
 licenses: []
 metadata: {}
 post_install_message: 
@@ -77,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: a converter from Markdown to Re:VIEW