md2review 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c560a9be30a083529292ae26d7a45d9fced085d
-  data.tar.gz: 7ab713f3fda9726c9d138bfe418ef52c57ae2d56
+  metadata.gz: daa4fc112578f2e831f799f507fbb6422c85c8e8
+  data.tar.gz: 14f3cd47c2e1299f174480052bf11f37bf10e6bf
 SHA512:
-  metadata.gz: '00689ab7e51fca52eae36f9137fbed5fde4f90d142b6bdc0e241301023caafb31996441ec4caa7eca3b2ebabc6fa457ba8cafd9607d4bac0cad37f0c7a57b4dd'
-  data.tar.gz: 352be9cc2485f702ddfae7ebddaf941175e7e3f9e3aa93ab53bd3843111634eb9cd343ed953421e0482bdd0954b31f7d1758338c741c479cb23fc3fa13cd9517
+  metadata.gz: e583507badaf5e273e48f0ad787684bf9101f871efc77af533e618a7fba81f033e478ae8497f4b6af22f243221505a5d93c087b536d8283bcce7337ad9c38031
+  data.tar.gz: 3d6dabfe248a4788a75ec43ab2cd765a348ca9b0b35957ecdfb7e43bcab6246f8febeb78cbe71120057656e3a9662bea2479e3d67f49062a5031b7edd1fdc2a1

data/.rubocop.yml

@@ -5,14 +5,14 @@ AllCops:
 Style/HashSyntax:
   Enabled: true
 
-Style/EmptyLines:
+Layout/EmptyLines:
   Enabled: true
 
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   Enabled: true
 
-Style/TrailingWhitespace:
-  Enabled: true
+Layout/TrailingWhitespace:
+  Enabled: false
 
 Style/MethodDefParentheses:
   Enabled: true
@@ -24,7 +24,7 @@ Style/BarePercentLiterals:
 
 # EnforcedStyle: empty_lines => 16 offenses
 # EnforcedStyle: no_empty_lines => 0 offense
-Style/EmptyLinesAroundBlockBody:
+Layout/EmptyLinesAroundBlockBody:
   EnforcedStyle: no_empty_lines
   Enabled: true
 
@@ -36,12 +36,12 @@ Style/MethodName:
   EnforcedStyle: snake_case
   Enabled: true
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
   EnforcedStyleForEmptyBraces: no_space
   Enabled: true
 
-Style/SpaceInsideStringInterpolation:
+Layout/SpaceInsideStringInterpolation:
   EnforcedStyle: no_space
   Enabled: true
 

data/.travis.yml

@@ -3,15 +3,15 @@ sudo: false
 
 
 before_install:
-  - gem update --system
-  - gem update bundler
+#  - gem update --system
+#  - gem update bundler
 
 rvm:
   - 2.0
   - 2.1
   - 2.2
   - 2.3.3
-  - 2.4.0
+  - 2.4.2
 
 branches:
   only:

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem "redcarpet", git: 'https://github.com/gnue/redcarpet.git', branch: 'denden'
+gem 'coveralls', require: false

data/README.md

@@ -43,6 +43,9 @@ Or install it yourself as:
 
 ## History
 
+### v1.12.0
+* fix: anchor content should be escaped
+
 ### v1.11.0
 * add: option --empty-image-caption: switch to use `//image` or `//indepimage` with caption
 

data/bin/md2review

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# Usage: redcarpet [--parse-<extension>...] [--render-<extension>...] [--smarty] [<file>...]
-# Convert one or more Markdown files to ReVIEW and write to standard output. With
+# Usage: md2review [--parse-<extension>...] [--render-<extension>...] [<file>...]
+# 
+# Convert one or more Markdown files to Re:VIEW 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.
 

data/lib/md2review/version.rb

@@ -1,3 +1,3 @@
 module MD2ReVIEW
-  VERSION = "1.11.0"
+  VERSION = "1.12.0"
 end

data/lib/redcarpet/render/review.rb

@@ -68,9 +68,10 @@ module Redcarpet
         text.to_s.gsub(/,/){ '\\,' }
       end
 
+      alias_method :escape_comma, :escape_href
+
       def block_code(code, language)
         code_text = normal_text(code).chomp
-        lang = ""
         caption = ""
         if language
           if language =~ /caption=\"(.*)\"/
@@ -130,7 +131,9 @@ module Redcarpet
         when 6
           buf << "\n====== #{title}\n"
         else
+          # :nocov:
           raise "too long header"
+          # :nocov:
         end
         buf
       end
@@ -189,7 +192,7 @@ module Redcarpet
           footnotes(content) + footnote_ref(key)
         else
           content = escape_inline(remove_inline_markups(content))
-          "@<href>{#{escape_href(link)},#{content}}"
+          "@<href>{#{escape_href(link)},#{escape_comma(content)}}"
         end
       end
 
@@ -236,7 +239,9 @@ module Redcarpet
               ret << " * " << item
             end
           else
+            # :nocov:
             raise "invalid type: #{list_type}"
+            # :nocov:
           end
         end
         ret << "\n"
@@ -255,7 +260,9 @@ module Redcarpet
           item = content.gsub(/\n(\s*[^* ])/){ $1 }.strip
           "#{item}\n"
         else
+          # :nocov:
           raise "invalid type: #{list_type}"
+          # :nocov:
         end
       end
 

data/test/review_test.rb

@@ -2,6 +2,9 @@
 rootdir = File.dirname(File.dirname(__FILE__))
 $LOAD_PATH.unshift "#{rootdir}/lib"
 
+require 'coveralls'
+Coveralls.wear!
+
 if defined? Encoding
   Encoding.default_internal = 'UTF-8'
 end
@@ -35,6 +38,11 @@ class ReVIEWTest < Test::Unit::TestCase
     assert_equal "\n\n@<href>{http://exmaple.com/foo\\,bar,example}\n\n", @markdown.render("[example](http://exmaple.com/foo,bar)")
   end
 
+  def test_href_with_comma2
+    assert_respond_to @markdown, :render
+    assert_equal "\n\n@<href>{http://exmaple.com/foo,bar\\,example}\n\n", @markdown.render("[bar,example](http://exmaple.com/foo)")
+  end
+
   def test_href_in_footnote
     text = %Q[aaa [foo](http://example.jp/foo), [bar](http://example.jp/bar), [foo2](http://example.jp/foo)]
     rd = MD2ReVIEW::Markdown.new({link_in_footnote: true},{}).render(text)
@@ -63,11 +71,21 @@ 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_header34
+    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")
+  end
+
   def test_header56
     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")
   end
 
+  def test_header_offset
+    rev = render_with({}, "###test\n", {header_offset: 2})
+    assert_equal "\n= test\n", rev
+  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")
@@ -261,4 +279,41 @@ EOB
     assert_equal %Q[\n\nリンクの@<href>{http://example.jp/test,テスト}です。\nhttp://example.jp/test2/\n\n], rd
   end
 
+  def test_block_quote
+    expected = <<-EOB
+
+//quote{
+test
+test2
+
+//}
+    EOB
+    assert_equal expected, @markdown.render("> test\n> test2\n> \n")
+  end
+
+  def test_block_html
+    expected = <<-EOB
+
+//emlist{
+XXX: BLOCK_HTML: YOU SHOULD REWRITE IT
+<div>
+test
+</div>
+//}
+    EOB
+    assert_equal expected, @markdown.render("<div>\ntest\n</div>\n")
+  end
+
+  def test_hr
+    expected = <<-EOB
+
+//hr
+    EOB
+    assert_equal expected, @markdown.render("***\n")
+  end
+
+  def test_strikethrough
+    rd = render_with({strikethrough: true}, "~~test~~ ~~test2~~\n")
+    assert_equal "\n\n@<del>{test} @<del>{test2}\n\n", rd
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: a converter from Markdown to Re:VIEW