tdiary-style-gfm 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81359b23dd148e13e8e53c63a7d948768537e7bc
-  data.tar.gz: 64473dae3fae447d020a0b717f8462ea25f105f0
+  metadata.gz: e50242d3e4c9de5a6471cd39305d19ecc63db7b3
+  data.tar.gz: 7581983b9fab9eee31fd720f5f0b3cca84cce960
 SHA512:
-  metadata.gz: 6e69fb429c4070fc7d4cc9f4ad772ad83ffac1822632a9eb9129622f3ccc34fd5b90978dea36c4f577def47e3b717e00c443b67a4040b38dfbe5adf54c9fd516
-  data.tar.gz: b89a3a41ecf6d8e2f9c295399bc70398e6bc85f584f53da886b94f12d943b7069ae6cd353c1203d2507cb76f965fde607a4ab3116b08511857ab70301a4c50e2
+  metadata.gz: 4db97817b2b3d1cf8142598fb6726e37a1cccf7c1e7f58c3878b4289c2b3a85e2ab2c7c11a5d72c88506143d6c53a39275df852d85e2f7da4456f50eb1834011
+  data.tar.gz: 34b54f4903d6675fbf27e15228b46289b0305594a52bb1fd4b90473e4e141a9b026dbb1bee7fbbcfe9bfe326ce83a05f9c9a3f95088b4e41f6bb5090da7a0af3

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 1.9.3
+  - 2.0.0
+script: bundle exec rake spec

data/README.md

@@ -1,4 +1,4 @@
-# Tdiary::Style::Gfm
+# TDiary::Style::Gfm
 
 "GitHub Flavored Markdown" (GFM) style for tDiary 2.x format.
 

data/lib/tdiary/style/gfm.rb

@@ -1,24 +1,12 @@
 # -*- coding: utf-8; -*-
 
-require 'redcarpet'
+require 'github/markdown'
 require 'pygments'
 require 'twitter-text'
 
-class HTMLwithPygments < Redcarpet::Render::HTML
-	def block_code(code, language)
-		Pygments.highlight(code, :lexer => language)
-	rescue Exception
-		<<-HTML
-<div class="highlight"><pre>#{CGI.escapeHTML(code)}</pre></div>
-		HTML
-	end
-end
-
 module TDiary
 	module Style
 		class GfmSection
-			include Twitter::Autolink
-
 			def initialize(fragment, author = nil)
 				@author = author
 				@subtitle, @body = fragment.split(/\n/, 2)
@@ -64,35 +52,35 @@ module TDiary
 			private
 
 			def to_html(string)
-				renderer = HTMLwithPygments.new(:hard_wrap => true)
-				extensions = {:fenced_code_blocks => true, :tables => true, :no_intra_emphasis => true}
-				r = Redcarpet::Markdown.new(renderer, extensions).render(string)
-
-				# Twitter Autolink
-				r = auto_link(r)
-
-				if r =~ /(<pre>|<code>)/
-					r.gsub!(/<a class=\"tweet-url username\" href=\".*?\">(.*?)<\/a>/){ $1 }
+				# 1. Stash plugin calls
+				plugin_stashes = []
+				r = string.gsub(/\{\{(.*?)\}\}/) do
+					# Convert `{{ }}' to erb tags
+					plugin_stashes.push("<%=#{$1}%>")
+					"@@tdiary_style_gfm_plugin#{plugin_stashes.length - 1}@@"
 				end
 
-				# except url autolink in plugin block
-				if r =~ /\{\{.+?\}\}/
-					r.gsub!(/<a href=\"(.*?)\" rel=\"nofollow\">.*?<\/a>/){ $1 }
-					r.gsub!(/\{\{(.+?)\}\}/) { "<%=#{CGI.unescapeHTML($1).gsub(/&#39;/, "'").gsub(/&quot;/, '"')}%>" }
+				# 2. Apply markdown conversion
+				r = GitHub::Markdown.to_html(r, :gfm) do |code, lang|
+					begin
+						Pygments.highlight(code, :lexer => lang)
+					rescue Exception => ex
+						"<div class=\"highlight\"><pre>#{CGI.escapeHTML(code)}</pre></div>"
+					end
 				end
 
-				# ignore duplicate autolink
-				if r =~ /<a href="<a href="/
-					r.gsub!(/<a href="<a href=".*?" rel="nofollow">(.*?)<\/a>"(.*?)>(.*?)<\/a>/) do
-						"<a href=\"#{$1}\" rel=\"nofollow\"#{$2}>#{$3}</a>"
-					end
+				# 3. Stash <pre> tags
+				pre_tag_stashes = []
+				r.gsub!(/<pre>(.*?)<\/pre>/) do |matched|
+					pre_tag_stashes.push(matched)
+					"@@tdiary_style_gfm_pre_tag#{pre_tag_stashes.length - 1}@@"
 				end
-				# ignore auto imagelink
-				if r =~ /<img src="<a href="/
-					r.gsub!(/<img src="<a href=".*?" rel="nofollow">(.*?)<\/a>"(?: alt="(.*?)")?>/){ "<img src=\"#{$1}\" alt=\"#{$2}\">" }
+
+				# 4. Convert miscellaneous
+				unless r =~ /(<pre>|<code>)/
+					r = Twitter::Autolink.auto_link_usernames_or_lists(r)
 				end
 
-				# emoji
 				r = r.emojify
 
 				# diary anchor
@@ -108,6 +96,14 @@ module TDiary
 					end
 				}
 
+				# 5. Unstash pre and plugin
+				pre_tag_stashes.each.with_index do |str, i|
+					r.sub!(/@@tdiary_style_gfm_pre_tag#{i}@@/, str)
+				end
+				plugin_stashes.each.with_index do |str, i|
+					r.sub!(/@@tdiary_style_gfm_plugin#{i}@@/, str)
+				end
+
 				r
 			end
 

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

@@ -1,7 +1,7 @@
-module Tdiary
+module TDiary
   module Style
     module Gfm
-      VERSION = "0.0.3"
+      VERSION = "0.1.1"
     end
   end
 end

data/spec/tdiary/style/gfm_spec.rb

@@ -113,12 +113,12 @@ http://www.google.com
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <ul>
-<li><a href="http://www.google.com" rel="nofollow">http://www.google.com</a></li>
+<li><a href="http://www.google.com">http://www.google.com</a></li>
 </ul>
 
-<p><a href="https://www.google.com" rel="nofollow">google</a></p>
+<p><a href="https://www.google.com">google</a></p>
 
-<p><a href="http://www.google.com" rel="nofollow">http://www.google.com</a></p>
+<p><a href="http://www.google.com">http://www.google.com</a></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
          EOF
@@ -165,7 +165,7 @@ http://www.google.com
 <div class="section">
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
-<p><a href="http://www.exaple.com" rel="nofollow" target="_blank">Anchor</a></p>
+<p><a href="http://www.exaple.com" target="_blank">Anchor</a></p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
          EOF
@@ -195,7 +195,7 @@ http://example.com is example.com
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <div class="highlight"><pre><span class="vi">@foo</span>
 </pre></div>
-<p><a href="http://example.com" rel="nofollow">http://example.com</a> is example.com</p>
+<p><a href="http://example.com">http://example.com</a> is example.com</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
 			EOF
@@ -217,7 +217,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><a href="http://example.com" rel="nofollow">example</a> is example.com</p>
+<p><a href="http://example.com">example</a> is example.com</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
 			EOF
@@ -369,6 +369,23 @@ http://example.com is example.com
 		end
 		it { @diary.to_html.should eq @html }
 	end
+
+	describe 'do not modify original string' do
+		before do
+			@orig_source = <<-'EOF'
+# subTitle
+
+{{fn 'テスト'}}"
+			EOF
+			@source = @orig_source.dup
+			@diary.append(@source)
+			@diary.to_html
+
+			@section = nil
+			@diary.each_section{|x| @section = x}
+		end
+		it { expect(@section.body).to eq("\n"+@orig_source.lines.to_a.last+"\n") }
+	end
 end
 
 # Local Variables:

data/tdiary-style-gfm.gemspec

@@ -5,12 +5,12 @@ require 'tdiary/style/gfm/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "tdiary-style-gfm"
-  spec.version       = Tdiary::Style::Gfm::VERSION
+  spec.version       = TDiary::Style::Gfm::VERSION
   spec.authors       = ["SHIBATA Hiroshi"]
   spec.email         = ["shibata.hiroshi@gmail.com"]
   spec.description   = %q{GFM Style for tDiary}
   spec.summary       = %q{GFM Style for tDiary}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/tdiary/tdiary-style-gfm"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -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 'github-markdown'
   spec.add_dependency 'pygments.rb'
   spec.add_dependency 'twitter-text'
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-gfm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: github-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,7 +114,7 @@ files:
 - spec/spec_helper.rb
 - spec/tdiary/style/gfm_spec.rb
 - tdiary-style-gfm.gemspec
-homepage: ''
+homepage: https://github.com/tdiary/tdiary-style-gfm
 licenses:
 - MIT
 metadata: {}
@@ -134,11 +134,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: GFM Style for tDiary
 test_files:
 - spec/spec_helper.rb
 - spec/tdiary/style/gfm_spec.rb
-has_rdoc: