jekyll-webmention_io 2.9.6 → 2.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dafe74e10b6f90383f988bab8eaf7ba85b1148e5
-  data.tar.gz: '09702d5ba8716bb50a1747dc7fcedcb89c1cee0f'
+  metadata.gz: b4f0b3379a499a748fbf15fe90655da033e7ea78
+  data.tar.gz: b0737d75fe40749f72e5834486c031bd3417da32
 SHA512:
-  metadata.gz: 4eb9c71529b677fb254de6b2dac0477e913182c2c8bb5e191765dddaad6c6f12d5011551fdc474f06ba22f77bff4e9e71e370064935eec1612f01bf5326c0dea
-  data.tar.gz: c7c87537214cccb508b4e8238d1e98785ac5f5f34948601cadf831fbb7b6dd39326013727846e22bfc09e822a3cbff2435878428df92406b4d456395279227b3
+  metadata.gz: 519b8c8d762f7061d974fb4e3b46d8915080f400c58c6caef595f7d11c72c7c2b90cec578f549aa20ccad113e6d25342088a84017a6e0e918dd4434609e8069b
+  data.tar.gz: 26ead8a785f7ae3990c4117c5d489f031335f7adde98a4d45737ae031e363509d8d1985dff41751d63d1d8bb66c8bedd8afd8270f29b639b4322c3a1ec4325fe

data/lib/jekyll/commands/webmention.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require "json"
 
@@ -42,7 +42,7 @@ module Jekyll
             end
           end
           if count.positive?
-            File.open(cached_outgoing, "w") { |f| YAML.dump(outgoing, f) }
+            Jekyll::WebmentionIO.dump_yaml(cached_outgoing, outgoing)
           end
           Jekyll::WebmentionIO.log "msg", "#{count} webmentions sent."
         end # file exists (outgoing)

data/lib/jekyll/generators/compile_js.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
@@ -45,7 +45,7 @@ module Jekyll
 
         @source_file_destination = (config["source"] == false ? Dir.mktmpdir : "#{@site.config["source"]}/#{config["destination"]}")
 
-        @javascript = ""
+        @javascript = String.new ""
 
         concatenate_asset_files
 

data/lib/jekyll/generators/gather_webmentions.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
@@ -59,8 +59,6 @@ module Jekyll
                       @lookups[post.url]
                     elsif last_webmention
                       Date.parse last_webmention.dig("raw", "verified_date")
-                    else
-                      nil
                     end
 
       # should we throttle?

data/lib/jekyll/generators/queue_webmentions.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io

data/lib/jekyll/tags/_.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
@@ -96,16 +96,16 @@ module Jekyll
           set_data(webmentions, types)
         end
 
-        render_into_template
+        render_into_template(context.registers)
       end
 
       private
 
-      def render_into_template
+      def render_into_template(context_registry)
         if @template && @data
           Jekyll::WebmentionIO.log "info", "Preparing to render webmention info into the #{@template_name} template."
           template = Liquid::Template.parse(@template, :error_mode => :strict)
-          html = template.render(@data, { :strict_variables => false, :strict_filters => true })
+          html = template.render!(@data, :registers => context_registry, :strict_variables => false, :strict_filters => true)
           template.errors.each do |error|
             Jekyll::WebmentionIO.log "error", error
           end

data/lib/jekyll/tags/bookmarks.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_bookmarks post.url %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionBookmarksTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionBookmarksTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text
@@ -19,7 +19,7 @@ module Jekyll
       end
 
       def set_data(data, _types)
-        webmentions = extract_type "bookmarks", data
+        webmentions = extract_type @template_name, data
         @data = { "webmentions" => webmentions.values }
       end
     end

data/lib/jekyll/tags/count.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_count post.url [ bookmarks | likes | links | posts | replies | reposts | rsvps ]*   %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionCountTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionCountTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text

data/lib/jekyll/tags/likes.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_likes post.url %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionLikesTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionLikesTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text
@@ -19,7 +19,7 @@ module Jekyll
       end
 
       def set_data(data, _types)
-        webmentions = extract_type "likes", data
+        webmentions = extract_type @template_name, data
         @data = { "webmentions" => webmentions.values }
       end
     end

data/lib/jekyll/tags/links.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_links post.url %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionLinksTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionLinksTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text
@@ -19,7 +19,7 @@ module Jekyll
       end
 
       def set_data(data, _types)
-        webmentions = extract_type "links", data
+        webmentions = extract_type @template_name, data
         @data = { "webmentions" => webmentions.values }
       end
     end

data/lib/jekyll/tags/posts.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_posts post.url %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionPostsTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionPostsTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text
@@ -19,7 +19,7 @@ module Jekyll
       end
 
       def set_data(data, _types)
-        webmentions = extract_type "posts", data
+        webmentions = extract_type @template_name, data
         @data = { "webmentions" => webmentions.values }
       end
     end

data/lib/jekyll/tags/replies.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_replies post.url %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionRepliesTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionRepliesTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text
@@ -19,7 +19,7 @@ module Jekyll
       end
 
       def set_data(data, _types)
-        webmentions = extract_type "replies", data
+        webmentions = extract_type @template_name, data
         @data = { "webmentions" => webmentions.values }
       end
     end

data/lib/jekyll/tags/reposts.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_reposts post.url %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionRepostsTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionRepostsTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text
@@ -19,7 +19,7 @@ module Jekyll
       end
 
       def set_data(data, _types)
-        webmentions = extract_type "reposts", data
+        webmentions = extract_type @template_name, data
         @data = { "webmentions" => webmentions.values }
       end
     end

data/lib/jekyll/tags/rsvps.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_rsvps post.url %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionRsvpsTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionRsvpsTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text
@@ -19,7 +19,7 @@ module Jekyll
       end
 
       def set_data(data, _types)
-        webmentions = extract_type "rsvps", data
+        webmentions = extract_type @template_name, data
         @data = { "webmentions" => webmentions.values }
       end
     end

data/lib/jekyll/tags/webmentions.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmentions post.url [ bookmarks | likes | links | posts | replies | reposts | rsvps ]*  %}
 #
 module Jekyll
   module WebmentionIO
-    class WebmentionsTag < Jekyll::WebmentionIO::WebmentionTag
+    class WebmentionsTag < WebmentionTag
       def initialize(tag_name, text, tokens)
         super
         @text = text

data/lib/jekyll/tags/webmentions_head.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
@@ -11,7 +11,7 @@ module Jekyll
   module WebmentionIO
     class WebmentionHeadTag < Liquid::Tag
       def render(context)
-        head = ""
+        head = String.new ""
         head << '<link rel="dns-prefetch" href="https://webmention.io">'
         head << '<link rel="preconnect" href="https://webmention.io">'
         head << '<link rel="preconnect" href="ws://webmention.io:8080">'

data/lib/jekyll/tags/webmentions_js.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
@@ -27,14 +27,14 @@ module Jekyll
         config = config.merge(site_config)
 
         # JS file
-        js = ""
+        js = String.new ""
         unless config["deploy"] == false
           js_file_path = "#{site.config["baseurl"]}/#{config["destination"]}/JekyllWebmentionIO.js"
           js << "<script src=\"#{js_file_path}\" async></script>"
         end
 
         Jekyll::WebmentionIO.log "info", "Gathering templates for JavaScript."
-        templates = ""
+        templates = String.new ""
         template_files = Jekyll::WebmentionIO.types + %w(count webmentions)
         template_files.each do |template|
           templates << "<template style=\"display:none\" id=\"webmention-#{template}\">"

data/lib/jekyll/webmention_io.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 require_relative "webmention_io/version"
@@ -19,6 +19,12 @@ require "webmention"
 
 module Jekyll
   module WebmentionIO
+    class << self
+      # define simple getters and setters
+      attr_reader :config, :jekyll_config, :cache_files, :cache_folder,
+                  :file_prefix, :types
+      attr_writer :api_suffix
+    end
 
     @logger_prefix = "[jekyll-webmention_io]"
 
@@ -28,10 +34,12 @@ module Jekyll
 
     @types = %w(bookmarks likes links posts replies reposts rsvps)
 
-    EXCEPTIONS = [  SocketError, Timeout::Error, Errno::EINVAL,
-                    Errno::ECONNRESET, Errno::ECONNREFUSED, EOFError,
-                    Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-                    Net::ProtocolError, OpenSSL::SSL::SSLError, ].freeze
+    EXCEPTIONS = [
+      SocketError, Timeout::Error,
+      Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, EOFError,
+      Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+      OpenSSL::SSL::SSLError,
+    ].freeze
 
     def self.bootstrap
       # @jekyll_config = Jekyll.configuration({ 'quiet' => true })
@@ -42,56 +50,25 @@ module Jekyll
       @cache_folder = @config["cache_folder"] || ".jekyll-cache"
       Dir.mkdir(@cache_folder) unless File.exist?(@cache_folder)
       @file_prefix = ""
-      unless @cache_folder.include? "webmention"
-        @file_prefix = "webmention_io_"
-      end
+      @file_prefix = "webmention_io_" unless @cache_folder.include? "webmention"
       @cache_files = {
         "incoming" => "#{@cache_folder}/#{@file_prefix}received.yml",
         "outgoing" => "#{@cache_folder}/#{@file_prefix}outgoing.yml",
         "bad_uris" => "#{@cache_folder}/#{@file_prefix}bad_uris.yml",
         "lookups"  => "#{@cache_folder}/#{@file_prefix}lookups.yml"
       }
-      @cache_files.each do |_key, file|
+      @cache_files.each_value do |file|
         unless File.exist?(file)
-          File.open(file, "w") { |f| YAML.dump({}, f) }
+          dump_yaml(file)
         end
       end
     end
 
-    # Getters
-    def self.config
-      @config
-    end
-
-    def self.jekyll_config
-      @jekyll_config
-    end
-
-    def self.cache_files
-      @cache_files
-    end
-
-    def self.cache_folder
-      @cache_folder
-    end
-
-    def self.file_prefix
-      @file_prefix
-    end
-
-    def self.types
-      @types
-    end
-
-    # Setters
+    # Setter
     def self.api_path=(path)
       @api_endpoint = "#{@api_url}/#{path}"
     end
 
-    def self.api_suffix=(suffix)
-      @api_suffix = suffix
-    end
-
     # Heplers
     def self.get_cache_file_path(key)
       path = false
@@ -115,9 +92,9 @@ module Jekyll
     def self.cache_webmentions(which, webmentions)
       if %w(incoming outgoing).include? which
         cache_file = get_cache_file_path which
-        File.open(cache_file, "w") { |f| YAML.dump(webmentions, f) }
+        dump_yaml(cache_file, webmentions)
 
-        Jekyll::WebmentionIO.log "msg", "#{which.capitalize} webmentions have been cached."
+        log "msg", "#{which.capitalize} webmentions have been cached."
       end
     end
 
@@ -129,13 +106,13 @@ module Jekyll
                   end
 
       if @config.dig("pages") == true
-        Jekyll::WebmentionIO.log "info", "Including site pages."
+        log "info", "Including site pages."
         documents.concat site.pages.clone
       end
 
       collections = @config.dig("collections")
       if collections
-        Jekyll::WebmentionIO.log "info", "Adding collections."
+        log "info", "Adding collections."
         site.collections.each do |name, collection|
           # skip _posts
           next if name == "posts"
@@ -152,7 +129,7 @@ module Jekyll
     def self.get_response(api_params)
       api_params << @api_suffix
       url = "#{@api_endpoint}?#{api_params}"
-      Jekyll::WebmentionIO.log "info", "Sending request to #{url}."
+      log "info", "Sending request to #{url}."
       source = get_uri_source(url)
       if source
         JSON.parse(source)
@@ -169,9 +146,9 @@ module Jekyll
 
     def self.cache_lookup_dates(lookups)
       cache_file = get_cache_file_path "lookups"
-      File.open(cache_file, "w") { |f| YAML.dump(lookups, f) }
+      dump_yaml(cache_file, lookups)
 
-      Jekyll::WebmentionIO.log "msg", "Lookups have been cached."
+      log "msg", "Lookups have been cached."
     end
 
     # allowed throttles: last_week, last_month, last_year, older
@@ -189,23 +166,21 @@ module Jekyll
       return false
     end
 
+    TIMEFRAMES = {
+      "last_week"  => "weekly",
+      "last_month" => "monthly",
+      "last_year"  => "yearly",
+    }.freeze
+
     def self.get_timeframe_from_date(time)
       date = time.to_date
-      timeframes = {
-        "last_week"  => "weekly",
-        "last_month" => "monthly",
-        "last_year"  => "yearly",
-      }
-      timeframe = nil
-      timeframes.each do |key, value|
+      TIMEFRAMES.each do |key, value|
         if date.to_date > get_date_from_string(value)
           timeframe = key
           break
         end
       end
-      unless timeframe
-        timeframe = "older"
-      end
+      timeframe = "older" unless timeframe
       return timeframe
     end
 
@@ -218,7 +193,7 @@ module Jekyll
         text = if text == "daily"
                  "every 1 day"
                else
-                 "every 1 " + text.sub("ly", "")
+                 "every 1 #{text.sub("ly", "")}"
                end
         matches = text.match(pattern)
       end
@@ -237,9 +212,7 @@ module Jekyll
       # log "info", "Looking for webmention endpoint at #{uri}"
       begin
         endpoint = Webmention::Client.supports_webmention?(uri)
-        unless endpoint
-          log "info", "Could not find a webmention endpoint at #{uri}"
-        end
+        log("info", "Could not find a webmention endpoint at #{uri}") unless endpoint
       rescue => e
         log "info", "Endpoint lookup failed for #{uri}: #{e.message}"
         endpoint = false
@@ -262,23 +235,21 @@ module Jekyll
     end
 
     def self.get_template_contents(template)
-      template_file = if Jekyll::WebmentionIO.config.dig("templates", template)
-                        Jekyll::WebmentionIO.log "info", "Using custom #{template} template"
-                        Jekyll::WebmentionIO.config["templates"][template]
+      template_file = if @config.dig("templates", template)
+                        log "info", "Using custom #{template} template"
+                        @config["templates"][template]
                       else
                         File.expand_path("templates/#{template}.html", __dir__)
                       end
-      Jekyll::WebmentionIO.log "info", "Template file: #{template_file}"
-      handler = File.open(template_file, "rb")
-      handler.read
+      log "info", "Template file: #{template_file}"
+      File.read(template_file)
     end
 
     # Connections
     def self.get_uri_source(uri, redirect_limit = 10, original_uri = false)
       original_uri ||= uri
-      unless uri_ok?(uri)
-        return false
-      end
+      return false unless uri_ok?(uri)
+
       if redirect_limit.positive?
         response = get_http_response(uri)
         case response
@@ -293,9 +264,7 @@ module Jekyll
           return false
         end
       else
-        if original_uri
-          log "warn", "too many redirects for #{original_uri}"
-        end
+        log("warn", "too many redirects for #{original_uri}") if original_uri
         uri_is_not_ok(uri)
         return false
       end
@@ -304,26 +273,34 @@ module Jekyll
     def self.log(type, message)
       debug = !!@config.dig("debug")
       if debug || %w(error msg).include?(type)
-        if type == "msg"
-          type = "info"
-        end
+        type = "info" if type == "msg"
         Jekyll.logger.method(type).call("#{@logger_prefix} #{message}")
       end
     end
 
+    # Utility Method
+    # Writes given +data+ as YAML string into +file+ path.
+    #
+    # Returns nothing.
+    def self.dump_yaml(file, data = {})
+      File.open(file, "wb") { |f| f.puts YAML.dump(data) }
+    end
+
     private
 
     def self.get_http_response(uri)
-      uri = URI.parse(URI.encode(uri))
+      uri  = URI.parse(URI.encode(uri))
       http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = 10
+
       if uri.scheme == "https"
         http.use_ssl = true
         http.ciphers = "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:-LOW"
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       end
+
       begin
-        request = Net::HTTP::Get.new(uri.request_uri)
+        request  = Net::HTTP::Get.new(uri.request_uri)
         response = http.request(request)
         return response
       rescue *EXCEPTIONS => e
@@ -336,13 +313,11 @@ module Jekyll
     # Cache bad URLs for a bit
     def self.uri_is_not_ok(uri)
       # Never cache webmention.io in here
-      if uri.host == "webmention.io"
-        return
-      end
+      return if uri.host == "webmention.io"
       cache_file = @cache_files["bad_uris"]
       bad_uris = open(cache_file) { |f| YAML.load(f) }
       bad_uris[uri.host] = Time.now.to_s
-      File.open(cache_file, "w") { |f| YAML.dump(bad_uris, f) }
+      dump_yaml(cache_file, bad_uris)
     end
 
     def self.uri_ok?(uri)
@@ -353,9 +328,7 @@ module Jekyll
         last_checked = DateTime.parse(bad_uris[uri.host])
         cache_bad_uris_for = @config["cache_bad_uris_for"] || 1 # in days
         recheck_at = last_checked.next_day(cache_bad_uris_for).to_s
-        if recheck_at > now
-          return false
-        end
+        return false if recheck_at > now
       end
       return true
     end
@@ -363,13 +336,14 @@ module Jekyll
 end
 
 # Load all the bits
-Dir[File.expand_path("commands/*.rb", __dir__)].each do |file|
-  require file
-end
-Dir[File.expand_path("generators/*.rb", __dir__)].each do |file|
-  require file
-end
-require "#{__dir__}/tags/_.rb"
-Dir[File.expand_path("tags/*.rb", __dir__)].each do |file|
-  require file unless file.include? "_.rb"
+def require_all(group)
+  Dir[File.expand_path("#{group}/*.rb", __dir__)].each do |file|
+    require file
+  end
 end
+
+require_all "commands"
+require_all "generators"
+
+require_relative "tags/_.rb"
+require_all "tags"

data/lib/jekyll/webmention_io/version.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 module Jekyll
   module WebmentionIO
-    VERSION = "2.9.6".freeze
+    VERSION = "2.9.7"
   end
 end

data/lib/jekyll/webmention_io/webmention.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 #  (c) Aaron Gustafson
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekill blog
+#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 module Jekyll

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.9.7
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll