jekyll-embed-urls 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 938576c9cdee4a9b13de0e7d2d17983db2704f7882352d5a88010c66c8ddb122
-  data.tar.gz: e34c7de8e8d9b4b36d3b995888015362fd1a561db17cd3b4304bca252f12168c
+  metadata.gz: 3c93e9e9f911c9988829cddbd88afd919995cfd55fd51a21e917e81f7044ddbf
+  data.tar.gz: 748730c8fb90b9f37f02b5cb7461a08df1502a1700a02748837450451ab0627a
 SHA512:
-  metadata.gz: 3c4cb82fb1f9accb6250dbe4b0460cde02867b7bf4b1befb93d2ca8c2f1c4bdb7204c9ceb30847bea1b1f7283be4d72f33137fcbc01c08bfce2ae93cda593cb7
-  data.tar.gz: 0e9f02488eb339c43c33c7a90f0192af3c2e069f038b2b399f6eba991423853589277e88369c0d920e03003957e2d26f3106b487db8b0b300e414abf02394625
+  metadata.gz: 2ac2e6bd99303c206cbcbe865d91f39cfc553c3d5f02d36c1ec88760a2fc757b805235f6054ae7f6d7d694d69e4f94af18a4202f635717ae13541cb9e491786c
+  data.tar.gz: f85276cd1f18db800686ff00f1cd00a83535c0c16a968b31175e6c4ba8f02492f791fdfd714de7657ac175d78da023f23a716bde46da55497ec2ac6d4a107897

data/_includes/fallback.html

@@ -1,17 +1,17 @@
-<article class="fallback">
-  {%- if page.image -%}
-    <img referrerpolicy="{{ embed.referrerpolicy }}" loading="{{ embed.loading }}" src="{{ page.image }}" class="img-fluid" />
-  {%- endif -%}
+{% if page.url contains "//archive.org/" or page.url contains "//www.archive.org/" %}
+  <iframe 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 }}</h1>
-  <p class="lead">{{ page.description }}</p>
-  <p><small>
-    <a
-      href="{{ page.url }}"
-      referrerpolicy="{{ embed.referrerpolicy }}"
-      target="{{ embed.target }}"
-      rel="{{ embed.rel }}">
-      {{ page.url }}
-    </a>
-  </small><p>
-</article>
+    <h1>{{ page.title }}</h1>
+    <p class="lead">{{ page.description }}</p>
+    <p>
+      <small>
+        <a href="{{ page.url | uri_escape }}">{{ page.url }}</a>
+      </small>
+    </p>
+  </article>
+{% endif %}

data/_includes/ogp.html

@@ -1,23 +1,19 @@
 <article class="ogp" lang="{{ page.locale }}">
   {%- if page.video -%}
-    <video poster="{{ page.image }}" class="img-fluid" {{ embed.controls }} src="{{ page.video }}"/>
+    <video poster="{{ page.image | uri_escape }}" class="img-fluid" src="{{ page.video | uri_escape }}"/>
   {%- elsif page.image -%}
-    <img referrerpolicy="{{ embed.referrerpolicy }}" loading="{{ embed.loading }}" src="{{ page.image }}" class="img-fluid" />
+    <img src="{{ page.image | uri_escape }}" class="img-fluid" />
   {%- endif -%}
 
   {%- if page.audio -%}
-    <audio class="img-fluid" {{ embed.controls }} src="{{ page.audio }}"/>
+    <audio class="img-fluid" src="{{ page.audio | uri_escape }}"/>
   {%- endif -%}
 
   <h1>{{ page.title }}</h1>
   <p class="lead">{{ page.description }}</p>
-  <p><small>
-    <a
-      href="{{ page.url }}"
-      referrerpolicy="{{ embed.referrerpolicy }}"
-      target="{{ embed.target }}"
-      rel="{{ embed.rel }}">
-      {{ page.url }}
-    </a>
-  </small><p>
+  <p>
+    <small>
+      <a href="{{ page.url | uri_escape }}">{{ page.url }}</a>
+    </small>
+  </p>
 </article>

data/lib/jekyll/embed.rb

@@ -107,10 +107,13 @@ module Jekyll
 
         # Add the _includes dir so we can provide default templates that
         # can be overriden locally or by the theme.
-        site.includes_load_paths << File.expand_path(File.join(__dir__, '..', '..', '_includes'))
+        includes_dir = File.expand_path(File.join(__dir__, '..', '..', '_includes'))
+        site.includes_load_paths << includes_dir unless site.includes_load_paths.include? includes_dir
         # Since we're embedding, we're allowing iframes
         Loofah::HTML5::SafeList::ALLOWED_ELEMENTS_WITH_LIBXML2 << 'iframe'
 
+        reset
+
         # Other elements that are disallowed
         config['scrub']&.each do |scrub|
           Loofah::HTML5::SafeList::ALLOWED_ELEMENTS_WITH_LIBXML2.delete(scrub)
@@ -121,6 +124,23 @@ module Jekyll
         site
       end
 
+      # Reset variables
+      #
+      # @return [nil]
+      def reset
+        @allow_same_origin =
+          @cache =
+          @config =
+          @fallback_template =
+          @get_cache =
+          @http_client =
+          @info =
+          @ogp_template =
+          @payload =
+          @value_for_attr =
+          nil
+      end
+
       # Render the URL as HTML
       #
       # 1. Try oembed for video and image
@@ -137,6 +157,7 @@ module Jekyll
         raise URI::Error unless url.start_with? 'http'
 
         # Just to verify the URL is valid
+        # TODO: Use Addressable
         URI.parse url
 
         oembed(url) || ogp(url) || fallback(url)
@@ -158,15 +179,13 @@ module Jekyll
       # @param [String] URL
       # @return [String,NilClass] Sanitized HTML or nil
       def oembed(url)
-        cache.getset(url) do
+        cache.getset("oembed+#{url}") do
           oembed = OEmbed::Providers.get url
 
           # Prevent caching of nil?
           raise OEmbed::Error unless oembed.respond_to? :html
 
-          # Cleanup.  We don't allow running remote scripts locally,
-          # period.
-          cleanup(Loofah.fragment(oembed.html).scrub!(:prune), url).to_s
+          cleanup oembed.html, url
         end
       rescue OEmbed::Error
         nil
@@ -176,12 +195,12 @@ module Jekyll
       # @param [String] URL
       # @return [String,NilClass]
       def ogp(url)
-        cache.getset(url) do
+        cache.getset("ogp+#{url}") do
           ogp = OGP::OpenGraph.new get(url).body
           context = info.dup
           context[:registers][:page] = payload['page'] = ogp.data
 
-          ogp_template.render! payload, context
+          cleanup ogp_template.render!(payload, context), url
         end
       rescue OGP::MalformedSourceError, OGP::MissingAttributeError, Faraday::Error
         nil
@@ -189,7 +208,7 @@ module Jekyll
 
       # Try something
       def fallback(url)
-        cache.getset(url) do
+        cache.getset("fallback+#{url}") do
           html        = Nokogiri::HTML.fragment get(url).body
           element     = html.css('article').first
           element   ||= html.css('section').first
@@ -203,10 +222,11 @@ module Jekyll
             'title' => text(title),
             'description' => text(description),
             'url' => url,
-            'image' => element&.css('img')&.first&.public_send(:[], 'src')
+            'image' => element&.css('img')&.first&.public_send(:[], 'src'),
+            'locale' => html.css('html')&.first&.public_send(:[], 'lang')
           }
 
-          fallback_template.render! payload, context
+          cleanup fallback_template.render!(payload, context), url
         end
       rescue Faraday::Error, Nokogiri::SyntaxError
         nil
@@ -232,7 +252,12 @@ module Jekyll
         end
       end
 
-      def cleanup(html, url)
+      # @params :html_fragment [String]
+      # @params :url [String]
+      # @return [String]
+      def cleanup(html_fragment, url)
+        html = Loofah.fragment(html_fragment).scrub!(:prune)
+
         # Add our own attributes
         html.css('iframe').each do |iframe|
           IFRAME_ATTRIBUTES.each do |attr|
@@ -271,8 +296,8 @@ module Jekyll
           element['href'] = CGI.escapeHTML(UrlPrivacy.clean(CGI.unescapeHTML(element['href'])))
         end
 
-        # Return the cleaned up HTML
-        html
+        # Return the cleaned up HTML as a String
+        html.to_s
       end
 
       def text(node)

data/lib/jekyll-embed-urls.rb

@@ -4,6 +4,6 @@ require_relative 'jekyll/embed'
 require_relative 'jekyll/embed/filter'
 
 # Configure Embed
-Jekyll::Hooks.register :site, :after_init do |site|
+Jekyll::Hooks.register :site, :after_reset do |site|
   Jekyll::Embed.site = site
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Embed URL previsualization in Jekyll posts