jekyll-embed-urls 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f770c704facb923c9c12f83dd89702e44f593335921dbe2999a00f7fefcfea97
-  data.tar.gz: bca6ebe424d64966320dd74a34d2602fc84b0c86605be53bb1f5aeb7f9d5831c
+  metadata.gz: 0e6e72a30b43d661e9c852d548f48ba8f600cbbde41e6873489cf9ceb3d4435c
+  data.tar.gz: dd437ba4bbfa32d8e9c26792a3547672ae4197d8b23029b538d3a1ca814e64b7
 SHA512:
-  metadata.gz: 810d778e17e4a84df3bda8f8a4df90fa3deaa528c001066d28f8af92d5570d86e30b77e77de663d7f730adc44f45276ec04a8a0dc88c9e0e1d0aaac6033532a8
-  data.tar.gz: 80f9a13ff8846bbb515e9e8f9b3f36491c1d12043d8d2a5857463252560ddb9b6b7331f24fa219992090e20ead4cb68822b839a989dba5dd0deb4614b92dec1e
+  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

@@ -12,8 +12,15 @@ module Jekyll
         # 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,17 +197,23 @@ module Jekyll
       def ogp(url)
         cache.getset("ogp+#{url}") do
           ogp = OGP::OpenGraph.new get(url).body
-          context = info.dup
-          context[:registers][:page] = payload['page'] = {
+          page = {
             locale: ogp.locales.first,
-            image: ogp.images.first&.url,
             title: ogp.title,
             url: ogp.url,
-            audio: ogp.audios.first&.url,
-            video: ogp.videos.first&.url,
             description: ogp.description,
-            type: ogp.type
-          }
+            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'] = page
 
           cleanup ogp_template.render!(payload, context), url
         end
@@ -364,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - f