jekyll-embed-urls 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc53beb120fe0cd3b814c9db216b882cb51d7a9f2df94444aaa8c372d61d8f0a
-  data.tar.gz: edcd585582c528ef40403733c1cb6d6ba45592f79249aaad392ffcd200b9bdd2
+  metadata.gz: f0bd4036faf5edc50c02614e2116962510612c676e0c3785239aaff456b9167d
+  data.tar.gz: ca0ca066de89cfa371d7e210bcbbe1a2e05a26ed2cb47be9d139314c0bdc708e
 SHA512:
-  metadata.gz: 0f5f7f9f23203727c5cc5a0098da03dbd07cd9313676864cd598d38aa219be92bac21939aa996b095ccecc6806e3616fdc8e110a62a051675e3f93c3879900d4
-  data.tar.gz: 6d1e985faf7af343e0c8851fc9e9d99737963ef69134df8b3900600f4eb6919c5ab96c4011d3d8cee128feea969cd31c00b40ac90eba57c9d008f7009b54d8e1
+  metadata.gz: 3d36b8d81a1e88af229d85e2d5e9283f6d7a0da009fae5a640abf1fee2f9a1c413983f4f4373645f5b2cdab5fbbf04b8a74112039efa0ca25ef4a307e28dd2cf
+  data.tar.gz: 3fd61a3bf39322d8e30376ffc3fe7c340390631ba2255e1c6bfc9d067b3784afaf6fb7f160ecceacf9671fe453052524594d404bd103adf8b21105de6961d28d

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
@@ -136,13 +137,14 @@ module Jekyll
         @allow_same_origin =
           @cache =
             @config =
-              @fallback_template =
-                @get_cache =
-                  @http_client =
-                    @info =
-                      @ogp_template =
-                        @payload =
-                          @value_for_attr =
+              @embed_template =
+                @fallback_template =
+                  @get_cache =
+                    @http_client =
+                      @info =
+                        @ogp_template =
+                          @payload =
+                            @value_for_attr =
                             nil
       end
 
@@ -156,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
@@ -269,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]
@@ -285,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
 
@@ -355,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.5
+  version: 0.7.0
 platform: ruby
 authors:
 - f
@@ -12,7 +12,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIEYDCCAsigAwIBAgIBATANBgkqhkiG9w0BAQsFADA7MQ4wDAYDVQQDDAVmYXVu
   bzEVMBMGCgmSJomT8ixkARkWBXN1dHR5MRIwEAYKCZImiZPyLGQBGRYCbmwwHhcN
-  MjUwMTA3MTczMTQ1WhcNMjYwMTA3MTczMTQ1WjA7MQ4wDAYDVQQDDAVmYXVubzEV
+  MjYwMTE1MTQzMDQ0WhcNMjcwMTE1MTQzMDQ0WjA7MQ4wDAYDVQQDDAVmYXVubzEV
   MBMGCgmSJomT8ixkARkWBXN1dHR5MRIwEAYKCZImiZPyLGQBGRYCbmwwggGiMA0G
   CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDqrFZ8PCNQbaW1incHEZp/OZTIt7bZ
   TMKmkVLeRDqsSBGWTGdZbzRS6idn0vUKlTTnclPPG7dXw1r+AiYVdwIdjx16SLV1
@@ -25,17 +25,17 @@ cert_chain:
   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=
+  MA0GCSqGSIb3DQEBCwUAA4IBgQCbC2LPbQwQ0YMvyx87FOEu56X+CG14d8+jXQzQ
+  +vXs5mn8KxNsLpqwesLpQUrnZo2Riu508XvHnz5S+LRQgHs3fWJxZAzZgk3IQpaS
+  RfYx/S+2D/Pj5BbFUrQtSzvb+bT1bQp33SP4iF3qVt89Mcm+wnlXGoB6DvjZ+48g
+  Vo94+QPTx5xCEUX50bkO2NZlQ4BE8IiHAaGR5c3tF5+pc+SnEFXFGJSYzXciyNgf
+  j2/Kvfs1W/X+W6mCoo6tTgHQM9vMk7bgREZkhQ33iNK6+7IsGCDlNuKcXjJykSqJ
+  zY6og/GTEVPpKbFvHcrebKT6HMOCIMD5Q/8whxTWH+GWMuoV9l7tikfX2uAKz/fS
+  Ci6FFLH2vK5bS5h0ZTCDaJwZ3ikKQl52F+IY3NxFmg3X38xlVrDqnIZWb06aAXjO
+  AloSNM24NWhA2fme6cgZOLKXvAKgf6pQsNtAnU1Pliou5GvJ62d8l+pdKGxJ4yTn
+  fVGcO+Lu49Bx33evJ2ixPmQ2OXc=
   -----END CERTIFICATE-----
-date: 2025-11-06 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,12 +182,14 @@ 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

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