jekyll-embed-urls 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28bf483423f9197271caae346deae52aa1d4b34c229dc723f58624c52f63e4d3
-  data.tar.gz: bffb7fa7898714d8eee3284f35ead0819cecca5359fa0557ef1353c1fb322fe2
+  metadata.gz: e5ec0df3dfa0876c1bdd5288ee70e5c7466dddb1d4f592339ee8855ee8b0d680
+  data.tar.gz: 12936601d35523b31d85233c53c9663834012af1631f07155a550d89e9e99af4
 SHA512:
-  metadata.gz: 143344abdd6ef63b5b8133a85697bf3aae0a64679773786a0e9fb96a26f77846abd202234169bed24f810eaf7018d96a6003897fc485d7a15f0af2ace773b589
-  data.tar.gz: fd6f00caec463617d2ce6dc0298db823f324708a5c4770725cc6391e9879fefa65bfc6c585d400652ada0feea838038ffefe73982da7795f3218ed920a2a61bf
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - f