tdiary-style-gfm 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1564bbcbba57a358c11586d364c06a744d0753a2
-  data.tar.gz: e1074b3b48790af1670abe3070cc3765ae2591ae
+  metadata.gz: 958b5a067acef02d274a063dc6ad126d81b4a349
+  data.tar.gz: 1fc62c47442e37dc945f2453f1596034a5016217
 SHA512:
-  metadata.gz: 4122f536060577050b123b28b026f84f3235ac7d1df1287f727adc6edc1853bd91279f073d249cc8e438a9ee6048ea174c9d3f2919887cdec6cc9a1ef9611b90
-  data.tar.gz: f4167268113111f7cdd30f5530d7a7f1334ca2eb74884184c29be84aac6a1d1cdc75d0a0e9ea923c9832cab98b277bf1cd09d195dd400affee68d4ac087ee5e6
+  metadata.gz: e5f40c7ab7a5b2644d399446b3e563b931ab6274985c592db48f2c1c44876f7010e4043f71d882c90c5477443e39f49b28705b7fcf50296949f82e7481ddf700
+  data.tar.gz: 4713028db0f3ea08185e1106e32709b60d80fea34e3840a177ed92bc19219476e6f02826c073f0408995bf6cd265682479e8a6d2bf75d66c9dc9821a86162650

data/lib/tdiary/style/gfm.rb

@@ -56,9 +56,9 @@ module TDiary
 
 				# 1. Stash plugin calls
 				plugin_stashes = []
-				r.gsub!(/\{\{(.*?)\}\}/) do
+				r.gsub!(/\{\{(.*?)\}\}/) do |matched|
 					# Convert `{{ }}' to erb tags
-					plugin_stashes.push("<%=#{$1}%>")
+					plugin_stashes.push([matched, "<%=#{$1}%>"])
 					"@@tdiary_style_gfm_plugin#{plugin_stashes.length - 1}@@"
 				end
 
@@ -106,13 +106,25 @@ module TDiary
 
 				# 5. Unstash <pre>, <code> and plugin call
 				pre_tag_stashes.each.with_index do |str, i|
+					plugin_stashes.each.with_index do |(p_str, p_erb), j|
+						if str["@@tdiary_style_gfm_plugin#{j}@@"]
+							str["@@tdiary_style_gfm_plugin#{j}@@"] = CGI.escapeHTML(p_str)
+						end
+					end
 					r["@@tdiary_style_gfm_pre_tag#{i}@@"] = str
 				end
 				code_tag_stashes.each.with_index do |str, i|
+					plugin_stashes.each.with_index do |(p_str, p_erb), j|
+						if str["@@tdiary_style_gfm_plugin#{j}@@"]
+							str["@@tdiary_style_gfm_plugin#{j}@@"] = CGI.escapeHTML(p_str)
+						end
+					end
 					r["@@tdiary_style_gfm_code_tag#{i}@@"] = str
 				end
-				plugin_stashes.each.with_index do |str, i|
-					r["@@tdiary_style_gfm_plugin#{i}@@"] = str
+				plugin_stashes.each.with_index do |(str, erb), i|
+					if r["@@tdiary_style_gfm_plugin#{i}@@"]
+						r["@@tdiary_style_gfm_plugin#{i}@@"] = erb
+					end
 				end
 
 				r

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

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Gfm
-      VERSION = "0.1.3"
+      VERSION = "0.1.4"
     end
   end
 end

data/spec/tdiary/style/gfm_spec.rb

@@ -567,6 +567,38 @@ ruby -e "puts \"hello, world.\""
 
 <p><%=plugin "\0", "\1", "\2"%></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
+</div>
+			EOF
+		end
+		it { @diary.to_html.should eq @html }
+	end
+
+	describe 'plugin syntax in pre, code block' do
+		before do
+			source = <<-'EOF'
+# subTitle
+
+Get IP Address of Docker Container:
+
+```
+% docker inspect -f "{{.NetworkSettings.IPAddress}}  {{.Config.Hostname}}  # Name:{{.Name}}" `docker ps -q`
+```
+
+NOTE: `{{.NetworkSettings.IPAddress}}` is golang template.
+			EOF
+			@diary.append(source)
+
+			@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<p>Get IP Address of Docker Container:</p>
+
+<pre><code>% docker inspect -f &quot;{{.NetworkSettings.IPAddress}}  {{.Config.Hostname}}  # Name:{{.Name}}&quot; `docker ps -q`
+</code></pre>
+
+<p>NOTE: <code>{{.NetworkSettings.IPAddress}}</code> is golang template.</p>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
 			EOF
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-gfm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markdown
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: GFM Style for tDiary