md2review 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0788a6609e5e81f082dbc5f14a51c28ce0c9ee5b
-  data.tar.gz: cffe67adf60805b44e796f1838b7635667bfa2f5
+  metadata.gz: 46c0ddf09e6f474c1b87f8016216dda28b433398
+  data.tar.gz: 66d5359d6f229a870d3eccf6825e5e52e8295426
 SHA512:
-  metadata.gz: b7bc540bd7a66dc33afcde5604338debeeab627896a7d3e090fb122990be66496da114f4de1e0f0c71bd5a945a98b4eba4ec6f4990aa203b72fb153f2f641c04
-  data.tar.gz: 549143a0c669ca9f091ed0c18904729c29b98b8f0724a706a9522b1649188263ba4696ad498dace68d9fac0bc239deb817b70ead97629efdabeed1d5f1242c3f
+  metadata.gz: e0cd14e69907497db4368507a813d27d21a8cd327baf520e478cba27a3250b9a68c621f4f60a082ba98bcc88bd19087c7e037ed90965b531915dfb78feafcd81
+  data.tar.gz: 425c784ed78be28a3d2f1ab3face88160f6b1f806a83c644e7cb29301f3ed801c24b342633d3c21d7c0f863524fff3299c35c90c40e955bd76e8f7fc97b42a67

data/.travis.yml

@@ -1,9 +1,12 @@
+language: ruby
 sudo: false
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.3
+  - 2.4.0
 
 branches:
   only:

data/README.md

@@ -27,6 +27,10 @@ You can use the commmand md2review as:
 
 ## History
 
+* 1.8.0
+    * add: option --version
+    * add: option --render-math to support `@<m>{...}` and `//texequation{\n...\n}\n`
+    * add: option --render-table-caption to support `Table: caption`
 * 1.7.0
     * fix: when href in emphasis (@hanachin)
     * fix: spaces before image block (@hanachin)

data/appveyor.yml

@@ -0,0 +1,21 @@
+---
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - bundle install
+build_script:
+  - bundle exec rake
+test_script:
+  - bundle exec rake test
+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"

data/bin/md2review

@@ -3,6 +3,10 @@
 # Convert one or more Markdown files to ReVIEW and write to standard output. With
 # no <file> or when <file> is '-', read Markdown source text from standard input.
 # With <extension>s, perform additional Markdown processing before writing output.
+
+require 'md2review'
+require 'md2review/version'
+
 if ARGV.include?('--help')
   File.read(__FILE__).split("\n").grep(/^# /).each do |line|
     puts line[2..-1]
@@ -37,13 +41,15 @@ ARGV.delete_if do |arg|
   elsif arg =~ /^--parse-([\w-]+)$/
     arg = $1.gsub('-', '_')
     parse_extensions[arg.to_sym] = true
+  elsif arg =~ /^--version$/
+    print MD2ReVIEW::VERSION, "\n"
+    exit
   else
     false
   end
 end
 
-render = renderer.new(render_extensions)
-md = Redcarpet::Markdown.new(render, parse_extensions)
+md = MD2ReVIEW::Markdown.new(render_extensions, parse_extensions)
 md_doc = ARGF.read
 review_doc = md.render(md_doc)
 STDOUT.write review_doc

data/lib/md2review.rb

@@ -1,7 +1,4 @@
-require "redcarpet-review/version"
+require 'md2review/markdown'
 
-module Redcarpet
-  module Review
-    # Your code goes here...
-  end
+module MD2ReVIEW
 end

data/lib/md2review/markdown.rb

@@ -0,0 +1,16 @@
+require 'redcarpet'
+require 'redcarpet/render/review'
+
+module MD2ReVIEW
+  class Markdown
+    def initialize(render_options, parser_options)
+      ## Redcarpet only
+      render = Redcarpet::Render::ReVIEW.new(render_options)
+      @markdown = Redcarpet::Markdown.new(render, parser_options)
+    end
+
+    def render(text)
+      @markdown.render(text)
+    end
+  end
+end

data/lib/md2review/version.rb

@@ -1,3 +1,3 @@
 module MD2ReVIEW
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/lib/redcarpet/render/review.rb

@@ -16,6 +16,9 @@ module Redcarpet
         end
         @links = {}
         @cmd = render_extensions[:enable_cmd]
+        @support_table_caption = render_extensions[:table_caption]
+        @table_caption = nil
+        @math = render_extensions[:math]
       end
 
       def normal_text(text)
@@ -44,6 +47,8 @@ module Redcarpet
 
         if @cmd && (language == "shell-session" || language == "console")
           "\n//cmd{\n#{code_text}\n//}\n"
+        elsif @math && language == "math"
+          "\n//texequation{\n#{code.chomp}\n//}\n"
         else
           "\n//emlist#{caption}{\n#{code_text}\n//}\n"
         end
@@ -102,7 +107,12 @@ module Redcarpet
           header_text = "#{header}-----------------\n"
         end
         body.chomp!
-        "//table[#{table_id()}][]{\n#{header_text}#{body}\n//}\n"
+        caption = nil
+        if @table_caption
+          caption = @table_caption.strip
+          @table_caption = nil
+        end
+        "//table[#{table_id()}][#{caption}]{\n#{header_text}#{body}\n//}\n"
       end
 
       def table_row(content)
@@ -162,7 +172,12 @@ module Redcarpet
       end
 
       def paragraph(text)
-        "\n\n#{text}\n\n"
+        if @support_table_caption && text =~ /\ATable:(.*)\z/
+          @table_caption = $1  ## and no output line
+          ""
+        else
+          "\n\n#{text}\n\n"
+        end
       end
 
       def list(content, list_type)
@@ -233,6 +248,11 @@ module Redcarpet
 
       def postprocess(text)
         text = text.gsub(%r|^[ \t]+(//image\[[^\]]+\]\[[^\]]+\]{$\n^//})|, '\1')
+        if @math
+          while %r|\$\$(.+?)\$\$| =~ text
+            text.sub!(%r|\$\$(.+?)\$\$|){ "@<m>{" + $1.gsub(/}/, "\\}") + "}" }
+          end
+        end
         text + @links.map { |key, link| footnote_def(link, key) }.join
       end
 

data/test/review_test.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# coding: utf-8
 rootdir = File.dirname(File.dirname(__FILE__))
 $LOAD_PATH.unshift "#{rootdir}/lib"
 
@@ -7,18 +7,17 @@ if defined? Encoding
 end
 
 require 'test/unit'
-require 'redcarpet'
-require 'redcarpet/render/review'
+require 'md2review'
+require 'md2review/markdown'
 
 class ReVIEWTest < Test::Unit::TestCase
 
   def setup
-    @markdown = Redcarpet::Markdown.new(Redcarpet::Render::ReVIEW.new({}))
+    @markdown = MD2ReVIEW::Markdown.new({},{})
   end
 
   def render_with(flags, text, render_flags = {})
-    renderer = Redcarpet::Render::ReVIEW.new(render_flags)
-    Redcarpet::Markdown.new(renderer, flags).render(text)
+    MD2ReVIEW::Markdown.new(render_flags, flags).render(text)
   end
 
   def test_that_simple_one_liner_goes_to_review
@@ -38,7 +37,7 @@ class ReVIEWTest < Test::Unit::TestCase
 
   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)
+    rd = MD2ReVIEW::Markdown.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
 
@@ -119,6 +118,28 @@ class ReVIEWTest < Test::Unit::TestCase
     assert_equal "//table[tbl1][]{\na\tb\tc\n-----------------\nA\tB\tC\n.\tB\tC\n..A\tB\tC\n//}\n", rd
   end
 
+  def test_table_with_caption
+    rd = render_with({:tables => true}, <<-EOB, {:table_caption => true})
+
+Table: caption test
+
+| a  |  b |  c |
+|----|----|----|
+| A  | B  | C  |
+|    | B  |  C |
+| .A | B  |  C |
+    EOB
+    assert_equal <<-EOB, rd
+//table[tbl1][caption test]{
+a\tb\tc
+-----------------
+A\tB\tC
+.\tB\tC
+..A\tB\tC
+//}
+EOB
+  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
@@ -153,6 +174,36 @@ class ReVIEWTest < Test::Unit::TestCase
     assert_equal %Q[\n\n昭和@<tcy>{53}年\n\n], rd
   end
 
+  def test_math
+    rd = render_with({}, "その結果、$$y=ax^2+bx+c$$の式が得られます。",{:math => true})
+    assert_equal %Q[\n\nその結果、@<m>{y=ax^2+bx+c}の式が得られます。\n\n], rd
+  end
+
+  def test_no_math
+    rd = render_with({}, "その結果、$$y=ax^2+bx+c$$の式が得られます。",{:math => false})
+    assert_equal %Q[\n\nその結果、$$y=ax^2+bx+c$$の式が得られます。\n\n], rd
+  end
+
+  def test_math_block
+    rd = render_with({:fenced_code_blocks => true}, <<-EOB,{:math => true})
+求める式は以下のようになります。
+
+```math
+\frac{n!}{k!(n-k)!} = \binom{n}{k}
+```
+EOB
+    assert_equal <<-EOB, rd
+
+
+求める式は以下のようになります。
+
+
+//texequation{
+\frac{n!}{k!(n-k)!} = \binom{n}{k}
+//}
+EOB
+  end
+
   def test_footnote
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -66,8 +66,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/md2review
 - lib/md2review.rb
+- lib/md2review/markdown.rb
 - lib/md2review/version.rb
 - lib/redcarpet/render/review.rb
 - md2review.gemspec
@@ -91,10 +93,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: a converter from Markdown to Re:VIEW
 test_files:
 - test/review_test.rb
-has_rdoc: