md2review 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe75be532aea31066a8d4d72bf8d374c5012f5d
-  data.tar.gz: 8c8cc8e6ea93aa0130e3ae829afa6493b277fdf4
+  metadata.gz: e89900431129c85303b2e0b6a88148e46aeaf0c8
+  data.tar.gz: a42c3ebdae24c58d1d94c316d2f7183a67211fc2
 SHA512:
-  metadata.gz: 6b2ca4b637fbf6d5d5841b6cf855dc4945373247925a941b6d45de53a0221237f05aff3688945952df3f6496032e9b43d36f75937f2b09e48507886c2c82d8e2
-  data.tar.gz: 0bf1477d3c85f553ffe5bf31678093b883e3cd45dd6ab21d8ae6a17c242c506ae08f8d80f04367b981e3a7b259c264b396d125f332078d2879b468fac6457b9d
+  metadata.gz: cfef0533c707cddc1ba28ccd5367f6977dd03b14ca9cf6475527e4b79b77985fb5aeb00f5d6668b092cbdd9420bc44f9595dbf41962dfc5ad037c16b28bfe8a7
+  data.tar.gz: 1b8f74362eb313400d83a6ed906ad73a0c429301adf2d6cda2b5c086c785248f9cbd4b93f94a992409f14da4bedbb735cdac91aa8b13eeca2171f928dcbd6192

data/lib/md2review/version.rb

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

data/lib/redcarpet/render/review.rb

@@ -95,7 +95,7 @@ module Redcarpet
 
       def image(link, title, alt_text)
         filename = File.basename(link,".*")
-        "//image[#{filename}][#{alt_text}]{\n//}"
+        "//image[#{filename}][#{alt_text}]{\n//}\n"
       end
 
       def autolink(link, link_type)
@@ -123,24 +123,39 @@ module Redcarpet
       end
 
       def paragraph(text)
-        "\n\n#{text}\n"
+        "\n\n#{text}\n\n"
       end
 
       def list(content, list_type)
-        case list_type
-        when :ordered
-          "\n#{content}\n"
-        when :unordered
-          "\n#{content}\n"
+        ret = ""
+        content.each_line do |item|
+          case list_type
+          when :ordered
+            if item =~ /^ +(\d+\.) (.*)/
+              ## XXX not support yet in Re:VIEW
+              ret << " #{$1} #{$2.chomp}" << "\n"
+            else
+              ret << " 1. " << item
+            end
+          when :unordered
+            if item =~ /^ (\*+) (.*)/
+              ret << " *#{$1} #{$2.chomp}" << "\n"
+            else
+              ret << " * " << item
+            end
+          end
         end
+        ret
       end
 
       def list_item(content, list_type)
         case list_type
         when :ordered
-          " 1. #{content.strip}\n"
+          item = content.gsub(/\n(\s+[^0-9])/){$1}.gsub(/\n(\s+[0-9]+[^.])/){$1}.strip
+          "#{item}\n"
         when :unordered
-          " * #{content.strip}\n"
+          item = content.gsub(/\n(\s*[^* ])/){$1}.strip
+          "#{item}\n"
         end
       end
 

data/test/review_test.rb

@@ -22,22 +22,35 @@ class ReVIEWTest < Test::Unit::TestCase
 
   def test_that_simple_one_liner_goes_to_review
     assert_respond_to @markdown, :render
-    assert_equal "\n\nHello World.\n", @markdown.render("Hello World.")
+    assert_equal "\n\nHello World.\n\n", @markdown.render("Hello World.\n")
   end
 
   def test_href
     assert_respond_to @markdown, :render
-    assert_equal "\n\n@<href>{http://exmaple.com,example}\n", @markdown.render("[example](http://exmaple.com)")
+    assert_equal "\n\n@<href>{http://exmaple.com,example}\n\n", @markdown.render("[example](http://exmaple.com)\n")
   end
 
   def test_href_with_comma
     assert_respond_to @markdown, :render
-    assert_equal "\n\n@<href>{http://exmaple.com/foo\\,bar,example}\n", @markdown.render("[example](http://exmaple.com/foo,bar)")
+    assert_equal "\n\n@<href>{http://exmaple.com/foo\\,bar,example}\n\n", @markdown.render("[example](http://exmaple.com/foo,bar)")
   end
 
   def test_header
     assert_respond_to @markdown, :render
-    assert_equal "\n= AAA\n\n\nBBB\n\n== ccc\n\n\nddd\n", @markdown.render("#AAA\nBBB\n\n##ccc\n\nddd\n")
+    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_nested_ulist
+    assert_equal " * aaa\n ** bbb\n * ccc\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")
+  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")
   end
 
   def test_code_fence_with_caption
@@ -47,21 +60,21 @@ class ReVIEWTest < Test::Unit::TestCase
 
   def test_code_fence_without_flag
     rd = render_with({}, %Q[~~~ {caption="test"}\ndef foo\n  p "test"\nend\n~~~\n])
-    assert_equal %Q[\n\n~~~ {caption="test"}\ndef foo\n  p "test"\nend\n~~~\n], rd
+    assert_equal %Q[\n\n~~~ {caption="test"}\ndef foo\n  p "test"\nend\n~~~\n\n], rd
   end
 
   def test_group_ruby
     rd = render_with({:ruby => true}, "{電子出版|でんししゅっぱん}を手軽に\n")
-    assert_equal %Q[\n\n@<ruby>{電子出版,でんししゅっぱん}を手軽に\n], rd
+    assert_equal %Q[\n\n@<ruby>{電子出版,でんししゅっぱん}を手軽に\n\n], rd
   end
 
   def test_tcy
     rd = render_with({:tcy => true}, "昭和^53^年\n")
-    assert_equal %Q[\n\n昭和@<tcy>{53}年\n], rd
+    assert_equal %Q[\n\n昭和@<tcy>{53}年\n\n], rd
   end
 
   def test_footnote
-    rd = render_with({:footnotes=>true}, "これは脚注付き[^1]の段落です。\n\n[^1]: そして、これが脚注です。\n")
-    assert_equal %Q|\n\nこれは脚注付き@<fn>{1}の段落です。\n\n//footnote[1][そして、これが脚注です。]\n|, rd
+    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
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet