tdiary-style-markdown 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813eba40c02dfa8d534b87fa14f7afa019b6c3e4
-  data.tar.gz: 66c14010055ff983960bc368eef48caa029a99e0
+  metadata.gz: b1dd6d50264ec4bae6f8952ca1bf62a071380fb5
+  data.tar.gz: 339b726f102c29bc76ba190ef06bac67a839032c
 SHA512:
-  metadata.gz: db1f5f7bb6dd4bfe204c4e37a6d08ce643fc166de0dd45dafed3588b9a3e3c50f9dde9967e9d6c1f2dd0cf62f44cc82266fa60172d80d2a5fc4878beb7a22ae9
-  data.tar.gz: 76ab1c326848a3a1b3eaad4be613d1d56bcfc465f61fbc4a4dfa02da2bd2e655fa0a3f586281a80a9f96118e403cde8ece8138604409a2a6fb8c7087d73aa182
+  metadata.gz: d8886a36942948a6f4dff4b48aa2c1ba508491db32c7f13bc3accef3ad8d3870b4f124068ecfc6c751562c63da45177757ddd484dcdfe67698e5629086fb6894
+  data.tar.gz: 3310cb79e338d525af5642e43d6fdb6f11a2fd44dc8344c8407edef95fc16fffd1e33f41f42dbb43d762e368048e0849b957539de7849fda852d111fd67328d1

data/lib/tdiary/style/markdown.rb

@@ -1,6 +1,5 @@
-require 'redcarpet'
+require 'commonmarker'
 require 'rouge'
-require 'rouge/plugins/redcarpet'
 require 'twitter-text'
 
 module TDiary
@@ -62,12 +61,10 @@ module TDiary
 				end
 
 				# 2. Apply markdown conversion
-				renderer = Redcarpet::Markdown.new(HTMLwithRouge,
-															  fenced_code_blocks: true,
-															  tables: true,
-															  autolink: true,
-															  footnotes: true)
-				r = renderer.render(r)
+				extensions = [:autolink, :table]
+				renderer = HTMLwithRouge.new(extensions: extensions)
+				doc = CommonMarker.render_doc(r, :DEFAULT, extensions)
+				r = renderer.render(doc)
 
 				# 3. Stash <pre> and <code> tags
 				pre_tag_stashes = []
@@ -125,13 +122,6 @@ module TDiary
 					end
 				end
 
-				footnote_stashes = HTMLwithRouge.tdiary_style_markdown_footnote_stashes
-				footnote_stashes.each do |num, raw_content|
-					if r["@@tdiary-style-markdown-footnote-#{num}@@"]
-						r["@@tdiary-style-markdown-footnote-#{num}@@"] = raw_content
-					end
-				end
-
 				r
 			end
 
@@ -200,26 +190,52 @@ module TDiary
 			end
 		end
 
-		class HTMLwithRouge < Redcarpet::Render::HTML
-			include Rouge::Plugins::Redcarpet
-			@@tdiary_style_markdown_footnote_stashes = []
-
-			def self.tdiary_style_markdown_footnote_stashes
-				@@tdiary_style_markdown_footnote_stashes
-			end
-
-			def footnotes(content)
-				""
+		class HTMLwithRouge < CommonMarker::HtmlRenderer
+
+			def code_block(node)
+				language = if node.fence_info && !node.fence_info.empty?
+								  node.fence_info.split(/\s+/)[0]
+							  else
+								  nil
+							  end
+				code = node.string_content
+				lexer = Rouge::Lexer.find_fancy(language, code) || Rouge::Lexers::PlainText
+				formatter = rouge_formatter(lexer)
+				highlighted = formatter.format(lexer.lex(code))
+				block do
+					if option_enabled?(:GITHUB_PRE_LANG)
+						out("<pre#{sourcepos(node)}")
+						if language
+							out(' lang="', language, '"')
+						end
+						out('><code>')
+					else
+						out("<pre#{sourcepos(node)}")
+						if language
+							out(' class="highlight ', language, '">')
+						else
+							out(' class="highlight plaintext">')
+						end
+					end
+					out('<code>')
+					out(highlighted)
+					out('</code></pre>')
+				end
 			end
 
-			def footnote_def(content, num)
-				raw_content = content.gsub(/<p>(.+?)<\/p>\n/){ $1 }
-				@@tdiary_style_markdown_footnote_stashes.push([num, raw_content])
-				""
+			def image(node)
+				out('<img src="', escape_href(node.url), '"')
+				plain do
+					out(' alt="', :children, '"')
+				end
+				if node.title && !node.title.empty?
+					out(' title="', escape_html(node.title), '"')
+				end
+				out('>')
 			end
 
-			def footnote_ref(num)
-				"<%=fn %Q(@@tdiary-style-markdown-footnote-#{num}@@)%>"
+			def rouge_formatter(lexer)
+				::Rouge::Formatters::HTML.new(:css_class => "highlight #{lexer.tag}")
 			end
 		end
 	end

data/lib/tdiary/style/markdown/version.rb

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Markdown
-      VERSION = "0.4.0"
+      VERSION = "0.5.0"
     end
   end
 end

data/tdiaty-style-markdown.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'redcarpet'
+  spec.add_dependency 'commonmarker'
   spec.add_dependency 'rouge'
   spec.add_dependency 'twitter-text'
   spec.add_dependency 'gemoji'

data/test/tdiary/style/markdown-test.rb

@@ -29,9 +29,7 @@ honbun
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <p>honbun</p>
-
 <h4>subTitleH4</h4>
-
 <p>honbun</p>
 <pre class="highlight plaintext"><code># comment in code block
 </code></pre>
@@ -76,9 +74,7 @@ replace
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "replaceTitle" ) %></h3>
 <p>replace</p>
-
 <h4>replaceTitleH4</h4>
-
 <p>replace</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -105,9 +101,7 @@ http://www.google.com
 <ul>
 <li><a href="http://www.google.com">http://www.google.com</a></li>
 </ul>
-
 <p><a href="https://www.google.com">google</a></p>
-
 <p><a href="http://www.google.com">http://www.google.com</a></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -129,7 +123,6 @@ http://www.google.com
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <p><img src="http://www.google.com/logo.jpg" alt=""></p>
-
 <p><img src="http://www.google.com/logo.jpg" alt="google"></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -174,7 +167,6 @@ http://example.com is example.com
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <pre class="highlight ruby"><code><span class="vi">@foo</span>
 </code></pre>
-
 <p><a href="http://example.com">http://example.com</a> is example.com</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -217,7 +209,6 @@ http://example.com is example.com
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <p><%=plugin 'val'%></p>
-
 <p><%=plugin "val", 'val'%></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -260,7 +251,6 @@ http://example.com is example.com
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <p><%=my "20120101p01", "20120101p01" %></p>
-
 <p><%=my "20120101p01", "Link" %></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -332,7 +322,6 @@ p :some_code
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <pre class="highlight ruby"><code><span class="nb">p</span> <span class="ss">:some_code</span>
 </code></pre>
-
 <p>@a_matsuda is amatsuda</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -355,7 +344,6 @@ p :some_code
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <p><code>:some_code</code></p>
-
 <p>@a_matsuda is amatsuda</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -377,7 +365,7 @@ p :some_code
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<p><img src='http://www.emoji-cheat-sheet.com/graphics/emojis/sushi.png' width='20' height='20' title='sushi' alt='sushi' class='emoji' /> は美味しい</p>
+<p><img src='//www.webpagefx.com/tools/emoji-cheat-sheet/graphics/emojis/sushi.png' width='20' height='20' title='sushi' alt='sushi' class='emoji' /> は美味しい</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
       EOF
@@ -467,9 +455,7 @@ ruby -e "puts \"hello, world.\""
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <pre class="highlight plaintext"><code>ruby -e "puts \"hello, world.\""
 </code></pre>
-
 <p><code>ruby -e &quot;puts \&quot;hello, world.\&quot;&quot;</code></p>
-
 <p><%=plugin "\0", "\1", "\2"%></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -498,7 +484,6 @@ NOTE: `{{.NetworkSettings.IPAddress}}` is golang template.
 <p>Get IP Address of Docker Container:</p>
 <pre class="highlight plaintext"><code>% docker inspect -f "{{.NetworkSettings.IPAddress}}  {{.Config.Hostname}}  # Name:{{.Name}}" `docker ps -q`
 </code></pre>
-
 <p>NOTE: <code>{{.NetworkSettings.IPAddress}}</code> is golang template.</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -507,6 +492,7 @@ NOTE: `{{.NetworkSettings.IPAddress}}` is golang template.
   end
 
   def test_footnote
+    pend("footnote is unsupported for now.")
     source = <<-'EOF'
 # subTitle
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-markdown
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Markdown Style for tDiary