tdiary-style-gfm 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b1ca75344a93394fd50ce1a1a669a34ee8ca866f6a5b5e1d119451d72c0ad8
-  data.tar.gz: f1674c88db424f583984aebb78093a6e660c74d8deb9c6548090b85c9c51ca76
+  metadata.gz: 5a996b82990d85cb5097270545e898de741322c225aaf1160381ec536518b27c
+  data.tar.gz: 58e231c56262ea42c3d18eb854948dafdae129b8cf801dd9aa7911a2e63f32ed
 SHA512:
-  metadata.gz: a98d14ca1a84c737e0c984d83034167a02e616cc63a0aa770f02abd1a76184639bddd6944fe46d31297cde5bb29881091f55086d895a60165ef61d20e43b0db7
-  data.tar.gz: 2958a5471431c367b984265a858c7ae9cd30aff7fcdb9112b86ee4f894a539bfadbe7771ad0cbaf3babbb77da83a133a0e0ab0dd5ec7113822235bc3a80d0434
+  metadata.gz: fbe2101056de6b1b9a21fcefa4360c757c1af04f1333bcb345578e74e315819f0f4ffc8f0d47591517476a2fb9ba2e7846a87e2a24bbd8552d2f4aa0626d3298
+  data.tar.gz: a744ac14db04091529607f499d580171bdf7cbd072d93ae621f84884a2072e197e44ac62ab20dfbcc6e173e6dac86d57e924c2add5be36a11673e05a22d1cd13

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

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Gfm
-      VERSION = "1.3.0"
+      VERSION = "1.5.0"
     end
   end
 end

data/lib/tdiary/style/gfm.rb

@@ -1,6 +1,21 @@
 # -*- coding: utf-8; -*-
 
 require 'commonmarker'
+require 'json'
+
+# twitter-text 3.1.0 passes JSON.parse options as a positional hash while loading,
+# which json 3 rejects. Prepend before the require so its own definition loses.
+module Twitter
+	module TwitterText
+		class Configuration
+			singleton_class.prepend(Module.new do
+				def parse_string(string, options = {})
+					JSON.parse(string, **options, symbolize_names: true)
+				end
+			end)
+		end
+	end
+end
 require 'twitter-text'
 
 module TDiary
@@ -37,6 +52,9 @@ module TDiary
 			end
 
 			def do_html4(date, idx, opt)
+				# An empty `#` only separates sections, so skip the heading but keep @subtitle for to_src.
+				return @body_to_html if @subtitle.empty?
+
 				subtitle = to_html('# ' + @subtitle)
 				subtitle.sub!( %r!<h3>(.+?)</h3>!m ) do
 					"<h3><%= subtitle_proc( Time.at( #{date.to_i} ), #{$1.dump.gsub( /%/, '\\\\045' )} ) %></h3>"
@@ -63,7 +81,12 @@ module TDiary
 				r = replaced_r
 
 				# 2. Apply markdown conversion
-				r = CommonMarker.render_html(r, [:DEFAULT, :UNSAFE], [:autolink, :table])
+				r = Commonmarker.to_html(r,
+					options: {
+						render: { unsafe: true },
+						extension: { header_ids: nil, tagfilter: false }
+					}
+				)
 
 				# 3. Stash <pre> and <code> tags
 				pre_tag_stashes = []
@@ -80,46 +103,22 @@ module TDiary
 
 				# 4. Convert miscellaneous
 				if pre_tag_stashes.none? && code_tag_stashes.none?
-					# STAGE 1: Stash all existing <a> tags from CommonMarker output
-					original_a_tag_stashes = []
-					r.gsub!(/(<a\s[^>]*href=[^>]*>.*?<\/a>)/im) do |match|
-						original_a_tag_stashes.push(match)
-						"@@TDIARY_GFM_A_TAG_#{original_a_tag_stashes.length - 1}@@"
-					end
-
-					# STAGE 2: Protect YouTube @-URLs that might still be plain text
-					youtube_link_data_for_twitter_text_protection = []
-					r.gsub!(/((?:https?:\/\/)?(?:www\.)?youtube\.com\/@([a-zA-Z0-9_.-]+))/) do |match|
-						original_text = $1
-						placeholder = "@@YT_LINK_PROTECT_#{youtube_link_data_for_twitter_text_protection.length}@@"
-						youtube_link_data_for_twitter_text_protection << { placeholder: placeholder, original_text: original_text }
-						placeholder
-					end
-
-					# STAGE 3: Apply Twitter's autolinker for @mentions and lists.
-					r = Twitter::TwitterText::Autolink.auto_link_usernames_or_lists(r)
-
-					# STAGE 4: Restore protected YouTube links (as new <a> tags)
-					youtube_link_data_for_twitter_text_protection.each do |link_data|
-						original_text = link_data[:original_text]
-						href = original_text
-
-						if !href.start_with?('http://') && !href.start_with?('https://')
-							if href.include?('youtube.com/')
-								href = "https://#{href}"
-							else
-								href = "http://#{href}"
+					# Link only text outside of tags, leaving @ in attributes like <iframe src=".../@user/embed"> and in <a>, <script> and <style> as is
+					skip_until = nil
+					r = r.split(/(<[^>]*>)/).map {|token|
+						if token.start_with?('<')
+							if skip_until
+								skip_until = nil if skip_until.match?(token)
+							elsif /\A<(a|script|style)\b/i =~ token
+								skip_until = /\A<\/#{$1}\s*>/i
 							end
+							token
+						elsif skip_until
+							token
+						else
+							autolink_text(token)
 						end
-
-						youtube_html_link = "<a href=\"#{CGI.escapeHTML(href)}\">#{CGI.escapeHTML(original_text)}</a>"
-						r.gsub!(link_data[:placeholder], youtube_html_link)
-					end
-
-					# STAGE 5: Restore original <a> tags
-					original_a_tag_stashes.each.with_index do |tag_content, i|
-						r.gsub!("@@TDIARY_GFM_A_TAG_#{i}@@", tag_content)
-					end
+					}.join
 				end
 
 				r = r.emojify
@@ -163,6 +162,41 @@ module TDiary
 				r
 			end
 
+			def autolink_text(text)
+				# STAGE 1: Protect YouTube @-URLs from Twitter's autolinker
+				youtube_link_data_for_twitter_text_protection = []
+				text.gsub!(/((?:https?:\/\/)?(?:www\.)?youtube\.com\/@([a-zA-Z0-9_.-]+))/) do |match|
+					original_text = $1
+					placeholder = "@@YT_LINK_PROTECT_#{youtube_link_data_for_twitter_text_protection.length}@@"
+					youtube_link_data_for_twitter_text_protection << { placeholder: placeholder, original_text: original_text }
+					placeholder
+				end
+
+				# STAGE 2: Apply Twitter's autolinker for @mentions and lists.
+				if TDiary.configuration.options['gfm.twitter_autolink'] != false
+					text = Twitter::TwitterText::Autolink.auto_link_usernames_or_lists(text)
+				end
+
+				# STAGE 3: Restore protected YouTube links (as new <a> tags)
+				youtube_link_data_for_twitter_text_protection.each do |link_data|
+					original_text = link_data[:original_text]
+					href = original_text
+
+					if !href.start_with?('http://') && !href.start_with?('https://')
+						if href.include?('youtube.com/')
+							href = "https://#{href}"
+						else
+							href = "http://#{href}"
+						end
+					end
+
+					youtube_html_link = "<a href=\"#{CGI.escapeHTML(href)}\">#{CGI.escapeHTML(original_text)}</a>"
+					text.gsub!(link_data[:placeholder], youtube_html_link)
+				end
+
+				text
+			end
+
 			def get_categories
 				return [] unless @subtitle
 				cat = /(\\?\[([^\[]+?)\\?\])+/.match(@subtitle).to_a[0]

data/tdiary-style-gfm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'commonmarker', '< 1.0'
+  spec.add_dependency 'commonmarker', '>= 1.0'
   spec.add_dependency 'twitter-text', '>= 2.0'
   spec.add_dependency 'emot'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-gfm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
@@ -13,14 +13,14 @@ dependencies:
   name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 4.0.20
 specification_version: 4
 summary: GFM Style for tDiary
 test_files: []