jekyll-embed-urls 0.5.6 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e6e72a30b43d661e9c852d548f48ba8f600cbbde41e6873489cf9ceb3d4435c
-  data.tar.gz: dd437ba4bbfa32d8e9c26792a3547672ae4197d8b23029b538d3a1ca814e64b7
+  metadata.gz: 28bf483423f9197271caae346deae52aa1d4b34c229dc723f58624c52f63e4d3
+  data.tar.gz: bffb7fa7898714d8eee3284f35ead0819cecca5359fa0557ef1353c1fb322fe2
 SHA512:
-  metadata.gz: 9c6cb5356446f930287dd1feca9ac024db143a0f3bf531dc19f94e6e7b4a2602125a2b20bafb1029da46ad15c4cdfcbb4c2e783967f6bba16e1b21310c496557
-  data.tar.gz: b98314a98b042a9c7cf1f9cfbeacce6662d11b6c5ec8d6d85e0d96ea3f2bc32d0e0bcea8cf3fd387b7872fcbeb0555d2873ff242dc84f8e503e40a2374f23140
+  metadata.gz: 143344abdd6ef63b5b8133a85697bf3aae0a64679773786a0e9fb96a26f77846abd202234169bed24f810eaf7018d96a6003897fc485d7a15f0af2ace773b589
+  data.tar.gz: fd6f00caec463617d2ce6dc0298db823f324708a5c4770725cc6391e9879fefa65bfc6c585d400652ada0feea838038ffefe73982da7795f3218ed920a2a61bf

data/lib/jekyll/embed/cache.rb

@@ -10,7 +10,7 @@ module Jekyll
 
       def read(key)
         self[key]
-      rescue
+      rescue StandardError
         nil
       end
     end

data/lib/jekyll/embed/content.rb

@@ -5,7 +5,7 @@ require 'cgi'
 module Jekyll
   class Embed
     class Content
-      URL_RE = /(<p[^>]*>[\s\n]*(<a[^>]*>)?[\s\n]*(https?:\/\/[^<\s\n]+)[\s\n]*(<\/a>)?[\s\n]*<\/p>)/m.freeze
+      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
@@ -13,7 +13,7 @@ module Jekyll
         # catch both.
         def embed!(content)
           content.gsub!(URL_RE) do |match|
-            url = CGI.unescapeHTML($3)
+            url = CGI.unescapeHTML(Regexp.last_match(3))
             embed = Jekyll::Embed.embed url
 
             if embed == url

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

@@ -13,7 +13,7 @@ require_relative 'embed/cache'
 if Gem::Version.new(Jekyll::VERSION) >= Gem::Version.new('4.2.0')
   require_relative 'embed/content'
 else
-  Jekyll.logger.warn "Upgrade to Jekyll >= 4.2.0 to embed URLs in content"
+  Jekyll.logger.warn 'Upgrade to Jekyll >= 4.2.0 to embed URLs in content'
 end
 
 OEmbed::Providers.register_all
@@ -57,7 +57,8 @@ module Jekyll
 
     # Directive from Feature Policy
     # @see {https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Feature-Policy#directives}
-    DIRECTIVES = %w[accelerometer ambient-light-sensor autoplay battery camera display-capture document-domain encrypted-media execution-while-not-rendered execution-while-out-of-viewport fullscreen gamepad geolocation gyroscope layout-animations legacy-image-formats magnetometer microphone midi navigation-override oversized-images payment picture-in-picture publickey-credentials-get speaker-selection sync-xhr usb screen-wake-lock web-share xr-spatial-tracking].freeze
+    DIRECTIVES = %w[accelerometer ambient-light-sensor autoplay battery camera display-capture document-domain
+                    encrypted-media execution-while-not-rendered execution-while-out-of-viewport fullscreen gamepad geolocation gyroscope layout-animations legacy-image-formats magnetometer microphone midi navigation-override oversized-images payment picture-in-picture publickey-credentials-get speaker-selection sync-xhr usb screen-wake-lock web-share xr-spatial-tracking].freeze
 
     # Templates
     INCLUDE_OGP = '{% include ogp.html site=site page=page %}'
@@ -84,13 +85,13 @@ module Jekyll
         'rel' => %w[noopener noreferrer],
         'target' => '_blank'
       }
-    }
+    }.freeze
 
     class << self
       def site
         unless @site
           raise Jekyll::Errors::InvalidConfigurationError,
-            "Site is missing, configure with `Jekyll::Embed.site = site`"
+                'Site is missing, configure with `Jekyll::Embed.site = site`'
         end
 
         @site
@@ -101,7 +102,7 @@ module Jekyll
       # @param [Jekyll::Site]
       # @return [Jekyll::Site]
       def site=(site)
-        raise ArgumentError, "Site must be a Jekyll::Site" unless site.is_a? Jekyll::Site
+        raise ArgumentError, 'Site must be a Jekyll::Site' unless site.is_a? Jekyll::Site
 
         @site = site
 
@@ -130,15 +131,15 @@ module Jekyll
       def reset
         @allow_same_origin =
           @cache =
-          @config =
-          @fallback_template =
-          @get_cache =
-          @http_client =
-          @info =
-          @ogp_template =
-          @payload =
-          @value_for_attr =
-          nil
+            @config =
+              @fallback_template =
+                @get_cache =
+                  @http_client =
+                    @info =
+                      @ogp_template =
+                        @payload =
+                          @value_for_attr =
+                            nil
       end
 
       # Render the URL as HTML
@@ -170,7 +171,9 @@ module Jekyll
       # @return [Hash]
       def config
         @config ||= Jekyll::Utils.deep_merge_hashes(DEFAULT_CONFIG, (site.config['embed'] || {})).tap do |c|
-          c['attributes']['allow'].concat (DIRECTIVES - c.dig('attributes', 'allow').join.split(';').map { |s| s.split(' ').first }).join(" 'none';|").split('|')
+          c['attributes']['allow'].concat (DIRECTIVES - c.dig('attributes', 'allow').join.split(';').map do |s|
+                                                          s.split(' ').first
+                                                        end).join(" 'none';|").split('|')
         end
       end
 
@@ -208,8 +211,8 @@ module Jekyll
 
           %w[image video audio].each do |attr|
             page[attr] = ogp.public_send(:"#{attr}s").find do |a|
-              http? i.url
-            end
+              http? a.url
+            end&.url
           end
 
           context = info.dup
@@ -262,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
@@ -343,8 +350,8 @@ module Jekyll
         @value_for_attr ||= {}
         @value_for_attr[attr] ||=
           case (value = config.dig('attributes', attr))
-            when String then value
-            when Array then value.join(' ')
+          when String then value
+          when Array then value.join(' ')
           end
       end
 
@@ -355,7 +362,7 @@ module Jekyll
       # @return [String]
       def allow_same_origin(url)
         unless site.config['url']
-          Jekyll.logger.warn "Add url to _config.yml to determine if the site can embed itself"
+          Jekyll.logger.warn 'Add url to _config.yml to determine if the site can embed itself'
           return ' allow-same-origin'
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-embed-urls
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.8
 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
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Replaces URLs for their previsualization in Jekyll posts
 email:
 - f@sutty.nl
@@ -180,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