jekyll-embed-urls 0.6.6 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12d3043d130f692bd625a670d6ebf24d14da12b5d1997b2067e5db85d1a0317f
-  data.tar.gz: 132e39eef0c714addba099dd240900c5abe409f5fb21cdaed00c94eba093497c
+  metadata.gz: 612fbcd2557b3db7883b7bda7d1d874357cf4f652384f887685a6fb35d675ef4
+  data.tar.gz: 25166d8f4dc9d9b953583a2124cbdf35a22a3006afd63766389830de4360b2d1
 SHA512:
-  metadata.gz: c93e9272a5716502be3478b790488bfbdb10a2ec4aaa0c0f91373eceb2942a0f03095f8b628d729f2f9c23962430b667e3790e93c8948e7fae12e23ff5b9dc86
-  data.tar.gz: 5007c5fe2d907dc780f388b27be46ea06199e5e6b0148363c4cd31086ae5f8811e4f17bb0971b1a86c79d0101abdc006e56c146061d9a375fd947b026983598e
+  metadata.gz: 53301974408d6a8a99e33bdfea578d26c17de670e4b1d667aaff7a44ef40beac3be145d94a675c7d01fd8a7ef5bdbe34f0e8f5ca273e367832a14f32c7e7f02a
+  data.tar.gz: 488ebe6cb0a87f935bdcc01978c385a00adf8e7fc8d8fe889a95718845070f3b7042160789795a0244248ac7ac1cca188c7b6b7beefa73ef16bdb59b9cbe8ee7

data/_includes/audio.html

@@ -0,0 +1,3 @@
+<figure>
+  <audio src="{{ url | component_escape }}" controls preload="metadata" loading="lazy" crossorigin="anonymous" class="w-100" />
+</figure>

data/_includes/image.html

@@ -0,0 +1,3 @@
+<figure>
+  <img src="{{ url | component_escape }}" loading="lazy" crossorigin="anonymous" referrerpolicy="strict-origin-when-cross-origin" class="img-fluid" />
+</figure>

data/_includes/video.html

@@ -0,0 +1,3 @@
+<figure>
+  <video src="{{ url | component_escape }}" controls preload="metadata" loading="lazy" crossorigin="anonymous" class="img-fluid" />
+</figure>

data/lib/jekyll/embed.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'faraday-http-cache'
 require 'faraday_middleware/response/follow_redirects'
 require 'faraday_middleware/redirect_limit_reached'
 require 'loofah'
@@ -9,7 +8,6 @@ require 'ogp'
 require 'url_privacy'
 
 require_relative 'embed/oembed'
-require_relative 'embed/cache'
 
 if Gem::Version.new(Jekyll::VERSION) >= Gem::Version.new('4.2.0')
   require_relative 'embed/content'
@@ -65,6 +63,9 @@ module Jekyll
     INCLUDE_OGP = '{% include ogp.html %}'
     INCLUDE_FALLBACK = '{% include fallback.html %}'
     INCLUDE_EMBED = '{% include embed.html %}'
+    INCLUDE_IMAGE = '{% include image.html %}'
+    INCLUDE_VIDEO = '{% include video.html %}'
+    INCLUDE_AUDIO = '{% include audio.html %}'
 
     # The default referrer policy only sends the origin URL (not the
     # full URL, only the protocol/scheme and domain part) if the remote
@@ -157,20 +158,46 @@ module Jekyll
       # @param [String] URL
       # @return [String] HTML
       def embed(url)
-        raise URI::Error unless url.is_a? String
+        raise URI::Error.new(url.class.name) unless url.is_a? String
 
         url = url.strip
+        url = "https://#{url}" if url.start_with? '//'
 
         # Quick check
-        raise URI::Error unless url.start_with? 'http'
+        raise URI::Error.new(url) unless url.start_with? 'http'
+
+        url = UrlPrivacy.clean(url)
 
         # Just to verify the URL is valid
         # TODO: Use Addressable
         URI.parse url
 
-        oembed(url) || ogp(url) || fallback(url) || url
-      rescue URI::Error
-        Jekyll.logger.warn "#{url.inspect} is not a valid URL"
+        # Check the content type, if it's not a webpage, we need to
+        # build something else
+        head = http_client.head url
+
+        raise URI::Error.new(head.status.to_s) unless head.success?
+
+        case head.headers['content-type']
+        when /\Atext\/html;? /
+          oembed(url) || ogp(url) || fallback(url) || url
+        when /\Aimage\//
+          context = info.dup
+          context[:url] = url
+          image_template.render!(payload, context)
+        when /\Avideo\//
+          context = info.dup
+          context[:url] = url
+          video_template.render!(payload, context)
+        when /\Aaudio\//
+          context = info.dup
+          context[:url] = url
+          audio_template.render!(payload, context)
+        else
+          raise URI::Error
+        end
+      rescue URI::Error, Faraday::Error => e
+        Jekyll.logger.warn "#{url.inspect} is not a valid URL: #{e.message}"
 
         url
       end
@@ -270,12 +297,17 @@ module Jekyll
       # @return [Faraday::Response]
       def get(url)
         @get_cache ||= {}
-        @get_cache[url] ||= http_client.get url
+        @get_cache[url.to_s] ||= http_client.get url
       end
 
-      # @return [Jekyll::Embed::Cache]
+      def head(url)
+        @head_cache ||= {}
+        @head_cache[url.to_s] ||= http_client.head url
+      end
+
+      # @return [Jekyll::Cache]
       def cache
-        @cache ||= Jekyll::Embed::Cache.new('Jekyll::Embed')
+        @cache ||= Jekyll::Cache.new('Jekyll::Embed')
       end
 
       # @return [Faraday::Connection]
@@ -286,7 +318,6 @@ module Jekyll
           builder.options.read_timeout = 1
           builder.options.write_timeout = 1
           builder.use FaradayMiddleware::FollowRedirects
-          builder.use :http_cache, shared_cache: false, store: cache, serializer: Marshal
         end
       end
 
@@ -356,6 +387,18 @@ module Jekyll
         @ogp_template ||= site.liquid_renderer.file('ogp.html').parse(INCLUDE_OGP)
       end
 
+      def image_template
+        @image_template ||= site.liquid_renderer.file('image.html').parse(INCLUDE_IMAGE)
+      end
+
+      def video_template
+        @video_template ||= site.liquid_renderer.file('video.html').parse(INCLUDE_VIDEO)
+      end
+
+      def audio_template
+        @audio_template ||= site.liquid_renderer.file('audio.html').parse(INCLUDE_AUDIO)
+      end
+
       def info
         @info ||= {
           registers: { site: site },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.1
 platform: ruby
 authors:
 - f
@@ -35,7 +35,7 @@ cert_chain:
   AloSNM24NWhA2fme6cgZOLKXvAKgf6pQsNtAnU1Pliou5GvJ62d8l+pdKGxJ4yTn
   fVGcO+Lu49Bx33evJ2ixPmQ2OXc=
   -----END CERTIFICATE-----
-date: 2026-08-11 00:00:00.000000000 Z
+date: 2026-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -114,47 +114,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: faraday-http-cache
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: url-privacy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: url-privacy
+  name: sutty-liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -182,23 +182,24 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- _includes/audio.html
 - _includes/embed.html
 - _includes/fallback.html
+- _includes/image.html
 - _includes/ogp.html
+- _includes/video.html
 - lib/jekyll-embed-urls.rb
 - lib/jekyll/embed.rb
-- lib/jekyll/embed/cache.rb
 - lib/jekyll/embed/content.rb
 - lib/jekyll/embed/filter.rb
 - lib/jekyll/embed/oembed.rb
-homepage: https://0xacab.org/sutty/jekyll/jekyll-embed-urls
+homepage: https://git.sutty.abyaya.la/jekyll/jekyll-embed-urls
 licenses:
 - GPL-3.0
 metadata:
-  bug_tracker_uri: https://0xacab.org/sutty/jekyll/jekyll-embed-urls/issues
-  homepage_uri: https://0xacab.org/sutty/jekyll/jekyll-embed-urls
-  source_code_uri: https://0xacab.org/sutty/jekyll/jekyll-embed-urls
-  changelog_uri: https://0xacab.org/sutty/jekyll/jekyll-embed-urls/-/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://git.sutty.abyaya.la/jekyll/jekyll-embed-urls/issues
+  homepage_uri: https://git.sutty.abyaya.la/jekyll/jekyll-embed-urls
+  source_code_uri: https://git.sutty.abyaya.la/jekyll/jekyll-embed-urls
   documentation_uri: https://rubydoc.info/gems/jekyll-embed-urls
 post_install_message:
 rdoc_options:
@@ -215,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/jekyll/embed/cache.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class Embed
-    # Jekyll cache that behaves like ActiveSupport::Cache
-    class Cache < Jekyll::Cache
-      def write(key, value)
-        self[key] = value
-      end
-
-      def read(key)
-        self[key]
-      rescue StandardError
-        nil
-      end
-    end
-  end
-end