jekyll-embed-urls 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c799fb3a535b9debbe5e89f5e980924932487511d5bd763654869e30b002a212
-  data.tar.gz: fb20c78186c0a51ebbb31b243ded2046826a130a141707d6e84cafcb39df7cb0
+  metadata.gz: 2671ab5689686d0a583e1136fe0b99d7614e9d23b75fae9865c000b7def5fe7c
+  data.tar.gz: 3ebcd68f3c94590cf0d57933810a56d017f1e01e21ca519c2792824178b9997c
 SHA512:
-  metadata.gz: f9de0be82e9c43c8c3527d93858974d6b1e59dcb0860bf0622143a0b9b7d86ba835cc5c28a0479dfac77cf06541cb221ad0a4825d92438631e5eba16ee5c62cc
-  data.tar.gz: 4b3632e48613bf7f07e0dcadbbf404ad35b7a98cc64f728d24c4c34908c21ceb0ba057fc3425d0449deb1d5ec37a7c40af6e7cd00f25e4d0da929bb45d586334
+  metadata.gz: 7c7229cb23e7b63afaa78fa703bb08e8f1c6a77f4079a067b03fcd95b8ee5e0aded41711a96036c0e251154e8a76a022c24f5d5b88652eac3ff18c77d8ed5f58
+  data.tar.gz: de5eff0325072f11055dd61aad1748587ffce39e84dcb3e85aac4903d90872a1ea400e7e876ddd2c59a6bb641b6822b3dc04b9f5afab9dea50bbfa36a8bd1169

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+�ܴ�^��v�|_���/$�'+*y�VJŷ�~�:˱�:@���������s��е1�̓����\���T�)�/�Ҽ�aG�S�S��P�ɿ�����g�1(��0^@$�'�`}4�t���(�[#�\�YW™3ϻ>�ZW��(-RJ\�7C�8�K�I޹���`Bb�<B�k
+K�y�Q%��2�J�̏��

data/README.md

@@ -47,7 +47,8 @@ embed:
   - canvas
   - area
   - map
-# Attribute values can be strings or array of strings
+# Attribute values can be strings or array of strings, or nil/false for
+# removing them, or true to add them without value
   attributes:
     referrerpolicy: strict-origin-when-cross-origin
     sandbox:
@@ -60,6 +61,8 @@ embed:
     - clipboard-write;
     loading: 'lazy'
     controls: true
+    width: nil
+    height: nil
     rel:
     - noopener
     - noreferrer

data/_includes/embed.html

@@ -0,0 +1,11 @@
+{% if page contains "<iframe " %}
+  <div class="embed embed-responsive embed-responsive-16by9 mb-3">
+    {{ page }}
+  </div>
+{% else %}
+  <article class="ogp card mb-3">
+    <div class="card-body">
+      {{ page }}
+    </div>
+  </article>
+{% endif %}

data/_includes/fallback.html

@@ -1,11 +1,13 @@
 {% if page.url contains "//archive.org/" or page.url contains "//www.archive.org/" %}
-  <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>
+  <div class="embed-responsive embed-responsive-16by9">
+    <iframe
+      class="embed-responsive-item"
+      allow="{{ embed.allow | join: " " }}"
+      sandbox="{{ embed.sandbox | join: " " }}"
+      loading="{{ embed.loading }}"
+      referrerpolicy="{{ embed.referrerpolicy }}"
+      src="{{ page.url | replace: "/details/", "/embed/" | uri_escape }}"></iframe>
+  </div>
 {% else %}
   {% include ogp.html type="fallback" %}
 {% endif %}

data/_includes/ogp.html

@@ -22,10 +22,10 @@
   {%- endif -%}
 
   <header class="card-body">
-    <h1>{{ page.title | escape_once }}</h1>
+    <h1 class="lead">{{ page.title | escape_once | newline_to_br }}</h1>
     {% if page.description %}
-      <p class="lead">
-        {{- page.description | escape_once -}}
+      <p>
+        {{- page.description | escape_once | newline_to_br -}}
       </p>
     {% endif %}
 

data/lib/jekyll/embed/content.rb

@@ -13,7 +13,7 @@ module Jekyll
         # @param :content [String]
         # @return [String]
         def embed(content)
-          Nokogiri::HTML5.fragment(content).tap do |html|
+          ::Nokogiri::HTML5.fragment(content).tap do |html|
             html.css('p > a').each do |a|
               next unless a.parent.children.size == 1
               next unless a['href'] == a.text.strip

data/lib/jekyll/embed.rb

@@ -51,9 +51,9 @@ module Jekyll
   # legitimate reasons to remove media from the Internet.
   class Embed
     # Attributes to apply by HTMLElement
-    IFRAME_ATTRIBUTES = %w[allow sandbox referrerpolicy loading].freeze
-    IMAGE_ATTRIBUTES = %w[referrerpolicy loading].freeze
-    MEDIA_ATTRIBUTES = %w[controls].freeze
+    IFRAME_ATTRIBUTES = %w[allow sandbox referrerpolicy loading height width].freeze
+    IMAGE_ATTRIBUTES = %w[referrerpolicy loading height width].freeze
+    MEDIA_ATTRIBUTES = %w[controls height width].freeze
     A_ATTRIBUTES = %w[referrerpolicy rel target].freeze
 
     # Directive from Feature Policy
@@ -64,6 +64,7 @@ module Jekyll
     # Templates
     INCLUDE_OGP = '{% include ogp.html %}'
     INCLUDE_FALLBACK = '{% include fallback.html %}'
+    INCLUDE_EMBED = '{% include embed.html %}'
 
     # The default referrer policy only sends the origin URL (not the
     # full URL, only the protocol/scheme and domain part) if the remote
@@ -84,7 +85,9 @@ module Jekyll
         'loading' => 'lazy',
         'controls' => true,
         'rel' => %w[noopener noreferrer],
-        'target' => '_blank'
+        'target' => '_blank',
+        'height' => nil,
+        'width' => nil
       }
     }.freeze
 
@@ -191,7 +194,10 @@ module Jekyll
           # Prevent caching of nil?
           raise OEmbed::Error unless oembed.respond_to? :html
 
-          cleanup oembed.html, url
+          context = info.dup
+          context[:registers][:page] = payload['page'] = cleanup(oembed.html, url)
+
+          embed_template.render!(payload, context)
         end
       rescue OEmbed::Error
         nil
@@ -233,7 +239,7 @@ module Jekyll
       # Try something
       def fallback(url)
         cache.getset("fallback+#{url}") do
-          html        = Nokogiri::HTML.fragment get(url).body
+          html        = ::Nokogiri::HTML.fragment get(url).body
           element     = html.css('article').first
           element   ||= html.css('section').first
           element   ||= html.css('main').first
@@ -255,7 +261,7 @@ module Jekyll
       rescue ArgumentError
         Jekyll.logger.warn 'Invalid contents (fallback):', url
         nil
-      rescue Faraday::Error, Nokogiri::SyntaxError
+      rescue Faraday::Error, ::Nokogiri::SyntaxError
         nil
       end
 
@@ -292,7 +298,7 @@ module Jekyll
         # Add our own attributes
         html.css('iframe').each do |iframe|
           IFRAME_ATTRIBUTES.each do |attr|
-            iframe[attr] = value_for_attr(attr)
+            set_value_for_attr(iframe, attr)
           end
 
           # Embedding itself require allow-same-origin
@@ -301,7 +307,7 @@ module Jekyll
 
         html.css('audio, video').each do |media|
           MEDIA_ATTRIBUTES.each do |attr|
-            media[attr] = value_for_attr(attr)
+            set_value_for_attr(media, attr)
           end
 
           media['src'] = UrlPrivacy.clean media['src']
@@ -309,22 +315,22 @@ module Jekyll
 
         html.css('img').each do |img|
           IMAGE_ATTRIBUTES.each do |attr|
-            img[attr] = value_for_attr(attr)
+            set_value_for_attr(img, attr)
           end
         end
 
         html.css('a').each do |a|
           A_ATTRIBUTES.each do |attr|
-            a[attr] = value_for_attr(attr)
+            set_value_for_attr(a, attr)
           end
         end
 
         html.css('[src]').each do |element|
-          element['src'] = CGI.escapeHTML(UrlPrivacy.clean(CGI.unescapeHTML(element['src'])))
+          element['src'] = UrlPrivacy.clean(element['src'])
         end
 
         html.css('[href]').each do |element|
-          element['href'] = CGI.escapeHTML(UrlPrivacy.clean(CGI.unescapeHTML(element['href'])))
+          element['href'] = UrlPrivacy.clean(element['href'])
         end
 
         # Return the cleaned up HTML as a String
@@ -337,6 +343,10 @@ module Jekyll
 
       private
 
+      def embed_template
+        @embed_template ||= site.liquid_renderer.file('embed.html').parse(INCLUDE_EMBED)
+      end
+
       def fallback_template
         @fallback_template ||= site.liquid_renderer.file('fallback.html').parse(INCLUDE_FALLBACK)
       end
@@ -359,11 +369,22 @@ module Jekyll
         @value_for_attr ||= {}
         @value_for_attr[attr] ||=
           case (value = config.dig('attributes', attr))
-          when String then value
           when Array then value.join(' ')
+          else value
           end
       end
 
+      # @param element [Nokogiri::XML::Element]
+      # @param attr [String]
+      # @return [nil]
+      def set_value_for_attr(element, attr)
+        case (value = value_for_attr(attr))
+        when NilClass, FalseClass then element.delete(attr)
+        when TrueClass then element[attr] = nil
+        else element[attr] = value
+        end
+      end
+
       # If the iframe comes from the same site, we can allow the same
       # origin policy on the sandbox.
       #

metadata

@@ -1,14 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEYDCCAsigAwIBAgIBATANBgkqhkiG9w0BAQsFADA7MQ4wDAYDVQQDDAVmYXVu
+  bzEVMBMGCgmSJomT8ixkARkWBXN1dHR5MRIwEAYKCZImiZPyLGQBGRYCbmwwHhcN
+  MjUwMTA3MTczMTQ1WhcNMjYwMTA3MTczMTQ1WjA7MQ4wDAYDVQQDDAVmYXVubzEV
+  MBMGCgmSJomT8ixkARkWBXN1dHR5MRIwEAYKCZImiZPyLGQBGRYCbmwwggGiMA0G
+  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDqrFZ8PCNQbaW1incHEZp/OZTIt7bZ
+  TMKmkVLeRDqsSBGWTGdZbzRS6idn0vUKlTTnclPPG7dXw1r+AiYVdwIdjx16SLV1
+  ipbT/ezdzchfBVQHqdvExszAlL689iUnM9r22KkAXSzidSWuySjA5BY+8p1S2QO5
+  NcuB/+R5JRybVn6g500EB60jAZNUMM+2OlDqzS7oVqObOZ8zl8/HJaJnBGNNYLbN
+  cUY6qV9/0HUD2fS/eidBUGhg4jPKWHLHOZuXHPmGyE8bqdKC9T+Jbk/8KFM+SW7B
+  i4nZK4afoA6IT3KfQr5xnuyH0sUQj9M9eevWcGeGMTUv+ZiWM9zdJdyOvKhqjenX
+  G32KTR1tPgV6TK5jWyi7AHGos+2huBlKCsIJzDuw4zxs5cT9cVbkJFYHRIFQIHKq
+  gKSsTSUFt1ehfGtF/rLpv+Cm75BfZPi7OMePVE2FBaXBOvSRi0cYJkmuap9BjOut
+  OfvhZ41piDp/Kh0Cjgl1+o/fWTCh27yxb50CAwEAAaNvMG0wCQYDVR0TBAIwADAL
+  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFIH0kjcsF7inzAwy488EEY5thfpiMBkGA1Ud
+  EQQSMBCBDmZhdW5vQHN1dHR5Lm5sMBkGA1UdEgQSMBCBDmZhdW5vQHN1dHR5Lm5s
+  MA0GCSqGSIb3DQEBCwUAA4IBgQCEo4E1ZAjlzw7LeJlju4BWUvKLjrbGiDNBYQir
+  lmyHhYXWV3gnozs08sM3BNzwsPwDwIhYOu3Kc+36DtEpKToUxqEGbsxX8uGzyp88
+  HTlaNsaHCZBeB2wgUYcIeO2lKdNu+V9WxfTRhYu+02OfLRv65qSfm6uck1Ml1Cg/
+  tn1Y7mLHSdnWPZCQhQZA0wX/SFL64DeozAwJLhYtKneU/m5PEqv9nNnJVCLlbODB
+  zFTjbsKtpWxNN+xWsJbjukggS8uX1400WqyjUCitDxDJknP+xeAg8wt2wT+IC1X1
+  zMY8gjxoBfwPum74cBTaZzYMpeGaS1fJ3N4NBU+SHLRDiKaVZzEnoNyJDHnsXXrX
+  MvF98+bTUHC9xcklH7RCO5uqUOq7cxIcMjzx3cpR6+AW6zXYQBjWfNB9KfaAstZy
+  cpurTQHNJfL/ah+9dYbgDXdG5HAAjRMAsWSvERw95YdN9XzQZCdUk5wUs+A6cNtO
+  AZZUMTVYNx8JqUeemxlXBRjsD/s=
+  -----END CERTIFICATE-----
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -155,6 +182,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- _includes/embed.html
 - _includes/fallback.html
 - _includes/ogp.html
 - lib/jekyll-embed-urls.rb
@@ -194,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Embed URL previsualization in Jekyll posts