jekyll-embed-urls 0.4.5 → 0.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/_includes/fallback.html +16 -16
- data/_includes/ogp.html +8 -12
- data/lib/jekyll/embed/content.rb +4 -4
- data/lib/jekyll/embed.rb +17 -12
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bf83c997e61bc80c849cede54bbd5acbc396ea050625816c7bdca3bb04d3cca5
|
4
|
+
data.tar.gz: 33bc4f1c0f1279eb41df3e30c9d9c0e8d60177a1a47fa5be2b1d339641bf7e49
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6d55b3655e34c323628a22d31ebd53224eb23538e3e1f4c0caf2f2670bd67e70bd49adae7315d170642c274719feb3ef5d33bc11a88ec074f3e1d8b50d7f5b62
|
7
|
+
data.tar.gz: d362fdcb2bf28d64bec1bd08eceaac38fad91c70a3fccea16a6322ab87e3511b361560fba14fa8d4ae3b37e845a27bc32c68f3d650e7937c90f85e29003dda3b
|
data/_includes/fallback.html
CHANGED
@@ -1,17 +1,17 @@
|
|
1
|
-
|
2
|
-
{
|
3
|
-
|
4
|
-
{
|
1
|
+
{% if page.url contains "//archive.org/" or page.url contains "//www.archive.org/" %}
|
2
|
+
<iframe src="{{ page.url | replace: "/details/", "/embed/" | uri_escape }}"></iframe>
|
3
|
+
{% else %}
|
4
|
+
<article class="fallback" lang="{{ page.locale }}">
|
5
|
+
{%- if page.image -%}
|
6
|
+
<img src="{{ page.image | uri_escape }}" class="img-fluid" />
|
7
|
+
{%- endif -%}
|
5
8
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
</a>
|
16
|
-
</small><p>
|
17
|
-
</article>
|
9
|
+
<h1>{{ page.title }}</h1>
|
10
|
+
<p class="lead">{{ page.description }}</p>
|
11
|
+
<p>
|
12
|
+
<small>
|
13
|
+
<a href="{{ page.url | uri_escape }}">{{ page.url }}</a>
|
14
|
+
</small>
|
15
|
+
</p>
|
16
|
+
</article>
|
17
|
+
{% endif %}
|
data/_includes/ogp.html
CHANGED
@@ -1,23 +1,19 @@
|
|
1
1
|
<article class="ogp" lang="{{ page.locale }}">
|
2
2
|
{%- if page.video -%}
|
3
|
-
<video poster="{{ page.image }}" class="img-fluid"
|
3
|
+
<video poster="{{ page.image | uri_escape }}" class="img-fluid" src="{{ page.video | uri_escape }}"/>
|
4
4
|
{%- elsif page.image -%}
|
5
|
-
<img
|
5
|
+
<img src="{{ page.image | uri_escape }}" class="img-fluid" />
|
6
6
|
{%- endif -%}
|
7
7
|
|
8
8
|
{%- if page.audio -%}
|
9
|
-
<audio class="img-fluid"
|
9
|
+
<audio class="img-fluid" src="{{ page.audio | uri_escape }}"/>
|
10
10
|
{%- endif -%}
|
11
11
|
|
12
12
|
<h1>{{ page.title }}</h1>
|
13
13
|
<p class="lead">{{ page.description }}</p>
|
14
|
-
<p
|
15
|
-
<
|
16
|
-
href="{{ page.url }}"
|
17
|
-
|
18
|
-
|
19
|
-
rel="{{ embed.rel }}">
|
20
|
-
{{ page.url }}
|
21
|
-
</a>
|
22
|
-
</small><p>
|
14
|
+
<p>
|
15
|
+
<small>
|
16
|
+
<a href="{{ page.url | uri_escape }}">{{ page.url }}</a>
|
17
|
+
</small>
|
18
|
+
</p>
|
23
19
|
</article>
|
data/lib/jekyll/embed/content.rb
CHANGED
@@ -5,17 +5,17 @@ require 'cgi'
|
|
5
5
|
module Jekyll
|
6
6
|
class Embed
|
7
7
|
class Content
|
8
|
-
URL_RE =
|
8
|
+
URL_RE = /(<p[^>]*>[\s\n]*(https?:\/\/[^<\s\n]+)[\s\n]*<\/p>)/m.freeze
|
9
9
|
|
10
10
|
class << self
|
11
11
|
# Find URLs on paragraphs. We do it after rendering because
|
12
12
|
# sometimes we use HTML instead of pure Markdown and this way we
|
13
13
|
# catch both.
|
14
14
|
def embed!(content)
|
15
|
-
|
16
|
-
embed = Jekyll::Embed.embed CGI.unescapeHTML(
|
15
|
+
content.scan(URL_RE) do |p, url|
|
16
|
+
embed = Jekyll::Embed.embed CGI.unescapeHTML(url)
|
17
17
|
|
18
|
-
content.sub!
|
18
|
+
content.sub! p, embed
|
19
19
|
end
|
20
20
|
end
|
21
21
|
end
|
data/lib/jekyll/embed.rb
CHANGED
@@ -157,6 +157,7 @@ module Jekyll
|
|
157
157
|
raise URI::Error unless url.start_with? 'http'
|
158
158
|
|
159
159
|
# Just to verify the URL is valid
|
160
|
+
# TODO: Use Addressable
|
160
161
|
URI.parse url
|
161
162
|
|
162
163
|
oembed(url) || ogp(url) || fallback(url)
|
@@ -178,15 +179,13 @@ module Jekyll
|
|
178
179
|
# @param [String] URL
|
179
180
|
# @return [String,NilClass] Sanitized HTML or nil
|
180
181
|
def oembed(url)
|
181
|
-
cache.getset(url) do
|
182
|
+
cache.getset("oembed+#{url}") do
|
182
183
|
oembed = OEmbed::Providers.get url
|
183
184
|
|
184
185
|
# Prevent caching of nil?
|
185
186
|
raise OEmbed::Error unless oembed.respond_to? :html
|
186
187
|
|
187
|
-
|
188
|
-
# period.
|
189
|
-
cleanup(Loofah.fragment(oembed.html).scrub!(:prune), url).to_s
|
188
|
+
cleanup oembed.html, url
|
190
189
|
end
|
191
190
|
rescue OEmbed::Error
|
192
191
|
nil
|
@@ -196,12 +195,12 @@ module Jekyll
|
|
196
195
|
# @param [String] URL
|
197
196
|
# @return [String,NilClass]
|
198
197
|
def ogp(url)
|
199
|
-
cache.getset(url) do
|
198
|
+
cache.getset("ogp+#{url}") do
|
200
199
|
ogp = OGP::OpenGraph.new get(url).body
|
201
200
|
context = info.dup
|
202
201
|
context[:registers][:page] = payload['page'] = ogp.data
|
203
202
|
|
204
|
-
ogp_template.render!
|
203
|
+
cleanup ogp_template.render!(payload, context), url
|
205
204
|
end
|
206
205
|
rescue OGP::MalformedSourceError, OGP::MissingAttributeError, Faraday::Error
|
207
206
|
nil
|
@@ -209,7 +208,7 @@ module Jekyll
|
|
209
208
|
|
210
209
|
# Try something
|
211
210
|
def fallback(url)
|
212
|
-
cache.getset(url) do
|
211
|
+
cache.getset("fallback+#{url}") do
|
213
212
|
html = Nokogiri::HTML.fragment get(url).body
|
214
213
|
element = html.css('article').first
|
215
214
|
element ||= html.css('section').first
|
@@ -223,10 +222,11 @@ module Jekyll
|
|
223
222
|
'title' => text(title),
|
224
223
|
'description' => text(description),
|
225
224
|
'url' => url,
|
226
|
-
'image' => element&.css('img')&.first&.public_send(:[], 'src')
|
225
|
+
'image' => element&.css('img')&.first&.public_send(:[], 'src'),
|
226
|
+
'locale' => html.css('html')&.first&.public_send(:[], 'lang')
|
227
227
|
}
|
228
228
|
|
229
|
-
fallback_template.render!
|
229
|
+
cleanup fallback_template.render!(payload, context), url
|
230
230
|
end
|
231
231
|
rescue Faraday::Error, Nokogiri::SyntaxError
|
232
232
|
nil
|
@@ -252,7 +252,12 @@ module Jekyll
|
|
252
252
|
end
|
253
253
|
end
|
254
254
|
|
255
|
-
|
255
|
+
# @params :html_fragment [String]
|
256
|
+
# @params :url [String]
|
257
|
+
# @return [String]
|
258
|
+
def cleanup(html_fragment, url)
|
259
|
+
html = Loofah.fragment(html_fragment).scrub!(:prune)
|
260
|
+
|
256
261
|
# Add our own attributes
|
257
262
|
html.css('iframe').each do |iframe|
|
258
263
|
IFRAME_ATTRIBUTES.each do |attr|
|
@@ -291,8 +296,8 @@ module Jekyll
|
|
291
296
|
element['href'] = CGI.escapeHTML(UrlPrivacy.clean(CGI.unescapeHTML(element['href'])))
|
292
297
|
end
|
293
298
|
|
294
|
-
# Return the cleaned up HTML
|
295
|
-
html
|
299
|
+
# Return the cleaned up HTML as a String
|
300
|
+
html.to_s
|
296
301
|
end
|
297
302
|
|
298
303
|
def text(node)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jekyll-embed-urls
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- f
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-04-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: jekyll
|