jekyll-embed-urls 0.5.2.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d11b19f16157c809c01247693974be13edc000f98a2bb1c329195dcbcbbd63
-  data.tar.gz: 47025e3ef114b859e01d255da155e1a5339a4a1cc8c080e6b5b737d60379d100
+  metadata.gz: 0e6e72a30b43d661e9c852d548f48ba8f600cbbde41e6873489cf9ceb3d4435c
+  data.tar.gz: dd437ba4bbfa32d8e9c26792a3547672ae4197d8b23029b538d3a1ca814e64b7
 SHA512:
-  metadata.gz: d38b872755e5e6ee32c0ac3220820f8cd5e42cb309ae710dfd665700c7a3c779a743ed7c2e127265048123f985686083f7d293712fe7d107f84bc5be311e1d8a
-  data.tar.gz: c762ed1d8802dd516767c6b29a995a2c80f74478af9fdb675ba05a1fca1b03b5d19ed547b4cbaf6cc25d84a30061c26abe74cc37b9d1cc680ac251fac8af4060
+  metadata.gz: 9c6cb5356446f930287dd1feca9ac024db143a0f3bf531dc19f94e6e7b4a2602125a2b20bafb1029da46ad15c4cdfcbb4c2e783967f6bba16e1b21310c496557
+  data.tar.gz: b98314a98b042a9c7cf1f9cfbeacce6662d11b6c5ec8d6d85e0d96ea3f2bc32d0e0bcea8cf3fd387b7872fcbeb0555d2873ff242dc84f8e503e40a2374f23140

data/_includes/fallback.html

@@ -6,8 +6,8 @@
       <img src="{{ page.image | uri_escape }}" class="img-fluid" />
     {%- endif -%}
 
-    <h1>{{ page.title }}</h1>
-    <p class="lead">{{ page.description }}</p>
+    <h1>{{ page.title | escape_once }}</h1>
+    <p class="lead">{{ page.description | escape_once }}</p>
     <p>
       <small>
         <a href="{{ page.url | uri_escape }}">{{ page.url }}</a>

data/_includes/ogp.html

@@ -9,8 +9,8 @@
     <audio class="img-fluid" src="{{ page.audio | uri_escape }}"/>
   {%- endif -%}
 
-  <h1>{{ page.title }}</h1>
-  <p class="lead">{{ page.description }}</p>
+  <h1>{{ page.title | escape_once }}</h1>
+  <p class="lead">{{ page.description | escape_once }}</p>
   <p>
     <small>
       <a href="{{ page.url | uri_escape }}">{{ page.url }}</a>

data/lib/jekyll/embed/content.rb

@@ -5,15 +5,22 @@ require 'cgi'
 module Jekyll
   class Embed
     class Content
-      URL_RE = /(<p[^>]*>[\s\n]*(https?:\/\/[^<\s\n]+)[\s\n]*<\/p>)/m.freeze
+      URL_RE = /(<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 |_|
-            Jekyll::Embed.embed CGI.unescapeHTML($3)
+          content.gsub!(URL_RE) do |match|
+            url = CGI.unescapeHTML($3)
+            embed = Jekyll::Embed.embed url
+
+            if embed == url
+              match
+            else
+              embed
+            end
           end
         end
       end

data/lib/jekyll/embed.rb

@@ -160,7 +160,7 @@ module Jekyll
         # TODO: Use Addressable
         URI.parse url
 
-        oembed(url) || ogp(url) || fallback(url)
+        oembed(url) || ogp(url) || fallback(url) || url
       rescue URI::Error
         Jekyll.logger.warn "#{url.inspect} is not a valid URL"
 
@@ -197,8 +197,23 @@ module Jekyll
       def ogp(url)
         cache.getset("ogp+#{url}") do
           ogp = OGP::OpenGraph.new get(url).body
+          page = {
+            locale: ogp.locales.first,
+            title: ogp.title,
+            url: ogp.url,
+            description: ogp.description,
+            type: ogp.type,
+            data: ogp.data
+          }.transform_keys(&:to_s)
+
+          %w[image video audio].each do |attr|
+            page[attr] = ogp.public_send(:"#{attr}s").find do |a|
+              http? i.url
+            end
+          end
+
           context = info.dup
-          context[:registers][:page] = payload['page'] = ogp.data
+          context[:registers][:page] = payload['page'] = page
 
           cleanup ogp_template.render!(payload, context), url
         end
@@ -355,6 +370,16 @@ module Jekyll
       def payload
         @payload ||= site.site_payload
       end
+
+      # Discover if a string is a valid HTTP URL
+      #
+      # @param :url [String]
+      # @return [Boolean]
+      def http?(url)
+        url.start_with?('http') && URI.parse(url).is_a?(URI::HTTP)
+      rescue URI::Error
+        false
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.5.2.1
+  version: 0.5.6
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -58,14 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement