tdiary-style-gfm 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bca1aeaa3100089462d7b5488f50099d3d866aa
-  data.tar.gz: 1dff9f39fea5bf8c6c360ad7bbb8cde0ee1880ed
+  metadata.gz: 6d08896f8c420b7cef71a6bc5e2f7d7e96109c8e
+  data.tar.gz: ee091d95476362f46cd2d8ceb289990be65aace6
 SHA512:
-  metadata.gz: 459c472c90785520df79711cead2f546006fcf4358501313d9fadce64b81fcaddf1f5d68ee29e59d38946000b9fbd78cabac8304a0cfe1fcf732de7ec8c330ec
-  data.tar.gz: 3aa332c74ba89c02d5f8fbbd0f90de10f3edb8f48fc53c62f0d579aaa31dd929d2172474abf3559faa9c9cbb164e6ff0399f3c2a6feb6a82fd075c0b22150b81
+  metadata.gz: 473081f8f4f360d3f0688426ef9398e66e15cb6972c96690edae0ef739b51eaa7fab1aa02762eeb31d7221d6c1b5d1af1c40db8ae1574569cb6f6587d4c07187
+  data.tar.gz: 845992b4f857fae7ba795161afcf6a943ba4f51951801f5b37e0c014a759113d2d9d179ec3448cbd32927718eef9d99c75a8b6f7dff9f3c17a15bf5d2804b349

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

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Gfm
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
     end
   end
 end

data/lib/tdiary/style/gfm.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8; -*-
 
 require 'github/markdown'
-require 'pygments'
+require 'rouge'
 require 'twitter-text'
 
 module TDiary
@@ -65,7 +65,9 @@ module TDiary
 				# 2. Apply markdown conversion
 				r = GitHub::Markdown.to_html(r, :gfm) do |code, lang|
 					begin
-						Pygments.highlight(code, lexer: lang)
+						formatter = Rouge::Formatters::HTML.new(css_class: 'highlight')
+						lexer = Rouge::Lexers.const_get(lang.capitalize.to_sym).new
+						formatter.format(lexer.lex(code))
 					rescue Exception => ex
 						"<div class=\"highlight\"><pre>#{CGI.escapeHTML(code)}</pre></div>"
 					end

data/spec/tdiary/style/gfm_spec.rb

@@ -203,8 +203,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"><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>
@@ -324,10 +325,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"><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
 		end

data/tdiary-style-gfm.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-gfm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
@@ -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:
     - - ">="