tdiary-style-markdown 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bab61514aa2d79021f5c4aee983ea1810af321e
-  data.tar.gz: 0fffb76baf10b7e22a9d0a73729c8cf578c75ff5
+  metadata.gz: 813eba40c02dfa8d534b87fa14f7afa019b6c3e4
+  data.tar.gz: 66c14010055ff983960bc368eef48caa029a99e0
 SHA512:
-  metadata.gz: 112d0e5b9e02747c1c95dbca5d244401a37066d961b692eabc484326d8ba2c10e82a59f2c1c88f6f573ab684fb2bd16a6f8c9104296ada8d736284524be53fe1
-  data.tar.gz: 188eccdbde931f708883365ea552cc66dd8c7f65e9ca3bbe2d69bd7c96c69280ef31dec53707f5aed411683ce7be33f9fd79015022605be171cfa9a0599e39f3
+  metadata.gz: db1f5f7bb6dd4bfe204c4e37a6d08ce643fc166de0dd45dafed3588b9a3e3c50f9dde9967e9d6c1f2dd0cf62f44cc82266fa60172d80d2a5fc4878beb7a22ae9
+  data.tar.gz: 76ab1c326848a3a1b3eaad4be613d1d56bcfc465f61fbc4a4dfa02da2bd2e655fa0a3f586281a80a9f96118e403cde8ece8138604409a2a6fb8c7087d73aa182

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'tdiary', github: 'tdiary/tdiary-core'
+gem 'emot'

data/README.md

@@ -20,10 +20,21 @@ Or install it yourself as:
 
 ## Usage
 
-if you want to use this style, add @style into tdiary.conf below:
+If you want to use this style, add @style into tdiary.conf below:
 
     @style = 'Markdown'
 
+### Style sheet
+
+Use [rouge](https://github.com/jneen/rouge) for syntax highlighting.
+
+```text
+$ rougify style github > public/github.css
+```
+
+Add `@import url("/github.css");` to your style sheet via tdiary
+configuration.
+
 ## Contributing
 
 1. Fork it

data/lib/tdiary/style/markdown.rb

@@ -1,5 +1,6 @@
 require 'redcarpet'
-require 'pygments'
+require 'rouge'
+require 'rouge/plugins/redcarpet'
 require 'twitter-text'
 
 module TDiary
@@ -61,7 +62,7 @@ module TDiary
 				end
 
 				# 2. Apply markdown conversion
-				renderer = Redcarpet::Markdown.new(HTMLwithPygments,
+				renderer = Redcarpet::Markdown.new(HTMLwithRouge,
 															  fenced_code_blocks: true,
 															  tables: true,
 															  autolink: true,
@@ -124,7 +125,7 @@ module TDiary
 					end
 				end
 
-				footnote_stashes = HTMLwithPygments.tdiary_style_markdown_footnote_stashes
+				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
@@ -199,17 +200,14 @@ module TDiary
 			end
 		end
 
-		class HTMLwithPygments < Redcarpet::Render::HTML
+		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 block_code(code, language)
-				Pygments.highlight(code, lexer: language)
-			end
-
 			def footnotes(content)
 				""
 			end

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

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

data/tdiaty-style-markdown.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'redcarpet'
-  spec.add_dependency 'pygments.rb'
+  spec.add_dependency 'rouge'
   spec.add_dependency 'twitter-text'
   spec.add_dependency 'gemoji'
 

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

@@ -33,8 +33,9 @@ honbun
 <h4>subTitleH4</h4>
 
 <p>honbun</p>
-<div class="highlight"><pre><span class="c"># comment in code block</span>
-</pre></div><%=section_leave_proc( Time.at( 1041346800 ) )%>
+<pre class="highlight plaintext"><code># comment in code block
+</code></pre>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
       EOF
       assert_equal(@html, @diary.to_html)
@@ -171,8 +172,9 @@ http://example.com is example.com
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<div class="highlight"><pre><span class="vi">@foo</span>
-</pre></div>
+<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>
@@ -282,10 +284,11 @@ http://example.com is example.com
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<div class="highlight"><pre> <span class="k">def</span> <span class="nf">class</span>
-   <span class="vi">@foo</span> <span class="o">=</span> <span class="s1">&#39;bar&#39;</span>
+<pre class="highlight ruby"><code> <span class="k">def</span> <span class="nf">class</span>
+   <span class="vi">@foo</span> <span class="o">=</span> <span class="s1">'bar'</span>
  <span class="k">end</span>
-</pre></div><%=section_leave_proc( Time.at( 1041346800 ) )%>
+</code></pre>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
     EOF
     assert_equal(@html, @diary.to_html)
@@ -327,8 +330,9 @@ p :some_code
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<div class="highlight"><pre><span class="nb">p</span> <span class="ss">:some_code</span>
-</pre></div>
+<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>
@@ -395,9 +399,10 @@ p :some_code
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<div class="highlight"><pre><span class="o">:</span><span class="nl">sushi:</span><span class="w"> </span><span class="err">は</span>
-<span class="err">美味しい</span>
-</pre></div><%=section_leave_proc( Time.at( 1041346800 ) )%>
+<pre class="highlight plaintext"><code>:sushi: は
+美味しい
+</code></pre>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
       EOF
       assert_equal(@html, @diary.to_html)
@@ -460,8 +465,9 @@ ruby -e "puts \"hello, world.\""
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<div class="highlight"><pre><span class="vg">ruby</span><span class="w"> </span><span class="o">-</span><span class="vg">e</span><span class="w"> </span><span class="s2">&quot;puts \&quot;</span><span class="vg">hello</span><span class="p">,</span><span class="w"> </span><span class="vg">world</span><span class="o">.\</span><span class="s2">&quot;&quot;</span>
-</pre></div>
+<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>
@@ -490,8 +496,9 @@ NOTE: `{{.NetworkSettings.IPAddress}}` is golang template.
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <p>Get IP Address of Docker Container:</p>
-<div class="highlight"><pre><span class="o">%</span> <span class="n">docker</span> <span class="n">inspect</span> <span class="o">-</span><span class="n">f</span> <span class="s">&quot;{{.NetworkSettings.IPAddress}}  {{.Config.Hostname}}  # Name:{{.Name}}&quot;</span> <span class="err">`</span><span class="n">docker</span> <span class="n">ps</span> <span class="o">-</span><span class="n">q</span><span class="err">`</span>
-</pre></div>
+<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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-markdown
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rouge
   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.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Markdown Style for tDiary