jekyll-embed-urls 0.5.15 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6bd87ed1305e3c6b813f1a17ae6b1f57293f1e53f70052d4a92285f9d10674
-  data.tar.gz: a26acd7ccac02577798927a11d04bf7a6676da9d7b9efcf62c72d0400f10c949
+  metadata.gz: c799fb3a535b9debbe5e89f5e980924932487511d5bd763654869e30b002a212
+  data.tar.gz: fb20c78186c0a51ebbb31b243ded2046826a130a141707d6e84cafcb39df7cb0
 SHA512:
-  metadata.gz: a197fb8c7458e8e05610a111389d81552371e536ba56ebe7ab94cabc87ffc6c1ad36dfd8448a096cf541dcfe5cb815644503cb82bc1ce0194f9510da60ee752b
-  data.tar.gz: 55dbfd919087ebc2cda92a72e8cb51dcbcd5edfb40cd0f0f14bf5fb76460d32a1cc91477b0756075bf325a2515c6a6969389930cd081342fffdb52be225f99c2
+  metadata.gz: f9de0be82e9c43c8c3527d93858974d6b1e59dcb0860bf0622143a0b9b7d86ba835cc5c28a0479dfac77cf06541cb221ad0a4825d92438631e5eba16ee5c62cc
+  data.tar.gz: 4b3632e48613bf7f07e0dcadbbf404ad35b7a98cc64f728d24c4c34908c21ceb0ba057fc3425d0449deb1d5ec37a7c40af6e7cd00f25e4d0da929bb45d586334

data/_includes/fallback.html

@@ -1,17 +1,11 @@
 {% if page.url contains "//archive.org/" or page.url contains "//www.archive.org/" %}
-  <iframe src="{{ page.url | replace: "/details/", "/embed/" | uri_escape }}"></iframe>
+  <iframe
+    class="w-100"
+    allow="{{ embed.allow | join: " " }}"
+    sandbox="{{ embed.sandbox | join: " " }}"
+    loading="{{ embed.loading }}"
+    referrerpolicy="{{ embed.referrerpolicy }}"
+    src="{{ page.url | replace: "/details/", "/embed/" | uri_escape }}"></iframe>
 {% else %}
-  <article class="fallback" lang="{{ page.locale }}">
-    {%- if page.image -%}
-      <img src="{{ page.image | uri_escape }}" class="img-fluid" />
-    {%- endif -%}
-
-    <h1>{{ page.title | escape_once }}</h1>
-    <p class="lead">{{ page.description | escape_once }}</p>
-    <p>
-      <small>
-        <a href="{{ page.url | uri_escape }}">{{ page.url }}</a>
-      </small>
-    </p>
-  </article>
+  {% include ogp.html type="fallback" %}
 {% endif %}

data/_includes/ogp.html

@@ -1,19 +1,41 @@
-<article class="ogp" lang="{{ page.locale }}">
+<article class="{{ include.type | default: "ogp" }} card mb-3" lang="{{ page.locale }}">
   {%- if page.video -%}
-    <video poster="{{ page.image | uri_escape }}" class="img-fluid" src="{{ page.video | uri_escape }}"/>
+    <video
+      {% if embed.controls %}controls{% endif %}
+      poster="{{ page.image | uri_escape }}"
+      preload="none"
+      class="img-fluid"
+      src="{{ page.video | uri_escape }}"/>
   {%- elsif page.image -%}
-    <img src="{{ page.image | uri_escape }}" class="img-fluid" />
+    <img
+      src="{{ page.image | uri_escape }}"
+      class="img-fluid"
+      loading="{{ embed.loading }}"
+      referrerpolicy="{{ embed.referrerpolicy }}" />
   {%- endif -%}
 
   {%- if page.audio -%}
-    <audio class="img-fluid" src="{{ page.audio | uri_escape }}"/>
+    <audio
+      {% if embed.controls %}controls{% endif %}
+      class="w-100"
+      src="{{ page.audio | uri_escape }}"/>
   {%- endif -%}
 
-  <h1>{{ page.title | escape_once }}</h1>
-  <p class="lead">{{ page.description | escape_once }}</p>
-  <p>
-    <small>
-      <a href="{{ page.url | uri_escape }}">{{ page.url }}</a>
-    </small>
-  </p>
+  <header class="card-body">
+    <h1>{{ page.title | escape_once }}</h1>
+    {% if page.description %}
+      <p class="lead">
+        {{- page.description | escape_once -}}
+      </p>
+    {% endif %}
+
+    <a
+      class="card-link"
+      rel="{{ embed.rel | join: " "}}"
+      target="{{ embed.target }}"
+      referrerpolicy="{{ embed.referrerpolicy }}"
+      href="{{ page.url | uri_escape }}">
+      {{- page.url -}}
+    </a>
+  </header>
 </article>

data/lib/jekyll/embed/content.rb

@@ -14,16 +14,13 @@ module Jekyll
         # @return [String]
         def embed(content)
           Nokogiri::HTML5.fragment(content).tap do |html|
-            html.css('p > a:first-of-type').each do |a|
-              next unless a.parent.children.last == a
+            html.css('p > a').each do |a|
+              next unless a.parent.children.size == 1
+              next unless a['href'] == a.text.strip
 
-              url = a['href']
+              embed = Jekyll::Embed.embed a['href']
 
-              next unless url == a.text.strip
-
-              embed = Jekyll::Embed.embed url
-
-              next if url == embed
+              next if a['href'] == embed
 
               a.parent.replace embed
             end

data/lib/jekyll/embed.rb

@@ -62,8 +62,8 @@ module Jekyll
                     encrypted-media execution-while-not-rendered execution-while-out-of-viewport fullscreen gamepad geolocation gyroscope layout-animations legacy-image-formats magnetometer microphone midi navigation-override oversized-images payment picture-in-picture publickey-credentials-get speaker-selection sync-xhr usb screen-wake-lock web-share xr-spatial-tracking].freeze
 
     # Templates
-    INCLUDE_OGP = '{% include ogp.html site=site page=page %}'
-    INCLUDE_FALLBACK = '{% include fallback.html site=site page=page %}'
+    INCLUDE_OGP = '{% include ogp.html %}'
+    INCLUDE_FALLBACK = '{% include fallback.html %}'
 
     # The default referrer policy only sends the origin URL (not the
     # full URL, only the protocol/scheme and domain part) if the remote
@@ -79,7 +79,7 @@ module Jekyll
       'scrub' => %w[form input textarea button fieldset select option optgroup canvas area map],
       'attributes' => {
         'referrerpolicy' => 'strict-origin-when-cross-origin',
-        'sandbox' => %w[allow-scripts allow-popups],
+        'sandbox' => %w[allow-scripts allow-popups allow-popups-to-escape-sandbox],
         'allow' => %w[fullscreen; gyroscope; picture-in-picture; clipboard-write;],
         'loading' => 'lazy',
         'controls' => true,
@@ -226,7 +226,7 @@ module Jekyll
       rescue ArgumentError
         Jekyll.logger.warn 'Invalid contents (OGP):', url
         nil
-      rescue OGP::MalformedSourceError, OGP::MissingAttributeError, Faraday::Error
+      rescue LL::ParserError, OGP::MalformedSourceError, OGP::MissingAttributeError, Faraday::Error
         nil
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.6.0
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll