tdiary-style-gfm 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7ec0f2808b5f533557c9da17f0f6af706e6c5b
-  data.tar.gz: 87aa44e3842d7d1fd64031cccc7ec39d1d8b1ba5
+  metadata.gz: 1dac1dabf34213a56e17ccaa5758418af83e5f43
+  data.tar.gz: c83cbe2fcb8baaa9774ab5414a0bbbc2b36ccaee
 SHA512:
-  metadata.gz: 04fc77764f9f29396ff5d4f60c63761963a6a91018865654d23d52d4413700a82cfddc436860a03c189b544e8bbd06c96ef26ab6a395c239a4ffe818fbf40ca3
-  data.tar.gz: 758c5857a6044c632b9b882419178cb0144867b559f6d6bed62fada4ed325299918ae18a211495458a95db64b37bcb4c5dfed696c585cf1852631f7ae3bb033c
+  metadata.gz: 01c40e2f8a84880827d8b64bdeed5485905ca7611fe83d4a1c212ee9f51117227df421abf3e2a9b88efa4b649746e750f038306134195460e1a395a5e2eb3c2b
+  data.tar.gz: aef4277b16355da84abf58b7d4b1d24740eeeb4649a1d734bb95c28bfa22186818869747e81d767eb4da5e9389e5a8f2cd78d4e7f58d9a94d161d0b83b3bb4d1

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3
+  - 2.4
   - ruby-head
+matrix:
+  allowed_failures:
+    - rvm: ruby-head
+
 before_install: gem update bundler
 script: bundle exec rake spec

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

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Gfm
-      VERSION = "0.4.1"
+      VERSION = "0.5.0"
     end
   end
 end

data/lib/tdiary/style/gfm.rb

@@ -56,17 +56,18 @@ module TDiary
 
 				# 1. Stash plugin calls
 				plugin_stashes = []
-				r.gsub!(/\{\{(.*?)\}\}/) do |matched|
+				plugin_blocks, replaced_r = extract_plugin_blocks_and_replace(r)
+				plugin_blocks.each do |plugin_block|
 					# Convert `{{ }}' to erb tags
-					plugin_stashes.push([matched, "<%=#{$1}%>"])
-					"@@tdiary_style_gfm_plugin#{plugin_stashes.length - 1}@@"
+					plugin_stashes.push(["{{#{plugin_block}}}", "<%=#{plugin_block}%>"])
 				end
+				r = replaced_r
 
 				# 2. Apply markdown conversion
 				r = GitHub::Markdown.to_html(r, :gfm) do |code, lang|
 					begin
 						formatter = Rouge::Formatters::HTMLPygments.new(Rouge::Formatters::HTML.new, 'highlight')
-						lexer = Rouge::Lexer.find(lang)
+						lexer = Rouge::Lexer.find_fancy(lang)
 						formatter.format(lexer.lex(code))
 					rescue Exception => ex
 						"<div class=\"highlight\"><pre>#{CGI.escapeHTML(code)}</pre></div>"
@@ -150,6 +151,37 @@ module TDiary
 					r
 				end
 			end
+
+			def extract_plugin_blocks_and_replace(text)
+				s = StringScanner.new(text)
+				blocks = []
+				count = 0
+				replaced_text = ""
+				while chunk = s.scan_until(/\{\{/)
+					chunk[-2, 2] = ""
+					replaced_text << chunk
+					if plugin_str = extract_plugin_block(s)
+						replaced_text << "@@tdiary_style_gfm_plugin#{count}@@"
+						blocks << plugin_str
+						count += 1
+					end
+				end
+				replaced_text << s.rest
+				return blocks, replaced_text
+			end
+
+			def extract_plugin_block(s)
+				pos = s.pos
+				buf = ""
+				while chunk = s.scan_until(/\}\}/)
+					buf << chunk
+					buf.chomp!("}}")
+					return buf
+				end
+				s.pos = pos
+				nil
+			end
+
 		end
 
 		class GfmDiary

data/spec/tdiary/style/gfm_spec.rb

@@ -203,8 +203,8 @@ http://example.com is example.com
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<pre class="highlight"><code><span class="vi">@foo</span>
-</code></pre>
+<div class="highlight"><pre class="highlight"><code><span class="vi">@foo</span>
+</code></pre></div>
 <p><a href="http://example.com">http://example.com</a> is example.com</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
@@ -243,6 +243,13 @@ http://example.com is example.com
 
 {{plugin "val", 'val'}}
 
+{{plugin <<EOS, 'val'
+valval
+valval
+vaoooo
+EOS
+}}
+
 			EOF
 			@diary.append(source)
 
@@ -253,6 +260,13 @@ http://example.com is example.com
 <p><%=plugin 'val'%></p>
 
 <p><%=plugin "val", 'val'%></p>
+
+<p><%=plugin <<EOS, 'val'
+valval
+valval
+vaoooo
+EOS
+%></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
 			EOF
@@ -324,10 +338,10 @@ http://example.com is example.com
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<pre class="highlight"><code> <span class="k">def</span> <span class="nf">class</span>
+<div class="highlight"><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>
-</code></pre><%=section_leave_proc( Time.at( 1041346800 ) )%>
+</code></pre></div><%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
 			EOF
 		end
@@ -447,7 +461,7 @@ http://example.com is example.com
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<p><img src='http://www.webpagefx.com/tools/emoji-cheat-sheet/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

data/tdiary-style-gfm.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{GFM Style for tDiary}
   spec.homepage      = "https://github.com/tdiary/tdiary-style-gfm"
   spec.license       = "GPL-3.0"
+  spec.required_ruby_version = ">= 2.2.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-gfm
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markdown
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: GFM Style for tDiary