md2review 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1044d852345e611794a38f4bc2cd8053f668c8a
-  data.tar.gz: 9f0343040dcb3e15a05ac4830b13a5eb828cf946
+  metadata.gz: 0b0c25dd78674626ae763d7e22a3d0f3bb0d1bbe
+  data.tar.gz: a20ad0bfc4b7a8cc8911fe45e62c463b9a6e809c
 SHA512:
-  metadata.gz: a14a611b1e9349247fa8a66ac4e0357022754c0b879245a74caad1b8251571aebfdf8c253bd294f8f22536ef1710440ba135cb5f558d99e727add5ebc8dafb53
-  data.tar.gz: 1d2db2f93a8a6b47fc00d0c1006613b6d627d4732dea754635682cf222bd677b243d47b5d6ba63056af85fadcefadab3e312070c2d044d3bbc408781967ee904
+  metadata.gz: b6f7e6c11a967266328ad668175f77c3c8e66664e57a77d7a421a2037ffaf54ca8af49090dfd69ac8084258a3bef3db913e0cb4f6e8abee1b17ec8e97cb2c48c
+  data.tar.gz: 839647f7b807bff78490e84b5f2665cffb33c83fb298f446a9a31d18b5b6affd1b09c581532147d17930182c4f1fb6d162a468b205b4c6abccb1e10c94e2811f

data/README.md

@@ -5,6 +5,26 @@
 md2review is a CLI tool to convert from Markdown into Re:VIEW (http://reviewml.org/ ).
 This command uses Redcarpet gem to parse markdown.
 
+## Usage
+
+You can use the commmand md2review as:
+
+    $ md2review [options] your-document.md > your-document.re
+
+### Options
+
+* `--version`: show version
+* `--help`: show help
+* `--render-header-offset = N`: use offset of header levels
+* `--render-disable-image-caption`: disable image caption; coverting into `//indepimage`
+* `--render-link-in-footnote`: enable links in footnote.
+* `--render-enable-cmd`: support `//cmd{...//}` for `shell-session` and `console` blocks
+* `--render-math`: support `@<m>{...}` and `//texequation{...}`
+* `--render-table-cation`: support table caption before table like `Table: some captions`
+* `--parse-no-intra-emphasis`: do not parse emphasis inside of words.
+* `--parse-autolink`: parse links even when they are not enclosed in `<>` characters.
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -19,14 +39,13 @@ Or install it yourself as:
 
     $ gem install md2review
 
-## Usage
-
-You can use the commmand md2review as:
-
-    $ md2review your-document.md > your-document.re
-
 ## History
 
+* 1.10.0
+    * add: option --image-table to support `//imgtable` with `![Table:foo](...)`
+    * fix: olist before/after ulist
+* 1.9.0
+    * fix: fix math support for complex cases
 * 1.8.0
     * add: option --version
     * add: option --render-math to support `@<m>{...}` and `//texequation{\n...\n}\n`

data/appveyor.yml

@@ -1,21 +1,28 @@
 ---
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - ruby --version
-  - gem --version
   - bundle install
-build_script:
-  - bundle exec rake
+
+build: off
+
 test_script:
   - bundle exec rake test
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
 artifacts:
   - path: pkg\*.gem
 
 environment:
   matrix:
-    - ruby_version: "200"
-    - ruby_version: "200-x64"
     - ruby_version: "21"
     - ruby_version: "21-x64"
     - ruby_version: "22"
     - ruby_version: "22-x64"
+    - ruby_version: "23"
+    - ruby_version: "23-x64"
+
+skip_branch_with_pr: true

data/lib/md2review/version.rb

@@ -1,3 +1,3 @@
 module MD2ReVIEW
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/lib/redcarpet/render/review.rb

@@ -11,6 +11,7 @@ module Redcarpet
         @header_offset = 0
         @link_in_footnote = render_extensions[:link_in_footnote]
         @image_caption = !render_extensions[:disable_image_caption]
+        @image_table = render_extensions[:image_table]
         if render_extensions[:header_offset]
           @header_offset = render_extensions[:header_offset]
         end
@@ -20,6 +21,7 @@ module Redcarpet
         @table_caption = nil
         @math = render_extensions[:math]
         @math_buf = []
+        @sep = nil
       end
 
       def preprocess(text)
@@ -160,7 +162,10 @@ module Redcarpet
 
       def image(link, title, alt_text)
         filename = File.basename(link, ".*")
-        if @image_caption
+        if @image_table && alt_text =~ /\ATable:\s*(.*)/
+          caption = $1
+          "//imgtable[#{filename}][#{caption}]{\n//}\n"
+        elsif @image_caption
           "//image[#{filename}][#{alt_text}]{\n//}\n"
         else
           "//indepimage[#{filename}]\n"
@@ -228,6 +233,7 @@ module Redcarpet
             raise "invalid type: #{list_type}"
           end
         end
+        ret << "\n"
         ret
       end
 

data/test/review_test.rb

@@ -92,25 +92,34 @@ class ReVIEWTest < Test::Unit::TestCase
     assert_equal "\n\n//indepimage[image]\n\n\n", rev
   end
 
+  def test_image_table
+    rev = render_with({}, "![Table:test](path/to/image.jpg)\n",{:image_table => true})
+    assert_equal "\n\n//imgtable[image][test]{\n//}\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")
+    assert_equal " * aaa\n ** bbb\n * ccc\n\n", @markdown.render("- aaa\n  - bbb\n- ccc\n")
   end
 
   def test_olist
-    assert_equal " 1. aaa\n 1. bbb\n 1. ccc\n", @markdown.render("1. aaa\n2. bbb\n3. ccc\n")
+    assert_equal " 1. aaa\n 1. bbb\n 1. ccc\n\n", @markdown.render("1. aaa\n2. bbb\n3. ccc\n")
   end
 
   def test_nested_olist
     ## XXX not support yet in Re:VIEW
-    assert_equal " 1. aaa\n 1. bbb\n 1. ccc\n", @markdown.render("1. aaa\n   2. bbb\n3. ccc\n")
+    assert_equal " 1. aaa\n 1. bbb\n 1. ccc\n\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")
+    assert_equal " 1. aaa@<icon>{foo}\n 1. bbb\n 1. ccc\n\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")
+    assert_equal " 1. aaa@<br>{}@<icon>{foo}\n 1. bbb\n 1. ccc\n\n", @markdown.render("1. aaa  \n    ![test](foo.jpg)\n2. bbb\n3. ccc\n")
+  end
+
+  def test_olist_and_ulist
+    assert_equal " * ddd\n\n 1. aaa\n 1. bbb\n 1. ccc\n\n * eee\n\n", @markdown.render("* ddd\n\n1. aaa\n2. bbb\n3. ccc\n\n* eee\n")
   end
 
   def test_table_with_empty_cell
@@ -231,4 +240,15 @@ EOB
     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
+
+  def test_autolink
+    rd = render_with({:autolink => true}, "リンクの[テスト](http://example.jp/test)です。\nhttp://example.jp/test2/\n")
+    assert_equal %Q[\n\nリンクの@<href>{http://example.jp/test,テスト}です。\n@<href>{http://example.jp/test2/}\n\n], rd
+  end
+
+  def test_no_autolink
+    rd = render_with({}, "リンクの[テスト](http://example.jp/test)です。\nhttp://example.jp/test2/\n")
+    assert_equal %Q[\n\nリンクの@<href>{http://example.jp/test,テスト}です。\nhttp://example.jp/test2/\n\n], rd
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet