md2review 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c33fd9405522deed97226f68c102915fc82a265
-  data.tar.gz: 16c2bf470421be818b4880b60b6f90f1f4620018
+  metadata.gz: 0788a6609e5e81f082dbc5f14a51c28ce0c9ee5b
+  data.tar.gz: cffe67adf60805b44e796f1838b7635667bfa2f5
 SHA512:
-  metadata.gz: be1a2406bb5dd4e9602839c80c3fc2c16f11bfd785565f1dc2e4045138fe86756399a167be20e8d6fad7863dc26c5d0a452b72154e409c2140b4b887806ed025
-  data.tar.gz: f429bbc5a6020373cb03035175f20a8fa4097e24b9f475ec2c58dd50d8ce0001dc05e24833c78690176b2340afd8e437b3d49a8fe401886d3f376b792564e190
+  metadata.gz: b7bc540bd7a66dc33afcde5604338debeeab627896a7d3e090fb122990be66496da114f4de1e0f0c71bd5a945a98b4eba4ec6f4990aa203b72fb153f2f641c04
+  data.tar.gz: 549143a0c669ca9f091ed0c18904729c29b98b8f0724a706a9522b1649188263ba4696ad498dace68d9fac0bc239deb817b70ead97629efdabeed1d5f1242c3f

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 rvm:
   - 1.9.3
   - 2.0.0

data/README.md

@@ -27,6 +27,10 @@ You can use the commmand md2review as:
 
 ## History
 
+* 1.7.0
+    * fix: when href in emphasis (@hanachin)
+    * fix: spaces before image block (@hanachin)
+    * fix: remove inline markup in href content (@hanachin)
 * 1.6.0
     * special attribute in header need a separator(U+0020) to distinguish from Re:VIEW inline markup
       (reported by @himajin315 and @yasulab)

data/lib/md2review/version.rb

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

data/lib/redcarpet/render/review.rb

@@ -140,7 +140,8 @@ module Redcarpet
           @links[key] ||= link
           footnotes(content) + footnote_ref(key)
         else
-          "@<href>{#{escape_href(link)},#{escape_inline(content)}}"
+          content = escape_inline(remove_inline_markups(content))
+          "@<href>{#{escape_href(link)},#{content}}"
         end
       end
 
@@ -149,7 +150,7 @@ module Redcarpet
       end
 
       def emphasis(text)
-        "@<b>{#{escape_inline(text)}}"
+        sandwitch_link('b', text)
       end
 
       def strikethrough(text)
@@ -231,8 +232,23 @@ module Redcarpet
       end
 
       def postprocess(text)
+        text = text.gsub(%r|^[ \t]+(//image\[[^\]]+\]\[[^\]]+\]{$\n^//})|, '\1')
         text + @links.map { |key, link| footnote_def(link, key) }.join
       end
+
+      def remove_inline_markups(text)
+        text.gsub(/@<(?:b|strong|tt)>{([^}]*)}/, '\1')
+      end
+
+      def sandwitch_link(op, text)
+        head, match, tail = text.partition(/@<href>{(?:\\,|[^}])*}/)
+
+        if match.empty? && tail.empty?
+          return "@<#{op}>{#{escape_inline(text)}}"
+        end
+
+        sandwitch_link(op, head) + match + sandwitch_link(op, tail)
+      end
     end
   end
 end

data/test/review_test.rb

@@ -42,6 +42,23 @@ class ReVIEWTest < Test::Unit::TestCase
     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_href_with_emphasised_anchor
+    assert_equal "\n\n@<href>{http://exmaple.com/,example}\n\n", @markdown.render("[*example*](http://exmaple.com/)")
+  end
+
+  def test_href_with_double_emphasised_anchor
+    assert_equal "\n\n@<href>{http://exmaple.com/,example}\n\n", @markdown.render("[**example**](http://exmaple.com/)")
+  end
+
+  def test_href_with_codespan_anchor
+    assert_equal "\n\n@<href>{http://exmaple.com/,example}\n\n", @markdown.render("[`example`](http://exmaple.com/)")
+  end
+
+  def test_emphasis_with_href
+    assert_respond_to @markdown, :render
+    assert_equal "\n\n@<b>{{hello\\} }@<href>{http://exmaple.com/foo\\,bar,example}@<b>{ world}\n\n", @markdown.render("*{hello} [example](http://exmaple.com/foo,bar) world*")
+  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")
@@ -67,6 +84,10 @@ class ReVIEWTest < Test::Unit::TestCase
     assert_equal "\n\n//image[image][test]{\n//}\n\n\n", @markdown.render("![test](path/to/image.jpg)\n")
   end
 
+  def test_indented_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -97,3 +97,4 @@ specification_version: 4
 summary: a converter from Markdown to Re:VIEW
 test_files:
 - test/review_test.rb
+has_rdoc: