jekyll-embed-urls 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009ec95cb733855d621b7b063e4922c79873296fdebd99f16ad6f2856854a7af'
-  data.tar.gz: e56ca532db963a099a4c4c6950c4382ca25d83c5102703b8bf2d66fd98d8f2a9
+  metadata.gz: e5ec0df3dfa0876c1bdd5288ee70e5c7466dddb1d4f592339ee8855ee8b0d680
+  data.tar.gz: 12936601d35523b31d85233c53c9663834012af1631f07155a550d89e9e99af4
 SHA512:
-  metadata.gz: d60e0cfb3395976201a2b9b4174aaf1b888ef88fede4c802302002787471a0d8268c89d8d1cb447fa24bcebee7ac5f4ce83865b5770e0fe5ca38cd93ebb7e8e4
-  data.tar.gz: 4310e1aa4409b2724e8dfc9b68ecc96e4eabe83709a19cb7e5d3745a895b9e7bb32af78dece340f6c4e37807813582cdb07517253a40f739c7206db03db606f3
+  metadata.gz: 81cf85b599fbf906e97cdf613a72491b00201c3ee5146d5dc79b9905c653e0129ccfde210ba64575c9e354df8e9f4c52345e88771e6ef4b58d4255a01a140878
+  data.tar.gz: ccefa67e84ec9d2f24a3b1cba04dfb2cc285726b48528a486f468b50e335bd6902d07f3b2be016c4527a2f9e5d2cb69ebb9f60ff988974911e4da8989f60133a

data/lib/jekyll/embed/content.rb

@@ -1,27 +1,30 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require 'nokogiri'
 
 module Jekyll
   class Embed
     class Content
-      URL_RE = %r{(<p[^>]*>[\s\n]*(<a[^>]*>)?[\s\n]*(https?://[^<\s\n]+)[\s\n]*(</a>)?[\s\n]*</p>)}m.freeze
-
       class << self
         # Find URLs on paragraphs.  We do it after rendering because
         # sometimes we use HTML instead of pure Markdown and this way we
         # catch both.
-        def embed!(content)
-          content.gsub!(URL_RE) do |match|
-            url = CGI.unescapeHTML(Regexp.last_match(3))
-            embed = Jekyll::Embed.embed url
+        #
+        # @param :content [String]
+        # @return [String]
+        def embed(content)
+          Nokogiri::HTML5.fragment(content).tap do |html|
+            html.css('p > a:first-of-type').each do |a|
+              next if a.parent.children.last == a
+
+              url = a['href']
+              embed = Jekyll::Embed.embed url
+
+              next if url == embed
 
-            if embed == url
-              match
-            else
-              embed
+              a.parent.replace embed
             end
-          end
+          end.to_s
         end
       end
     end
@@ -29,5 +32,5 @@ module Jekyll
 end
 
 Jekyll::Hooks.register :posts, :post_convert do |post|
-  Jekyll::Embed::Content.embed! post.content
+  post.content = Jekyll::Embed::Content.embed post.content
 end

data/lib/jekyll/embed/oembed.rb

@@ -6,7 +6,7 @@ module OEmbed
   module ProviderDecorator
     def self.included(base)
       base.class_eval do
-        def http_get(url, _)
+        private def http_get(url, _)
           Jekyll::Embed.get(url.to_s).body
         rescue Faraday::Error
           raise OEmbed::UnknownResponse
@@ -17,3 +17,4 @@ module OEmbed
 end
 
 OEmbed::Provider.include OEmbed::ProviderDecorator
+OEmbed::ProviderDiscovery.singleton_class.include OEmbed::ProviderDecorator

data/lib/jekyll/embed.rb

@@ -265,6 +265,10 @@ module Jekyll
       # @return [Faraday::Connection]
       def http_client
         @http_client ||= Faraday.new do |builder|
+          builder.options.timeout = 4
+          builder.options.open_timeout = 1
+          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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Embed URL previsualization in Jekyll posts