jekyll-webmention_io 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aae045b55d22d92d88b0345073c4ffe64206da5
-  data.tar.gz: 28b163e15deda415f8ed2c6c5621654545a032cb
+  metadata.gz: b9d0274bb949c53137ce51261e4c2ff534b85806
+  data.tar.gz: 94dc7afb53715fb5e6661b9fa7fad76cc225e2ca
 SHA512:
-  metadata.gz: 13af37e1c35dec286855885086586f7e8f9caca23ca672e7ef8ec64c4e21633a600e54e921466e67111d74e4fcfee3f99601dcab0f15db7ece76ce29406b9450
-  data.tar.gz: 7f5c71a216c6deb7cd13bba1c0fde8ea7d103cc9d33a004bd95e0c7796e4d6119e94b3b2aeacd7ac8bf86df5d52fa3ac480690b79401696bfc63c38a8d342c61
+  metadata.gz: ed77eae6a0645a492b91a3e7d75aedf006e684290735cee508ec6fd5385cadad0530e47f59b29450c1398bec096c202aa13c30ee4542a6cfd2c425c6b6fba640
+  data.tar.gz: 8b60976284215965fc4295c444a6059ab5f5409dfa4a6ffa650c03900322f8614d00ec53271d58e1bc5c7a7b98387809f9a7d850a3bd9a41433398cfad8c4871

data/lib/jekyll/commands/webmention.rb

@@ -15,23 +15,26 @@ module Jekyll
       end
 
       def self.process(_args = [], _options = {})
-        if File.exist? Jekyll::WebmentionIO.cache_file("sent.yml")
-          Jekyll::WebmentionIO.log "error", "Your outgoing webmentions queue needs to be upgraded. Please re-build your project."
+        if File.exist? WebmentionIO.cache_file("sent.yml")
+          WebmentionIO.log "error", "Your outgoing webmentions queue needs to be upgraded. Please re-build your project."
         end
         count = 0
-        cached_outgoing = Jekyll::WebmentionIO.get_cache_file_path "outgoing"
+        cached_outgoing = WebmentionIO.get_cache_file_path "outgoing"
         if File.exist?(cached_outgoing)
-          outgoing = Jekyll::WebmentionIO.load_yaml(cached_outgoing)
+          outgoing = WebmentionIO.load_yaml(cached_outgoing)
           outgoing.each do |source, targets|
             targets.each do |target, response|
               next unless response == false
+
               if target.index("//").zero?
                 target = "http:#{target}"
               end
-              endpoint = Jekyll::WebmentionIO.get_webmention_endpoint(target)
+              endpoint = WebmentionIO.get_webmention_endpoint(target)
               next unless endpoint
-              response = Jekyll::WebmentionIO.webmention(source, target, endpoint)
+
+              response = WebmentionIO.webmention(source, target, endpoint)
               next unless response
+
               begin
                 response = JSON.parse response
               rescue JSON::ParserError
@@ -42,9 +45,9 @@ module Jekyll
             end
           end
           if count.positive?
-            Jekyll::WebmentionIO.dump_yaml(cached_outgoing, outgoing)
+            WebmentionIO.dump_yaml(cached_outgoing, outgoing)
           end
-          Jekyll::WebmentionIO.log "msg", "#{count} webmentions sent."
+          WebmentionIO.log "msg", "#{count} webmentions sent."
         end # file exists (outgoing)
       end # def process
     end # WebmentionCommand

data/lib/jekyll/generators/compile_js.rb

@@ -13,7 +13,7 @@ module Jekyll
   module WebmentionIO
     class JavaScriptFile < StaticFile
       def destination_rel_dir
-        Jekyll::WebmentionIO.js_handler.destination
+        WebmentionIO.js_handler.destination
       end
     end
 
@@ -23,12 +23,12 @@ module Jekyll
       priority :low
 
       def generate(site)
-        handler = Jekyll::WebmentionIO.js_handler
+        handler = WebmentionIO.js_handler
         @site = site
         @file_name = handler.resource_name
 
         if handler.disabled?
-          Jekyll::WebmentionIO.log "info", "Skipping JavaScript inclusion."
+          WebmentionIO.log "info", "Skipping JavaScript inclusion."
           return
         end
 
@@ -52,7 +52,7 @@ module Jekyll
 
       def add_webmention_types
         js_types = []
-        Jekyll::WebmentionIO.types.each do |type|
+        WebmentionIO.types.each do |type|
           js_types.push "'#{type}': '#{type.to_singular}'"
         end
         types_js = <<-EOF
@@ -82,7 +82,7 @@ module Jekyll
       end
 
       def deploy_js_file
-        js_file = Jekyll::WebmentionIO::JavaScriptFile.new(@site, @source_file_destination, "", @file_name)
+        js_file = WebmentionIO::JavaScriptFile.new(@site, @source_file_destination, "", @file_name)
         @site.static_files << js_file
       end
     end

data/lib/jekyll/generators/gather_webmentions.rb

@@ -10,155 +10,157 @@
 require "time"
 
 module Jekyll
-  class GatherWebmentions < Generator
-    safe true
-    priority :high
-
-    def generate(site)
-      @site = site
-      
-      if @site.config.dig("url").include? 'localhost'
-        Jekyll::WebmentionIO.log "msg", "Webmentions won’t be gathered on localhost."
-        return
-      end
+  module WebmentionIO
+    class GatherWebmentions < Generator
+      safe true
+      priority :high
 
-      if @site.config.dig("webmentions", "pause_lookups") == true
-        Jekyll::WebmentionIO.log "msg", "Webmention gathering is currently paused."
-        return
-      end
+      def generate(site)
+        @site = site
+        @site_url = site.config["url"].to_s
 
-      Jekyll::WebmentionIO.log "msg", "Beginning to gather webmentions of your posts. This may take a while."
+        if @site_url.include? "localhost"
+          Jekyll::WebmentionIO.log "msg", "Webmentions won’t be gathered on localhost."
+          return
+        end
 
-      Jekyll::WebmentionIO.api_path = "mentions"
-      # add an arbitrarily high perPage to trump pagination
-      Jekyll::WebmentionIO.api_suffix = "&perPage=9999"
+        if @site.config.dig("webmentions", "pause_lookups") == true
+          WebmentionIO.log "msg", "Webmention gathering is currently paused."
+          return
+        end
 
-      @cached_webmentions = Jekyll::WebmentionIO.read_cached_webmentions "incoming"
+        WebmentionIO.log "msg", "Beginning to gather webmentions of your posts. This may take a while."
 
-      @lookups = Jekyll::WebmentionIO.read_lookup_dates
+        WebmentionIO.api_path = "mentions"
+        # add an arbitrarily high perPage to trump pagination
+        WebmentionIO.api_suffix = "&perPage=9999"
 
-      posts = Jekyll::WebmentionIO.gather_documents(@site)
-      posts.each do |post|
-        check_for_webmentions(post)
-      end
+        @cached_webmentions = WebmentionIO.read_cached_webmentions "incoming"
 
-      Jekyll::WebmentionIO.cache_lookup_dates @lookups
+        @lookups = WebmentionIO.read_lookup_dates
 
-      Jekyll::WebmentionIO.cache_webmentions "incoming", @cached_webmentions
-    end # generate
+        posts = WebmentionIO.gather_documents(@site)
+        posts.each do |post|
+          check_for_webmentions(post)
+        end
 
-    private
+        WebmentionIO.cache_lookup_dates @lookups
 
-    def check_for_webmentions(post)
-      Jekyll::WebmentionIO.log "info", "Checking for webmentions of #{post.url}."
+        WebmentionIO.cache_webmentions "incoming", @cached_webmentions
+      end # generate
 
-      last_webmention = @cached_webmentions.dig(post.url, @cached_webmentions.dig(post.url)&.keys&.last)
+      private
 
-      # get the last webmention
-      last_lookup = if @lookups[post.url]
-                      @lookups[post.url]
-                    elsif last_webmention
-                      Date.parse last_webmention.dig("raw", "verified_date")
-                    end
+      def check_for_webmentions(post)
+        WebmentionIO.log "info", "Checking for webmentions of #{post.url}."
 
-      # should we throttle?
-      if post.respond_to? "date" # Some docs have no date
-        if last_lookup && Jekyll::WebmentionIO.post_should_be_throttled?(post, post.date, last_lookup)
-          Jekyll::WebmentionIO.log "info", "Throttling this post."
-          return
+        last_webmention = @cached_webmentions.dig(post.url, @cached_webmentions.dig(post.url)&.keys&.last)
+
+        # get the last webmention
+        last_lookup = if @lookups[post.url]
+                        @lookups[post.url]
+                      elsif last_webmention
+                        Date.parse last_webmention.dig("raw", "verified_date")
+                      end
+
+        # should we throttle?
+        if post.respond_to? "date" # Some docs have no date
+          if last_lookup && WebmentionIO.post_should_be_throttled?(post, post.date, last_lookup)
+            WebmentionIO.log "info", "Throttling this post."
+            return
+          end
         end
-      end
 
-      # Get the last id we have in the hash
-      since_id = last_webmention ? last_webmention.dig("raw", "id") : false
+        # Get the last id we have in the hash
+        since_id = last_webmention ? last_webmention.dig("raw", "id") : false
 
-      # Gather the URLs
-      targets = get_webmention_target_urls(post)
+        # Gather the URLs
+        targets = get_webmention_target_urls(post)
 
-      # execute the API
-      response = Jekyll::WebmentionIO.get_response assemble_api_params(targets, since_id)
-      webmentions = response.dig("links")
-      if webmentions && !webmentions.empty?
-        Jekyll::WebmentionIO.log "info", "Here’s what we got back:\n\n#{response.inspect}\n\n"
-      else
-        Jekyll::WebmentionIO.log "info", "No webmentions found."
-      end
+        # execute the API
+        response = WebmentionIO.get_response assemble_api_params(targets, since_id)
+        webmentions = response.dig("links")
+        if webmentions && !webmentions.empty?
+          WebmentionIO.log "info", "Here’s what we got back:\n\n#{response.inspect}\n\n"
+        else
+          WebmentionIO.log "info", "No webmentions found."
+        end
 
-      @lookups[post.url] = Date.today
-      cache_new_webmentions(post.url, response)
-    end
+        @lookups[post.url] = Date.today
+        cache_new_webmentions(post.url, response)
+      end
 
-    def get_webmention_target_urls(post)
-      targets = []
-      base_uri = @site.config["url"].chomp("/")
-      uri = "#{base_uri}#{post.url}"
-      targets.push(uri)
+      def get_webmention_target_urls(post)
+        targets = []
+        uri = File.join(@site_url, post.url)
+        targets.push(uri)
 
-      # Redirection?
-      gather_redirected_targets(post, uri, targets)
+        # Redirection?
+        gather_redirected_targets(post, uri, targets)
 
-      # Domain changed?
-      gather_legacy_targets(uri, targets)
+        # Domain changed?
+        gather_legacy_targets(uri, targets)
 
-      targets
-    end
+        targets
+      end
 
-    def gather_redirected_targets(post, uri, targets)
-      redirected = false
-      if post.data.key? "redirect_from"
-        if post.data["redirect_from"].is_a? String
-          redirected = uri.sub post.url, post.data["redirect_from"]
-          targets.push(redirected)
-        elsif post.data["redirect_from"].is_a? Array
-          post.data["redirect_from"].each do |redirect|
-            redirected = uri.sub post.url, redirect
+      def gather_redirected_targets(post, uri, targets)
+        redirected = false
+        if post.data.key? "redirect_from"
+          if post.data["redirect_from"].is_a? String
+            redirected = uri.sub post.url, post.data["redirect_from"]
             targets.push(redirected)
+          elsif post.data["redirect_from"].is_a? Array
+            post.data["redirect_from"].each do |redirect|
+              redirected = uri.sub post.url, redirect
+              targets.push(redirected)
+            end
           end
         end
       end
-    end
 
-    def gather_legacy_targets(uri, targets)
-      if Jekyll::WebmentionIO.config.key? "legacy_domains"
-        Jekyll::WebmentionIO.log "info", "adding legacy URIs"
-        Jekyll::WebmentionIO.config["legacy_domains"].each do |domain|
-          legacy = uri.sub @site.config["url"], domain
-          Jekyll::WebmentionIO.log "info", "adding URI #{legacy}"
-          targets.push(legacy)
+      def gather_legacy_targets(uri, targets)
+        if WebmentionIO.config.key? "legacy_domains"
+          WebmentionIO.log "info", "adding legacy URIs"
+          WebmentionIO.config["legacy_domains"].each do |domain|
+            legacy = uri.sub(@site_url, domain)
+            WebmentionIO.log "info", "adding URI #{legacy}"
+            targets.push(legacy)
+          end
         end
       end
-    end
-
-    def assemble_api_params(targets, since_id)
-      api_params = targets.collect { |v| "target[]=#{v}" }.join("&")
-      api_params << "&since_id=#{since_id}" if since_id
-      api_params << "&sort-by=published"
-      api_params
-    end
 
-    def cache_new_webmentions(post_uri, response)
-      # Get cached webmentions
-      webmentions = if @cached_webmentions.key? post_uri
-                      @cached_webmentions[post_uri]
-                    else
-                      {}
-                    end
-
-      if response && response["links"]
-        response["links"].reverse_each do |link|
-          webmention = Jekyll::WebmentionIO::Webmention.new(link, @site)
-
-          # Do we already have it?
-          if webmentions.key? webmention.id
-            next
-          end
+      def assemble_api_params(targets, since_id)
+        api_params = targets.collect { |v| "target[]=#{v}" }.join("&")
+        api_params << "&since_id=#{since_id}" if since_id
+        api_params << "&sort-by=published"
+        api_params
+      end
 
-          # Add it to the list
-          Jekyll::WebmentionIO.log "info", webmention.to_hash.inspect
-          webmentions[webmention.id] = webmention.to_hash
-        end # each link
-      end # if response
-      @cached_webmentions[post_uri] = webmentions
-    end # process_webmentions
+      def cache_new_webmentions(post_uri, response)
+        # Get cached webmentions
+        webmentions = if @cached_webmentions.key? post_uri
+                        @cached_webmentions[post_uri]
+                      else
+                        {}
+                      end
+
+        if response && response["links"]
+          response["links"].reverse_each do |link|
+            webmention = WebmentionIO::Webmention.new(link, @site)
+
+            # Do we already have it?
+            if webmentions.key? webmention.id
+              next
+            end
+
+            # Add it to the list
+            WebmentionIO.log "info", webmention.to_hash.inspect
+            webmentions[webmention.id] = webmention.to_hash
+          end # each link
+        end # if response
+        @cached_webmentions[post_uri] = webmentions
+      end # process_webmentions
+    end
   end
 end

data/lib/jekyll/generators/queue_webmentions.rb

@@ -8,92 +8,93 @@
 #
 
 module Jekyll
-  class QueueWebmentions < Generator
-    safe true
-    priority :low
+  module WebmentionIO
+    class QueueWebmentions < Generator
+      safe true
+      priority :low
 
-    def generate(site)
-      @site = site
+      def generate(site)
+        @site = site
+        @site_url = site.config["url"].to_s
 
-      if @site.config.dig("url").include? 'localhost'
-        Jekyll::WebmentionIO.log "msg", "Webmentions lookups are not run on localhost."
-        return
-      end
-      
-      if @site.config.dig("webmentions", "pause_lookups")
-        Jekyll::WebmentionIO.log "info", "Webmention lookups are currently paused."
-        return
-      end
+        if @site_url.include? "localhost"
+          WebmentionIO.log "msg", "Webmentions lookups are not run on localhost."
+          return
+        end
 
-      Jekyll::WebmentionIO.log "msg", "Beginning to gather webmentions you’ve made. This may take a while."
+        if @site.config.dig("webmentions", "pause_lookups")
+          WebmentionIO.log "info", "Webmention lookups are currently paused."
+          return
+        end
 
-      upgrade_outgoing_webmention_cache
+        WebmentionIO.log "msg", "Beginning to gather webmentions you’ve made. This may take a while."
 
-      posts = Jekyll::WebmentionIO.gather_documents(@site)
+        upgrade_outgoing_webmention_cache
 
-      gather_webmentions(posts)
-    end
+        posts = WebmentionIO.gather_documents(@site)
 
-    private
+        gather_webmentions(posts)
+      end
 
-    def gather_webmentions(posts)
-      webmentions = Jekyll::WebmentionIO.read_cached_webmentions "outgoing"
+      private
 
-      base_uri = @site.config["url"].chomp("/")
+      def gather_webmentions(posts)
+        webmentions = WebmentionIO.read_cached_webmentions "outgoing"
 
-      posts.each do |post|
-        uri = "#{base_uri}#{post.url}"
-        mentions = get_mentioned_uris(post)
-        if webmentions.key? uri
-          mentions.each do |mentioned_uri, response|
-            unless webmentions[uri].key? mentioned_uri
-              webmentions[uri][mentioned_uri] = response
+        posts.each do |post|
+          uri = File.join(@site_url, post.url)
+          mentions = get_mentioned_uris(post)
+          if webmentions.key? uri
+            mentions.each do |mentioned_uri, response|
+              unless webmentions[uri].key? mentioned_uri
+                webmentions[uri][mentioned_uri] = response
+              end
             end
+          else
+            webmentions[uri] = mentions
           end
-        else
-          webmentions[uri] = mentions
         end
-      end
-
-      Jekyll::WebmentionIO.cache_webmentions "outgoing", webmentions
-    end
 
-    def get_mentioned_uris(post)
-      uris = {}
-      if post.data["in_reply_to"]
-        uris[post.data["in_reply_to"]] = false
+        WebmentionIO.cache_webmentions "outgoing", webmentions
       end
-      post.content.scan(/(?:https?:)?\/\/[^\s)#"]+/) do |match|
-        unless uris.key? match
-          uris[match] = false
+
+      def get_mentioned_uris(post)
+        uris = {}
+        if post.data["in_reply_to"]
+          uris[post.data["in_reply_to"]] = false
+        end
+        post.content.scan(/(?:https?:)?\/\/[^\s)#"]+/) do |match|
+          unless uris.key? match
+            uris[match] = false
+          end
         end
+        return uris
       end
-      return uris
-    end
 
-    def upgrade_outgoing_webmention_cache
-      old_sent_file = Jekyll::WebmentionIO.cache_file("sent.yml")
-      old_outgoing_file = Jekyll::WebmentionIO.cache_file("queued.yml")
-      unless File.exist? old_sent_file
-        return
-      end
-      sent_webmentions = Jekyll::WebmentionIO.load_yaml(old_sent_file)
-      outgoing_webmentions = Jekyll::WebmentionIO.load_yaml(old_outgoing_file)
-      merged = {}
-      outgoing_webmentions.each do |source_url, webmentions|
-        collection = {}
-        webmentions.each do |target_url|
-          collection[target_url] = if sent_webmentions.dig(source_url, target_url)
-                                     ""
-                                   else
-                                     false
-                                   end
+      def upgrade_outgoing_webmention_cache
+        old_sent_file = WebmentionIO.cache_file("sent.yml")
+        old_outgoing_file = WebmentionIO.cache_file("queued.yml")
+        unless File.exist? old_sent_file
+          return
+        end
+        sent_webmentions = WebmentionIO.load_yaml(old_sent_file)
+        outgoing_webmentions = WebmentionIO.load_yaml(old_outgoing_file)
+        merged = {}
+        outgoing_webmentions.each do |source_url, webmentions|
+          collection = {}
+          webmentions.each do |target_url|
+            collection[target_url] = if sent_webmentions.dig(source_url, target_url)
+                                       ""
+                                     else
+                                       false
+                                     end
+          end
+          merged[source_url] = collection
         end
-        merged[source_url] = collection
+        WebmentionIO.cache_webmentions "outgoing", merged
+        File.delete old_sent_file, old_outgoing_file
+        WebmentionIO.log "msg", "Upgraded your sent webmentions cache."
       end
-      Jekyll::WebmentionIO.cache_webmentions "outgoing", merged
-      File.delete old_sent_file, old_outgoing_file
-      Jekyll::WebmentionIO.log "msg", "Upgraded your sent webmentions cache."
     end
   end
 end

data/lib/jekyll/tags/webmention.rb

@@ -15,9 +15,9 @@ module Jekyll
     class WebmentionTag < Liquid::Tag
       def initialize(tag_name, text, tokens)
         super
-        cache_file = Jekyll::WebmentionIO.get_cache_file_path "incoming"
+        cache_file = WebmentionIO.get_cache_file_path "incoming"
         @cached_webmentions = if File.exist? cache_file
-                                Jekyll::WebmentionIO.load_yaml(cache_file)
+                                WebmentionIO.load_yaml(cache_file)
                               else
                                 {}
                               end
@@ -32,12 +32,12 @@ module Jekyll
       end
 
       def template=(template)
-        unless Jekyll::WebmentionIO.supported_templates.include? template
-          Jekyll::WebmentionIO.log "error", "#{template.capitalize} is not supported"
+        unless WebmentionIO.supported_templates.include? template
+          WebmentionIO.log "error", "#{template.capitalize} is not supported"
         end
         @template_name = template
-        @template = Jekyll::WebmentionIO.get_template_contents(template)
-        Jekyll::WebmentionIO.log "info", "#{template.capitalize} template:\n\n#{@template}\n\n"
+        @template = WebmentionIO.get_template_contents(template)
+        WebmentionIO.log "info", "#{template.capitalize} template:\n\n#{@template}\n\n"
       end
 
       def set_data(data, types)
@@ -45,13 +45,13 @@ module Jekyll
       end
 
       def extract_type(type, webmentions)
-        Jekyll::WebmentionIO.log "info", "Looking for #{type}"
+        WebmentionIO.log "info", "Looking for #{type}"
         keep = {}
-        if !Jekyll::WebmentionIO.types.include? type
-          Jekyll::WebmentionIO.log "warn", "#{type} are not extractable"
+        if !WebmentionIO.types.include? type
+          WebmentionIO.log "warn", "#{type} are not extractable"
         else
           type = type.to_singular
-          Jekyll::WebmentionIO.log "info", "Searching #{webmentions.length} webmentions for type==#{type}"
+          WebmentionIO.log "info", "Searching #{webmentions.length} webmentions for type==#{type}"
           if webmentions.is_a? Hash
             webmentions = webmentions.values
           end
@@ -73,19 +73,19 @@ module Jekyll
 
         if @cached_webmentions.key? uri
           all_webmentions = @cached_webmentions[uri].clone
-          Jekyll::WebmentionIO.log "info", "#{all_webmentions.length} total webmentions for #{uri}"
+          WebmentionIO.log "info", "#{all_webmentions.length} total webmentions for #{uri}"
 
           if args.length.positive?
-            Jekyll::WebmentionIO.log "info", "Requesting only #{args.inspect}"
+            WebmentionIO.log "info", "Requesting only #{args.inspect}"
             webmentions = {}
             args.each do |type|
               types.push type
               extracted = extract_type(type, all_webmentions)
-              Jekyll::WebmentionIO.log "info", "Merging in #{extracted.length} #{type}"
+              WebmentionIO.log "info", "Merging in #{extracted.length} #{type}"
               webmentions = webmentions.merge(extracted)
             end
           else
-            Jekyll::WebmentionIO.log "info", "Grabbing all webmentions"
+            WebmentionIO.log "info", "Grabbing all webmentions"
             webmentions = all_webmentions
           end
 
@@ -104,20 +104,20 @@ module Jekyll
 
       def render_into_template(context_registry)
         if @template && @data
-          Jekyll::WebmentionIO.log "info", "Preparing to render webmention info into the #{@template_name} template."
+          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, :registers => context_registry, :strict_variables => false, :strict_filters => true)
           template.errors.each do |error|
-            Jekyll::WebmentionIO.log "error", error
+            WebmentionIO.log "error", error
           end
           # Clean up the output
           HtmlBeautifier.beautify html.each_line.reject { |x| x.strip == "" }.join
         else
           unless @template
-            Jekyll::WebmentionIO.log "warn", "#{self.class} No template provided"
+            WebmentionIO.log "warn", "#{self.class} No template provided"
           end
           unless @data
-            Jekyll::WebmentionIO.log "warn", "#{self.class} No data provided"
+            WebmentionIO.log "warn", "#{self.class} No data provided"
           end
           ""
         end

data/lib/jekyll/tags/webmentions_head.rb

@@ -18,11 +18,12 @@ module Jekyll
 
         page = context["page"]
         site = context.registers[:site]
+        site_url = site.config["url"].to_s
         if page["redirect_from"]
           if page["redirect_from"].is_a? String
-            redirect = site.config["url"] + page["redirect_from"]
+            redirect = site_url + page["redirect_from"]
           elsif page["redirect_from"].is_a? Array
-            redirect = site.config["url"] + page["redirect_from"].join(",#{site.config["url"]}")
+            redirect = site_url + page["redirect_from"].join(",#{site_url}")
           end
           head << "<meta property=\"webmention:redirected_from\" content=\"#{redirect}\">"
         end

data/lib/jekyll/tags/webmentions_js.rb

@@ -11,7 +11,7 @@ module Jekyll
   module WebmentionIO
     class WebmentionJSTag < Liquid::Tag
       def render(_context)
-        Jekyll::WebmentionIO.js_handler.render
+        WebmentionIO.js_handler.render
       end
     end
   end

data/lib/jekyll/webmention_io.rb

@@ -38,6 +38,7 @@ module Jekyll
 
     @template_file_cache = {}
     @template_content_cache = {}
+    @webmention_data_cache = {}
 
     EXCEPTIONS = [
       SocketError, Timeout::Error,
@@ -66,7 +67,7 @@ module Jekyll
         dump_yaml(file) unless File.exist?(file)
       end
 
-      @js_handler = Jekyll::WebmentionIO::JSHandler.new(site)
+      @js_handler = WebmentionIO::JSHandler.new(site)
     end
 
     # Setter
@@ -100,11 +101,7 @@ module Jekyll
     end
 
     def self.gather_documents(site)
-      documents = if Jekyll::VERSION >= "3.0.0"
-                    site.posts.docs.clone
-                  else
-                    site.posts.clone
-                  end
+      documents = site.posts.docs.clone
 
       if @config.dig("pages") == true
         log "info", "Including site pages."
@@ -139,7 +136,7 @@ module Jekyll
       end
     end
 
-    def self.read_lookup_dates()
+    def self.read_lookup_dates
       cache_file = get_cache_file_path "lookups"
       load_yaml(cache_file)
     end
@@ -180,7 +177,7 @@ module Jekyll
           break
         end
       end
-      timeframe = "older" unless timeframe
+      timeframe ||= "older"
       return timeframe
     end
 
@@ -213,7 +210,7 @@ module Jekyll
       begin
         endpoint = Webmention::Client.supports_webmention?(uri)
         log("info", "Could not find a webmention endpoint at #{uri}") unless endpoint
-      rescue => e
+      rescue StandardError => e
         log "info", "Endpoint lookup failed for #{uri}: #{e.message}"
         endpoint = false
       end
@@ -300,22 +297,25 @@ module Jekyll
     end
 
     # Utility Method
-    # Writes given +data+ as YAML string into +file+ path.
+    # Caches given +data+ to memory and then proceeds to write +data+
+    # as YAML string into +file+ path.
     #
     # Returns nothing.
     def self.dump_yaml(file, data = {})
+      @webmention_data_cache[file] = data
       File.open(file, "wb") { |f| f.puts YAML.dump(data) }
     end
 
     # Utility Method
-    # Safely parse given YAML +file+ path and return data.
+    # Attempts to first load data cached in memory and then proceeds to
+    # safely parse given YAML +file+ path and return data.
     #
     # Returns empty hash if parsing fails to return data
     def self.load_yaml(file)
-      SafeYAML.load_file(file) || {}
+      @webmention_data_cache[file] || SafeYAML.load_file(file) || {}
     end
 
-    private
+    # Private Methods
 
     def self.get_http_response(uri)
       uri  = URI.parse(URI.encode(uri))
@@ -341,8 +341,10 @@ module Jekyll
 
     # Cache bad URLs for a bit
     def self.uri_is_not_ok(uri)
+      uri = URI.parse(URI.encode(uri))
       # Never cache webmention.io in here
       return if uri.host == "webmention.io"
+
       cache_file = @cache_files["bad_uris"]
       bad_uris = load_yaml(cache_file)
       bad_uris[uri.host] = Time.now.to_s
@@ -361,6 +363,8 @@ module Jekyll
       end
       return true
     end
+
+    private_class_method :get_http_response, :uri_is_not_ok, :uri_ok?
   end
 end
 

data/lib/jekyll/webmention_io/js_handler.rb

@@ -28,7 +28,7 @@ module Jekyll
         @deploy, @uglify, @source, @destination = js_config.values_at("deploy", "uglify", "source", "destination")
         @resource_name = "JekyllWebmentionIO.js"
         @resource_url = File.join(
-          "", site.config["baseurl"], @destination, @resource_name
+          "", site.config["baseurl"].to_s, @destination, @resource_name
         )
       end
 
@@ -50,15 +50,15 @@ module Jekyll
 
       def render
         if disabled?
-          Jekyll::WebmentionIO.log "info",
+          WebmentionIO.log "info",
             "JavaScript output is disabled, so the {% webmentions_js %} tag is being skipped"
           return ""
         end
 
         js_file = deploy? ? "<script src=\"#@resource_url\" async></script>" : ""
 
-        Jekyll::WebmentionIO.log "info", "Gathering templates for JavaScript."
-        "#{js_file}\n#{Jekyll::WebmentionIO.html_templates}"
+        WebmentionIO.log "info", "Gathering templates for JavaScript."
+        "#{js_file}\n#{WebmentionIO.html_templates}"
       end
     end
   end

data/lib/jekyll/webmention_io/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module WebmentionIO
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

data/lib/jekyll/webmention_io/webmention.rb

@@ -51,13 +51,7 @@ module Jekyll
       end
 
       def markdownify(string)
-        unless @converter
-          @converter = if defined? @site.find_converter_instance
-                         @site.find_converter_instance(::Jekyll::Converters::Markdown)
-                       else
-                         @site.getConverterImpl(::Jekyll::Converters::Markdown)
-                       end
-        end
+        @converter ||= @site.find_converter_instance(Jekyll::Converters::Markdown)
 
         if string
           string = @converter.convert(string.to_s)
@@ -134,7 +128,7 @@ module Jekyll
 
         if @type == "post"
 
-          html_source = Jekyll::WebmentionIO.get_uri_source(@uri)
+          html_source = WebmentionIO.get_uri_source(@uri)
           unless html_source
             return title
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -44,20 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="