md2review 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57ec7a51d60f3ee878b3744a749f25aa3d5567a
-  data.tar.gz: 860a29d7751752ba1715da6b10b7e8e9f3a9c0f5
+  metadata.gz: 47cac18a12085d3bdb0239c62b58fe2dbe5555c8
+  data.tar.gz: fbc94b20594d10698e9c9ec17b30c6267472357c
 SHA512:
-  metadata.gz: 15bb56747f0611da2a5d34e6f59a163d3029a19cfb477df6936af6f9a7639298d0ee87edf8b0765b829f6fbe1c78267faf2442a5c8a2098106c61fd97dd1f052
-  data.tar.gz: 6f6f179e177c34a40cf0d000033ace1cf1bc04d28c9f158e3e63073bd5e38f7baa0d35d748225fc4a80a400c7b97af275a2cb840e3f36cba037585b0ced0a5e8
+  metadata.gz: 2a3c26c36591f4f5c3dd632b8a4d0ddbe00513253a1bfcaf48775659479105cce2beca2c1b25f54c1f597fceb2654f6fe4ea84070ded41e4e0bf1ae48e493139
+  data.tar.gz: e62530cb1aebdac4ee717c18d3acae3aedea6ddeb2e05f9774e76cf105e5d5cbc98d02325221d31ffb673a12e6757b4577b48fac89cdbfb993381e8d90217d67

data/README.md

@@ -25,6 +25,18 @@ You can use the commmand md2review as:
 
     $ md2review your-document.md > your-document.re
 
+## History
+
+* 1.4.0
+    * fix handling empty cell in //table
+    * support header attributes in PHP Markdown Extra
+* 1.3.0
+    * allow images in list items (with @<icon>)
+    * add option --disable-image-caption
+    * allow 6th header level
+    * add option --render-link-in-footnote (by @masarakki)
+    * support inline markup in footnote (by @hamano)
+
 ## Contributing
 
 1. Fork it

data/lib/md2review/version.rb

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

data/lib/redcarpet/render/review.rb

@@ -22,11 +22,11 @@ module Redcarpet
       end
 
       def escape_inline(text)
-        text.gsub(/\}/){'\\}'}
+        text.gsub(/\}/){ '\\}' }
       end
 
       def escape_href(text)
-        text.to_s.gsub(/,/){'\\,'}
+        text.to_s.gsub(/,/){ '\\,' }
       end
 
       def block_code(code, language)
@@ -45,7 +45,7 @@ module Redcarpet
 
       def block_quote(quote)
         quote_text = normal_text(quote).chomp
-        quote_text.gsub!(/\A\n\n/,'')
+        quote_text.gsub!(/\A\n\n/, '')
         "\n//quote{\n#{quote_text}\n//}\n"
       end
 
@@ -64,23 +64,29 @@ module Redcarpet
       end
 
       def header(title, level, anchor="")
+        buf = ""
+        if /\s*(\{.*?\})\s*$/ =~ title
+          buf << "\n#@# header_attribute: #{$1}"
+          title = $`
+        end
         l = level - @header_offset
         case l
         when 1
-          "\n= #{title}\n"
+          buf << "\n= #{title}\n"
         when 2
-          "\n== #{title}\n"
+          buf << "\n== #{title}\n"
         when 3
-          "\n=== #{title}\n"
+          buf << "\n=== #{title}\n"
         when 4
-          "\n==== #{title}\n"
+          buf << "\n==== #{title}\n"
         when 5
-          "\n===== #{title}\n"
+          buf << "\n===== #{title}\n"
         when 6
-          "\n====== #{title}\n"
+          buf << "\n====== #{title}\n"
         else
           raise "too long header"
         end
+        buf
       end
 
       def table(header, body)
@@ -101,11 +107,16 @@ module Redcarpet
       def table_cell(content, alignment)
         sep = @sep
         @sep = "\t"
+        if content == ""
+          content = "."
+        elsif content =~ /\A\./
+          content = "." + content
+        end
         "#{sep}#{content}"
       end
 
       def image(link, title, alt_text)
-        filename = File.basename(link,".*")
+        filename = File.basename(link, ".*")
         if @image_caption
           "//image[#{filename}][#{alt_text}]{\n//}\n"
         else
@@ -164,6 +175,8 @@ module Redcarpet
             else
               ret << " * " << item
             end
+          else
+            raise "invalid type: #{list_type}"
           end
         end
         ret
@@ -175,15 +188,17 @@ module Redcarpet
         }
         case list_type
         when :ordered
-          item = content.gsub(/\n(\s+[^0-9])/){$1}.gsub(/\n(\s+[0-9]+[^.])/){$1}.strip
+          item = content.gsub(/\n(\s+[^0-9])/){ $1 }.gsub(/\n(\s+[0-9]+[^.])/){ $1 }.strip
           "#{item}\n"
         when :unordered
-          item = content.gsub(/\n(\s*[^* ])/){$1}.strip
+          item = content.gsub(/\n(\s*[^* ])/){ $1 }.strip
           "#{item}\n"
+        else
+          raise "invalid type: #{list_type}"
         end
       end
 
-      def table_id()
+      def table_id
         @table_num += 1
         "#{@table_id_prefix}#{@table_num}"
       end
@@ -205,7 +220,7 @@ module Redcarpet
         "#{text}"
       end
 
-      def footnote_def(text,number)
+      def footnote_def(text, number)
         "\n//footnote[#{number}][#{text.strip}]\n"
       end
 

data/test/review_test.rb

@@ -52,6 +52,11 @@ class ReVIEWTest < Test::Unit::TestCase
     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_header_attributes
+    assert_respond_to @markdown, :render
+    assert_equal "\n\#@# header_attribute: {-}\n= AAA\n\n\#@# header_attribute: {\#foo .bar title=hoge}\n= BBB\n", @markdown.render("\#AAA  {-}\n\n\#BBB {\#foo .bar title=hoge}\n\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
@@ -82,6 +87,11 @@ class ReVIEWTest < Test::Unit::TestCase
     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_table_with_empty_cell
+    rd = render_with({:tables => true}, %Q[\n\n| a  |  b |  c |\n|----|----|----|\n| A  | B  | C  |\n|    | B  |  C |\n| .A | B  |  C |\n\n])
+    assert_equal "//table[tbl1][]{\na\tb\tc\n-----------------\nA\tB\tC\n.\tB\tC\n..A\tB\tC\n//}\n", rd
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet