tdiary-style-gfm 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f569485079ab542dc92edb2b9ea328194f7aac737259a6ffa5bad712e0fc426
-  data.tar.gz: 46ad416bbf00ba75b85fd0be66f36cf2a323da91e8482082dcbfa39ffa4cd458
+  metadata.gz: 798d07b48bbca9f0f9ffca0fb1d90c97043e8cb83497f850302d60195e5ac52e
+  data.tar.gz: 53535af4b6082a81ba979426c6f042d76cee778e6bbecf90bd95b1ae3de501fd
 SHA512:
-  metadata.gz: cff7186a0683843c49abad1ace2fa848982744349f45a9a4aeb2d3707a3d8136b41bc8241f91abeeaeec52d183c3ad6d6a6f15903bd5db7dface49575efbfa44
-  data.tar.gz: d4f24967ec113db65883b560f33e7935d3ec3fcded7e82bc880a6222c979f3ef4011cfcec5d9596d1adf95cf7b1145cd42c621f1750b61c79cc666fe98f58123
+  metadata.gz: daaf886192bb969c9c890956b0c479d686c7a10e43a0ca2bd92d3ee27204797946a951982dfed67f9a099706bab0ff6ce05403daabd127057645835b50f3339a
+  data.tar.gz: 0f909bf89fdfb1de58c1dac1bf800b1161275e6439811874b675802379d2ddae3fb2744beb3274e12c9a5b32c4abd485ce2a652a5b307d4a27ea19fd37dce73c

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

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Gfm
-      VERSION = "1.2.0"
+      VERSION = "1.4.0"
     end
   end
 end

data/lib/tdiary/style/gfm.rb

@@ -63,7 +63,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,7 +85,48 @@ module TDiary
 
 				# 4. Convert miscellaneous
 				if pre_tag_stashes.none? && code_tag_stashes.none?
-					r = Twitter::TwitterText::Autolink.auto_link_usernames_or_lists(r)
+					# 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.
+					if TDiary.configuration.options['gfm.twitter_autolink'] != false
+						r = Twitter::TwitterText::Autolink.auto_link_usernames_or_lists(r)
+					end
+
+					# 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}"
+							end
+						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
 				end
 
 				r = r.emojify

data/tdiary-style-gfm.gemspec

@@ -19,11 +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'
+  spec.add_dependency 'commonmarker', '>= 1.0'
   spec.add_dependency 'twitter-text', '>= 2.0'
   spec.add_dependency 'emot'
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-gfm
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: GFM Style for tDiary
 email:
 - hsbt@ruby-lang.org
@@ -111,7 +68,6 @@ homepage: https://github.com/tdiary/tdiary-style-gfm
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -126,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: GFM Style for tDiary
 test_files: []