tdiary-style-gfm 1.2.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/tdiary/style/gfm/version.rb +1 -1
  3. data/lib/tdiary/style/gfm.rb +39 -0
  4. data/tdiary-style-gfm.gemspec +1 -5
  5. metadata +7 -52
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1f569485079ab542dc92edb2b9ea328194f7aac737259a6ffa5bad712e0fc426
4
- data.tar.gz: 46ad416bbf00ba75b85fd0be66f36cf2a323da91e8482082dcbfa39ffa4cd458
3
+ metadata.gz: e4b1ca75344a93394fd50ce1a1a669a34ee8ca866f6a5b5e1d119451d72c0ad8
4
+ data.tar.gz: f1674c88db424f583984aebb78093a6e660c74d8deb9c6548090b85c9c51ca76
5
5
  SHA512:
6
- metadata.gz: cff7186a0683843c49abad1ace2fa848982744349f45a9a4aeb2d3707a3d8136b41bc8241f91abeeaeec52d183c3ad6d6a6f15903bd5db7dface49575efbfa44
7
- data.tar.gz: d4f24967ec113db65883b560f33e7935d3ec3fcded7e82bc880a6222c979f3ef4011cfcec5d9596d1adf95cf7b1145cd42c621f1750b61c79cc666fe98f58123
6
+ metadata.gz: a98d14ca1a84c737e0c984d83034167a02e616cc63a0aa770f02abd1a76184639bddd6944fe46d31297cde5bb29881091f55086d895a60165ef61d20e43b0db7
7
+ data.tar.gz: 2958a5471431c367b984265a858c7ae9cd30aff7fcdb9112b86ee4f894a539bfadbe7771ad0cbaf3babbb77da83a133a0e0ab0dd5ec7113822235bc3a80d0434
data/lib/tdiary/style/gfm/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module TDiary
2
2
  module Style
3
3
  module Gfm
4
- VERSION = "1.2.0"
4
+ VERSION = "1.3.0"
5
5
  end
6
6
  end
7
7
  end
data/lib/tdiary/style/gfm.rb CHANGED
@@ -80,7 +80,46 @@ module TDiary
80
80
 
81
81
  # 4. Convert miscellaneous
82
82
  if pre_tag_stashes.none? && code_tag_stashes.none?
83
+ # STAGE 1: Stash all existing <a> tags from CommonMarker output
84
+ original_a_tag_stashes = []
85
+ r.gsub!(/(<a\s[^>]*href=[^>]*>.*?<\/a>)/im) do |match|
86
+ original_a_tag_stashes.push(match)
87
+ "@@TDIARY_GFM_A_TAG_#{original_a_tag_stashes.length - 1}@@"
88
+ end
89
+
90
+ # STAGE 2: Protect YouTube @-URLs that might still be plain text
91
+ youtube_link_data_for_twitter_text_protection = []
92
+ r.gsub!(/((?:https?:\/\/)?(?:www\.)?youtube\.com\/@([a-zA-Z0-9_.-]+))/) do |match|
93
+ original_text = $1
94
+ placeholder = "@@YT_LINK_PROTECT_#{youtube_link_data_for_twitter_text_protection.length}@@"
95
+ youtube_link_data_for_twitter_text_protection << { placeholder: placeholder, original_text: original_text }
96
+ placeholder
97
+ end
98
+
99
+ # STAGE 3: Apply Twitter's autolinker for @mentions and lists.
83
100
  r = Twitter::TwitterText::Autolink.auto_link_usernames_or_lists(r)
101
+
102
+ # STAGE 4: Restore protected YouTube links (as new <a> tags)
103
+ youtube_link_data_for_twitter_text_protection.each do |link_data|
104
+ original_text = link_data[:original_text]
105
+ href = original_text
106
+
107
+ if !href.start_with?('http://') && !href.start_with?('https://')
108
+ if href.include?('youtube.com/')
109
+ href = "https://#{href}"
110
+ else
111
+ href = "http://#{href}"
112
+ end
113
+ end
114
+
115
+ youtube_html_link = "<a href=\"#{CGI.escapeHTML(href)}\">#{CGI.escapeHTML(original_text)}</a>"
116
+ r.gsub!(link_data[:placeholder], youtube_html_link)
117
+ end
118
+
119
+ # STAGE 5: Restore original <a> tags
120
+ original_a_tag_stashes.each.with_index do |tag_content, i|
121
+ r.gsub!("@@TDIARY_GFM_A_TAG_#{i}@@", tag_content)
122
+ end
84
123
  end
85
124
 
86
125
  r = r.emojify
data/tdiary-style-gfm.gemspec CHANGED
@@ -19,11 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
20
20
  spec.require_paths = ["lib"]
21
21
 
22
- spec.add_dependency 'commonmarker'
22
+ spec.add_dependency 'commonmarker', '< 1.0'
23
23
  spec.add_dependency 'twitter-text', '>= 2.0'
24
24
  spec.add_dependency 'emot'
25
-
26
- spec.add_development_dependency "bundler", "~> 1.3"
27
- spec.add_development_dependency "rake"
28
- spec.add_development_dependency "rspec"
29
25
  end
metadata CHANGED
@@ -1,29 +1,28 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tdiary-style-gfm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - SHIBATA Hiroshi
8
- autorequire:
9
8
  bindir: bin
10
9
  cert_chain: []
11
- date: 2019-01-02 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: commonmarker
15
14
  requirement: !ruby/object:Gem::Requirement
16
15
  requirements:
17
- - - ">="
16
+ - - "<"
18
17
  - !ruby/object:Gem::Version
19
- version: '0'
18
+ version: '1.0'
20
19
  type: :runtime
21
20
  prerelease: false
22
21
  version_requirements: !ruby/object:Gem::Requirement
23
22
  requirements:
24
- - - ">="
23
+ - - "<"
25
24
  - !ruby/object:Gem::Version
26
- version: '0'
25
+ version: '1.0'
27
26
  - !ruby/object:Gem::Dependency
28
27
  name: twitter-text
29
28
  requirement: !ruby/object:Gem::Requirement
@@ -52,48 +51,6 @@ dependencies:
52
51
  - - ">="
53
52
  - !ruby/object:Gem::Version
54
53
  version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: bundler
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: '1.3'
62
- type: :development
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: '1.3'
69
- - !ruby/object:Gem::Dependency
70
- name: rake
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- version: '0'
83
- - !ruby/object:Gem::Dependency
84
- name: rspec
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- version: '0'
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - ">="
95
- - !ruby/object:Gem::Version
96
- version: '0'
97
54
  description: GFM Style for tDiary
98
55
  email:
99
56
  - hsbt@ruby-lang.org
@@ -111,7 +68,6 @@ homepage: https://github.com/tdiary/tdiary-style-gfm
111
68
  licenses:
112
69
  - GPL-3.0
113
70
  metadata: {}
114
- post_install_message:
115
71
  rdoc_options: []
116
72
  require_paths:
117
73
  - lib
@@ -126,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
126
82
  - !ruby/object:Gem::Version
127
83
  version: '0'
128
84
  requirements: []
129
- rubygems_version: 3.0.2
130
- signing_key:
85
+ rubygems_version: 3.7.0.dev
131
86
  specification_version: 4
132
87
  summary: GFM Style for tDiary
133
88
  test_files: []