jekyll-embed-urls 0.5.8 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28bf483423f9197271caae346deae52aa1d4b34c229dc723f58624c52f63e4d3
-  data.tar.gz: bffb7fa7898714d8eee3284f35ead0819cecca5359fa0557ef1353c1fb322fe2
+  metadata.gz: 4f66f81ca34c06a06a4c8519a1d9546895f6698f5fd7c424c055fa8b8608cced
+  data.tar.gz: 0c1ebc0d78a87f5a70aae5d05d28e91f5ad055b062a4f0a6b48c5d5121f480be
 SHA512:
-  metadata.gz: 143344abdd6ef63b5b8133a85697bf3aae0a64679773786a0e9fb96a26f77846abd202234169bed24f810eaf7018d96a6003897fc485d7a15f0af2ace773b589
-  data.tar.gz: fd6f00caec463617d2ce6dc0298db823f324708a5c4770725cc6391e9879fefa65bfc6c585d400652ada0feea838038ffefe73982da7795f3218ed920a2a61bf
+  metadata.gz: '093281bf98dc26ce527765278ae0b3c355fa26e8b95f8bb6e1aa7315f8d5b8c379edd89b7f1de7d12a056712efc7c8a4bdba6f3968b112fda8515cd255e84cf7'
+  data.tar.gz: 7b6e74bedcb632fd8849ce806c498fed855e71807f7f65b25265afa276ee5bad9378ee1f9115e6cc569fc8576e56c1566a1f2834ebc43096bf8c145a8851107e

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 unless 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.10
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll