jekyll-webmention_io 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9690fa4573a7c0d2a45c5e86f9bd66ef28de2f9d
-  data.tar.gz: 0a9fab2e11ea1fe25f708cc6eb3f2ee7f4d3434f
+  metadata.gz: 9a5fc8540b37c11c6a5c8cabc941a0a8abfb6d28
+  data.tar.gz: b2c35dd389644a77a84b198efc998dcdc6dc3773
 SHA512:
-  metadata.gz: 1d5b8ddd87ac116a4575a1f6e03dd897d31d9f24197b039c39a14d05462e1e2c4ffa293fbcc637f1c0408585e7b716633f8e36c2ab8e1307553cf896c11b1037
-  data.tar.gz: 8da3ba2bc5ca88e6c500a5f7da8161c9b447b3f9f00ce1f7be3d54b47694aaf4a5d32111b8aebdc1aba7609d3dfaf0cfc22adf78ff75ed93f599dc5264c0bf93
+  metadata.gz: 5ee6dd28ea2cab6e24e6b13c49f32e626188b223824b04da05978ada666ee778673a3d7e299afaa74ae37bddc0b95198914fbb08b066832816198a831e05b837
+  data.tar.gz: 9ad5fd09b1bbc9d5961647359c10e69bd1654619dc4d42abbf10b7195c71c253a8078fddfc2f9cf73e85948f4ae93e897d9f90d6303d6d119d8ef31dd453bd66

data/lib/jekyll/assets/{webmention_websocket.js → webmention_websocket.js.disabled}

@@ -6,7 +6,7 @@
   
   if ( ! ( 'JekyllWebmentionIO' in window ) ){ window.JekyllWebmentionIO = {}; }
   
-  var ws = new WebSocket('ws://webmention.io:8080');
+  var ws = new WebSocket('wss://webmention.io:8080');
 
   ws.onopen = function(){
     // Send the current window URL to the server to register to receive notifications about this URL

data/lib/jekyll/commands/webmention.rb

@@ -1,46 +1,44 @@
-require 'json'
+require "json"
 
 module Jekyll
   module Commands
     class WebmentionCommand < Command
-      def self.init_with_program( prog )
+      def self.init_with_program(prog)
         prog.command(:webmention) do |c|
-          c.syntax 'webmention'
-          c.description 'Sends queued webmentions'
-          
+          c.syntax "webmention"
+          c.description "Sends queued webmentions"
+
           c.action { |args, options| process args, options }
         end
       end
 
-      def self.process( args=[], options={} )
-        if File.exists? "#{Jekyll::WebmentionIO::cache_folder}/#{Jekyll::WebmentionIO::file_prefix}sent.yml"
-          Jekyll::WebmentionIO::log 'error', 'Your outgoing webmentions queue needs to be upgraded. Please re-build your project.'
+      def self.process(_args = [], _options = {})
+        if File.exist? "#{Jekyll::WebmentionIO.cache_folder}/#{Jekyll::WebmentionIO.file_prefix}sent.yml"
+          Jekyll::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'
-        if File.exists?(cached_outgoing)
-          outgoing = open(cached_outgoing) { |f| YAML.load(f) }
+        cached_outgoing = Jekyll::WebmentionIO.get_cache_file_path "outgoing"
+        if File.exist?(cached_outgoing)
+          outgoing = open(cached_outgoing) { |f| YAML.safe_load(f) }
           outgoing.each do |source, targets|
             targets.each do |target, response|
-              if response === false
-                if target.index( "//" ) == 0
-                  target  = "http:#{target}"
-                end
-                endpoint = Jekyll::WebmentionIO::get_webmention_endpoint( target )
-                if endpoint
-                  response = Jekyll::WebmentionIO::webmention( source, target, endpoint )
-                  if response
-                    outgoing[source][target] = JSON.parse response.body
-                    count += 1
-                  end
-                end
+              next unless response === false
+              if target.index("//") == 0
+                target = "http:#{target}"
+              end
+              endpoint = Jekyll::WebmentionIO.get_webmention_endpoint(target)
+              next unless endpoint
+              response = Jekyll::WebmentionIO.webmention(source, target, endpoint)
+              if response
+                outgoing[source][target] = JSON.parse response.body
+                count += 1
               end
             end
           end
           if count > 0
-            File.open(cached_outgoing, 'w') { |f| YAML.dump(outgoing, f) }
+            File.open(cached_outgoing, "w") { |f| YAML.dump(outgoing, f) }
           end
-          Jekyll::WebmentionIO::log 'info', "#{count} webmentions sent."
+          Jekyll::WebmentionIO.log "info", "#{count} webmentions sent."
         end # file exists (outgoing)
       end # def process
     end # WebmentionCommand

data/lib/jekyll/generators/compile_js.rb

@@ -1,56 +1,55 @@
 #  (c) Aaron Gustafson
-#  https://github.com/aarongustafson/jekyll-webmention_io 
+#  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
-#  
+#
 #  This generator gathers webmentions of your pages
 #
 
-require 'uglifier'
+require "uglifier"
 
 module Jekyll
   module WebmentionIO
     class JavaScriptFile < StaticFile
       def destination_rel_dir
         config = {
-          'destination' => 'js'
+          "destination" => "js",
         }
-        js_config = Jekyll::WebmentionIO::config['js'] || {}
+        js_config = Jekyll::WebmentionIO.config["js"] || {}
         config = config.merge(js_config)
-        config['destination']
+        config["destination"]
       end
     end
 
     using StringInflection
     class CompileJS < Generator
-      
       safe true
       priority :low
-      
+
       def generate(site)
-        if site.config.dig( 'webmentions', 'js' ) == false
-          Jekyll::WebmentionIO::log 'info', 'Skipping JavaScript inclusion.'
+        if site.config.dig("webmentions", "js") == false
+          Jekyll::WebmentionIO.log "info", "Skipping JavaScript inclusion."
           return
         end
 
         config = {
-          'destination' => 'js',
-          'uglify'      => true
+          "destination" => "js",
+          "uglify"      => true,
         }
-        site_config = site.config.dig( 'webmentions', 'js' ) || {}
-        
+        site_config = site.config.dig("webmentions", "js") || {}
+
         config = config.merge(site_config)
-        
-        source = File.join(File.dirname(File.expand_path(__FILE__)), '../assets/')
-        
-        javascript = ''
+
+        source = File.join(File.dirname(File.expand_path(__FILE__)), "../assets/")
+
+        javascript = ""
         Dir["#{source}/*.js"].each do |file|
-          handler = File.open(file, 'rb')
+          handler = File.open(file, "rb")
           javascript << File.read(handler)
         end
-        
+
         # Dump in types
         js_types = []
-        Jekyll::WebmentionIO::types.each do |type|
+        Jekyll::WebmentionIO.types.each do |type|
           js_types.push "'#{type}': '#{type.to_singular}'"
         end
         types_js = <<-EOF
@@ -59,25 +58,25 @@ module Jekyll
             JekyllWebmentionIO.types = { TYPES };
           }(this, this.JekyllWebmentionIO));
         EOF
-        javascript << types_js.sub( /TYPES/, js_types.join(',') )
-        
-        unless config['uglify'] == false
+        javascript << types_js.sub(%r!TYPES!, js_types.join(","))
+
+        unless config["uglify"] == false
           uglify_config = {
-            :harmony => true
+            :harmony => true,
           }
           javascript = Uglifier.new(uglify_config).compile(javascript)
         end
 
         # Generate the file
-        file_name = 'JekyllWebmentionIO.js'
-        source_file_destination = ( config['source'] == false ?  Dir.mktmpdir : "#{site.config['source']}/#{config['destination']}" )
-        Dir.mkdir( source_file_destination ) unless File.exists?( source_file_destination )
-        File.open("#{source_file_destination}/#{file_name}", 'w') { |f| f.write( javascript ) }
-        unless config['deploy'] == false
-          js_file = Jekyll::WebmentionIO::JavaScriptFile.new(site, source_file_destination, '', file_name)
+        file_name = "JekyllWebmentionIO.js"
+        source_file_destination = (config["source"] == false ? Dir.mktmpdir : "#{site.config["source"]}/#{config["destination"]}")
+        Dir.mkdir(source_file_destination) unless File.exist?(source_file_destination)
+        File.open("#{source_file_destination}/#{file_name}", "w") { |f| f.write(javascript) }
+        unless config["deploy"] == false
+          js_file = Jekyll::WebmentionIO::JavaScriptFile.new(site, source_file_destination, "", file_name)
           site.static_files << js_file
         end
       end
     end
   end
-end
+end

data/lib/jekyll/generators/queue_webmentions.rb

@@ -1,41 +1,40 @@
 #  (c) Aaron Gustafson
-#  https://github.com/aarongustafson/jekyll-webmention_io 
+#  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
-#  
+#
 #  This generator caches sites you mention so they can be mentioned
 #
 
 module Jekyll
   class QueueWebmentions < Generator
-
     safe true
     priority :low
-    
+
     def generate(site)
-      if site.config.dig( 'webmentions', 'pause_lookups' ) == true
-        Jekyll::WebmentionIO::log 'info', 'Webmention lookups are currently paused.'
+      if site.config.dig("webmentions", "pause_lookups") == true
+        Jekyll::WebmentionIO.log "info", "Webmention lookups are currently paused."
         return
       end
 
-      Jekyll::WebmentionIO::log 'info', 'Beginning to gather webmentions you’ve made. This may take a while.'
+      Jekyll::WebmentionIO.log "info", "Beginning to gather webmentions you’ve made. This may take a while."
+
+      upgrade_outgoing_webmention_cache
+
+      cache_file = Jekyll::WebmentionIO.get_cache_file_path "outgoing"
+      webmentions = open(cache_file) { |f| YAML.safe_load(f) }
+
+      posts = if Jekyll::VERSION >= "3.0.0"
+                site.posts.docs
+              else
+                site.posts
+              end
 
-      upgrade_outgoing_webmention_cache()
-      
-      cache_file = Jekyll::WebmentionIO::get_cache_file_path 'outgoing'
-      webmentions = open(cache_file) { |f| YAML.load(f) }
-      
-      if Jekyll::VERSION >= "3.0.0"
-        posts = site.posts.docs
-      else
-        posts = site.posts
-      end
-        
       posts.each do |post|
-        uri = "#{site.config['url']}#{post.url}"
+        uri = "#{site.config["url"]}#{post.url}"
         mentions = get_mentioned_uris(post)
-        if webmentions.has_key? uri
+        if webmentions.key? uri
           mentions.each do |mentioned_uri, response|
-            unless webmentions[uri].has_key? mentioned_uri
+            unless webmentions[uri].key? mentioned_uri
               webmentions[uri][mentioned_uri] = response
             end
           end
@@ -44,50 +43,49 @@ module Jekyll
         end
       end
 
-      cache_file = Jekyll::WebmentionIO::get_cache_file_path 'outgoing'
-      File.open(cache_file, 'w') { |f| YAML.dump(webmentions, f) }
+      cache_file = Jekyll::WebmentionIO.get_cache_file_path "outgoing"
+      File.open(cache_file, "w") { |f| YAML.dump(webmentions, f) }
 
-      Jekyll::WebmentionIO::log 'info', 'Webmentions have been gathered and cached.'
+      Jekyll::WebmentionIO.log "info", "Webmentions have been gathered and cached."
     end
 
     def upgrade_outgoing_webmention_cache
-      old_sent_file = "#{Jekyll::WebmentionIO::cache_folder}/#{Jekyll::WebmentionIO::file_prefix}sent.yml"
-      old_outgoing_file = "#{Jekyll::WebmentionIO::cache_folder}/#{Jekyll::WebmentionIO::file_prefix}queued.yml"
-      unless File.exists? old_sent_file
+      old_sent_file = "#{Jekyll::WebmentionIO.cache_folder}/#{Jekyll::WebmentionIO.file_prefix}sent.yml"
+      old_outgoing_file = "#{Jekyll::WebmentionIO.cache_folder}/#{Jekyll::WebmentionIO.file_prefix}queued.yml"
+      unless File.exist? old_sent_file
         return
       end
-      sent_webmentions = open(old_sent_file) { |f| YAML.load(f) }
-      outgoing_webmentions = open(old_outgoing_file) { |f| YAML.load(f) }
+      sent_webmentions = open(old_sent_file) { |f| YAML.safe_load(f) }
+      outgoing_webmentions = open(old_outgoing_file) { |f| YAML.safe_load(f) }
       merged = {}
       outgoing_webmentions.each do |source_url, webmentions|
         collection = {}
         webmentions.each do |target_url|
-          if sent_webmentions.dig( source_url, target_url )
-            collection[target_url] = ""
-          else
-            collection[target_url] = false
-          end
+          collection[target_url] = if sent_webmentions.dig(source_url, target_url)
+                                     ""
+                                   else
+                                     false
+                                   end
         end
         merged[source_url] = collection
       end
-      cached_outgoing = Jekyll::WebmentionIO::get_cache_file_path 'outgoing'
-      File.open(cached_outgoing, 'w') { |f| YAML.dump(merged, f) }
+      cached_outgoing = Jekyll::WebmentionIO.get_cache_file_path "outgoing"
+      File.open(cached_outgoing, "w") { |f| YAML.dump(merged, f) }
       File.delete old_sent_file, old_outgoing_file
-      Jekyll::WebmentionIO::log 'info', 'Upgraded your sent webmentions cache.'
-    end  
+      Jekyll::WebmentionIO.log "info", "Upgraded your sent webmentions cache."
+    end
 
     def get_mentioned_uris(post)
       uris = {}
-      if post.data['in_reply_to']
-        uris[post.data['in_reply_to']] = false
+      if post.data["in_reply_to"]
+        uris[post.data["in_reply_to"]] = false
       end
       post.content.scan(/(?:https?:)?\/\/[^\s)#"]+/) do |match|
-        unless uris.has_key? match
+        unless uris.key? match
           uris[match] = false
         end
       end
       return uris
     end
-    
   end
-end
+end

data/lib/jekyll/tags/count.rb

@@ -1,29 +1,27 @@
 #  (c) Aaron Gustafson
-#  https://github.com/aarongustafson/jekyll-webmention_io 
+#  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
-#  
+#
 #  this liquid plugin insert a webmentions into your Octopress or Jekill blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_count post.url [ likes | links | posts | replies | reposts ]*   %}
-#   
+#
 module Jekyll
   module WebmentionIO
     class WebmentionCountTag < Jekyll::WebmentionIO::WebmentionTag
-
       def initialize(tagName, text, tokens)
         super
         @text = text
-        set_template 'count'
+        set_template "count"
       end
 
-      def set_data( data, types )
-        @data = { 'count' => data.length, 'types' => types }
+      def set_data(data, types)
+        @data = { "count" => data.length, "types" => types }
       end
-
     end
   end
 end
 
-Liquid::Template.register_tag('webmention_count', Jekyll::WebmentionIO::WebmentionCountTag)
-Liquid::Template.register_tag('webmentions_count', Jekyll::WebmentionIO::WebmentionCountTag)
+Liquid::Template.register_tag("webmention_count", Jekyll::WebmentionIO::WebmentionCountTag)
+Liquid::Template.register_tag("webmentions_count", Jekyll::WebmentionIO::WebmentionCountTag)

data/lib/jekyll/tags/likes.rb

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

data/lib/jekyll/tags/links.rb

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

data/lib/jekyll/tags/posts.rb

@@ -1,29 +1,27 @@
 #  (c) Aaron Gustafson
-#  https://github.com/aarongustafson/jekyll-webmention_io 
+#  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
-#  
+#
 #  this liquid plugin insert a webmentions into your Octopress or Jekill blog
 #  using http://webmention.io/ and the following syntax:
 #
 #    {% webmention_posts post.url %}
-#   
+#
 module Jekyll
   module WebmentionIO
     class WebmentionRepostsTag < Jekyll::WebmentionIO::WebmentionTag
-
       def initialize(tagName, text, tokens)
-        super      
+        super
         @text = text
-        set_template 'posts'
+        set_template "posts"
       end
 
-      def set_data( data, types )
-        webmentions = extract_type 'posts', data
-        @data = { 'webmentions' => webmentions.values }
+      def set_data(data, _types)
+        webmentions = extract_type "posts", data
+        @data = { "webmentions" => webmentions.values }
       end
-
     end
   end
 end
 
-Liquid::Template.register_tag('webmention_posts', Jekyll::WebmentionIO::WebmentionRepostsTag)
+Liquid::Template.register_tag("webmention_posts", Jekyll::WebmentionIO::WebmentionRepostsTag)

data/lib/jekyll/tags/replies.rb

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

data/lib/jekyll/tags/reposts.rb

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

data/lib/jekyll/tags/webmentions.rb

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

data/lib/jekyll/tags/webmentions_head.rb

@@ -1,7 +1,7 @@
 #  (c) Aaron Gustafson
-#  https://github.com/aarongustafson/jekyll-webmention_io 
+#  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
-#  
+#
 #  Stuff for the `head`
 #
 
@@ -9,23 +9,23 @@ module Jekyll
   module WebmentionIO
     class WebmentionHeadTag < Liquid::Tag
       def render(context)
-        head = ''
+        head = ""
         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">'
-        
-        page = context['page']
+
+        page = context["page"]
         site = context.registers[:site]
-        if page['redirect_from']
-          if page['redirect_from'].is_a? String
-            redirect = site.config['url'] + page['redirect_from']
-          elsif page['redirect_from'].is_a? Array
-            redirect = site.config['url'] + page['redirect_from'].join(",#{site.config['url']}")
+        if page["redirect_from"]
+          if page["redirect_from"].is_a? String
+            redirect = site.config["url"] + page["redirect_from"]
+          elsif page["redirect_from"].is_a? Array
+            redirect = site.config["url"] + page["redirect_from"].join(",#{site.config["url"]}")
           end
           head << "<meta property=\"webmention:redirected_from\" content=\"#{redirect}\">"
         end
 
-        username = site.config.dig( 'webmentions', 'username' )
+        username = site.config.dig("webmentions", "username")
         if username
           head << "<link rel=\"pingback\" href=\"https://webmention.io/#{username}/xmlrpc\">"
           head << "<link rel=\"webmention\" href=\"https://webmention.io/#{username}/webmention\">"
@@ -37,4 +37,4 @@ module Jekyll
   end
 end
 
-Liquid::Template.register_tag('webmentions_head', Jekyll::WebmentionIO::WebmentionHeadTag)
+Liquid::Template.register_tag("webmentions_head", Jekyll::WebmentionIO::WebmentionHeadTag)

data/lib/jekyll/tags/webmentions_js.rb

@@ -1,7 +1,7 @@
 #  (c) Aaron Gustafson
-#  https://github.com/aarongustafson/jekyll-webmention_io 
+#  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
-#  
+#
 #  JS stuff
 #
 
@@ -12,37 +12,37 @@ module Jekyll
         site = context.registers[:site]
 
         # JS can be turned off too
-        if site.config.dig( 'webmentions', 'js' ) == false
-          Jekyll::WebmentionIO::log 'info', 'JavaScript output is disabled, so the {% webmentions_js %} tag is being skipped'
-          return ''
+        if site.config.dig("webmentions", "js") == false
+          Jekyll::WebmentionIO.log "info", "JavaScript output is disabled, so the {% webmentions_js %} tag is being skipped"
+          return ""
         end
 
         config = {
-          'destination' => 'js',
-          'uglify'      => true
+          "destination" => "js",
+          "uglify"      => true,
         }
-        site_config = site.config.dig( 'webmentions', 'js' ) || {}        
+        site_config = site.config.dig("webmentions", "js") || {}
         config = config.merge(site_config)
 
         # JS file
-        js = ''
-        unless config['deploy'] == false
-          js_file_path = "#{site.config['baseurl']}/#{config['destination']}/JekyllWebmentionIO.js"
+        js = ""
+        unless config["deploy"] == false
+          js_file_path = "#{site.config["baseurl"]}/#{config["destination"]}/JekyllWebmentionIO.js"
           js << "<script src=\"#{js_file_path}\" async></script>"
         end
-        
-        templates = ''
-        template_files = Jekyll::WebmentionIO::types + ['count', 'webmentions']
+
+        templates = ""
+        template_files = Jekyll::WebmentionIO.types + %w(count webmentions)
         template_files.each do |template|
           templates << "<template style=\"display:none\" id=\"webmention-#{template}\">"
-          templates << Jekyll::WebmentionIO::get_template_contents( template )
-          templates << '</template>'
+          templates << Jekyll::WebmentionIO.get_template_contents(template)
+          templates << "</template>"
         end
-        
+
         "#{js}\n#{templates}"
       end
     end
   end
 end
 
-Liquid::Template.register_tag('webmentions_js', Jekyll::WebmentionIO::WebmentionJSTag)
+Liquid::Template.register_tag("webmentions_js", Jekyll::WebmentionIO::WebmentionJSTag)

data/lib/jekyll/webmention_io/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module WebmentionIO
-    VERSION = "2.7.0"
+    VERSION = "2.8.0".freeze
   end
 end

data/lib/jekyll/webmention_io.rb

@@ -1,50 +1,50 @@
 #  (c) Aaron Gustafson
-#  https://github.com/aarongustafson/jekyll-webmention_io 
+#  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
-#  
+#
 #  this liquid plugin insert a webmentions into your Octopress or Jekill blog
 #  using http://webmention.io/ and the following syntax:
-#   
-require_relative 'webmention_io/version'
+#
+require_relative "webmention_io/version"
 
-require 'json'
-require 'net/http'
-require 'uri'
-require 'openssl'
-require 'string_inflection'
-require 'webmention'
+require "json"
+require "net/http"
+require "uri"
+require "openssl"
+require "string_inflection"
+require "webmention"
 
 module Jekyll
   module WebmentionIO
-    
-    @logger_prefix = '[jekyll-webmention_io]'
 
-    @api_url = 'https://webmention.io/api'
+    @logger_prefix = "[jekyll-webmention_io]"
+
+    @api_url = "https://webmention.io/api"
     @api_endpoint = @api_url
-    @api_suffix = ''
-    
-    @types = ['likes','links','posts','replies','reposts']
+    @api_suffix = ""
+
+    @types = %w(likes links posts replies reposts)
 
-    def self.bootstrap()
+    def self.bootstrap
       # @jekyll_config = Jekyll.configuration({ 'quiet' => true })
-      @jekyll_config = Jekyll::configuration({})
-      @config = @jekyll_config['webmentions'] || {}
-      
+      @jekyll_config = Jekyll.configuration({})
+      @config = @jekyll_config["webmentions"] || {}
+
       # Set up the cache folder & files
-      @cache_folder = @config['cache_folder'] || '.jekyll-cache'
-      Dir.mkdir(@cache_folder) unless File.exists?(@cache_folder)
-      @file_prefix = ''
-      if ! @cache_folder.include? 'webmention'
-        @file_prefix = 'webmention_io_'
+      @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
       @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"
+        "incoming" => "#{@cache_folder}/#{@file_prefix}received.yml",
+        "outgoing" => "#{@cache_folder}/#{@file_prefix}outgoing.yml",
+        "bad_uris" => "#{@cache_folder}/#{@file_prefix}bad_uris.yml",
       }
-      @cache_files.each do |key, file|
-        if ! File.exists?(file)
-          File.open(file, 'w') { |f| YAML.dump({}, f) }
+      @cache_files.each do |_key, file|
+        unless File.exist?(file)
+          File.open(file, "w") { |f| YAML.dump({}, f) }
         end
       end
     end
@@ -53,41 +53,46 @@ module Jekyll
     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
-    
-    def self.get_cache_file_path( key )
+
+    def self.get_cache_file_path(key)
       path = false
-      if @cache_files.has_key? key
+      if @cache_files.key? key
         path = @cache_files[key]
       end
       return path
     end
 
     # API helpers
-    #def uri_params_for(api_params)
+    # def uri_params_for(api_params)
     #  api_params.keys.sort.map do |k|
     #    "#{CGI::escape(k)}=#{CGI::escape(api_params[k])}"
     #  end.join('&')
-    #end
+    # end
 
     def self.set_api_endpoint(path)
       @api_endpoint = "#{@api_url}/#{path}"
     end
-    
+
     def self.set_api_suffix(suffix)
       @api_suffix = suffix
     end
@@ -104,108 +109,110 @@ module Jekyll
 
     # allowed throttles: last_week, last_month, last_year, older
     # allowed values:  daily, weekly, monthly, yearly, every X days|weeks|months|years
-    def self.post_should_be_throttled?( post, item_date, last_webmention_date )
-      throttles = @config.dig( 'throttle_lookups' )
+    def self.post_should_be_throttled?(post, item_date, last_webmention_date)
+      throttles = @config.dig("throttle_lookups")
       if throttles && item_date && last_webmention_date
-        age = get_timeframe_from_date( item_date )
-        throttle = throttles.dig( age )
-        if throttle && get_date_from_string( throttle ) >= Date.parse(last_webmention_date)
-          log 'info', "Throttling #{post.data['title']} (Only checking it #{throttle})"
+        age = get_timeframe_from_date(item_date)
+        throttle = throttles.dig(age)
+        if throttle && get_date_from_string(throttle) >= Date.parse(last_webmention_date)
+          log "info", "Throttling #{post.data["title"]} (Only checking it #{throttle})"
           return true
         end
       end
-      return false      
+      return false
     end
-    def self.get_timeframe_from_date( time )
+
+    def self.get_timeframe_from_date(time)
       date = time.to_date
       timeframes = {
-        'last_week'  => 'weekly',
-        'last_month' => 'monthly',
-        'last_year'  => 'yearly'
+        "last_week"  => "weekly",
+        "last_month" => "monthly",
+        "last_year"  => "yearly",
       }
       timeframe = nil
       timeframes.each do |key, value|
-        if date.to_date > get_date_from_string( value )
+        if date.to_date > get_date_from_string(value)
           timeframe = key
           break
         end
       end
-      if ! timeframe
-        timeframe = 'older'
+      unless timeframe
+        timeframe = "older"
       end
       return timeframe
     end
+
     # supported: daily, weekly, monthly, yearly, every X days|weeks|months|years
-    def self.get_date_from_string( text )
+    def self.get_date_from_string(text)
       today = Date.today
-      pattern = /every\s(?:(\d+)\s)?(day|week|month|year)s?/
-      matches = text.match( pattern )
-      if ! matches
-        if text == 'daily'
-          text = 'every 1 day'
-        else
-          text = 'every 1 ' + text.sub( 'ly', '' )
-        end
-        matches = text.match( pattern )
+      pattern = %r!every\s(?:(\d+)\s)?(day|week|month|year)s?!
+      matches = text.match(pattern)
+      unless matches
+        text = if text == "daily"
+                 "every 1 day"
+               else
+                 "every 1 " + text.sub("ly", "")
+               end
+        matches = text.match(pattern)
       end
       n = matches[1] ? matches[1].to_i : 1
       unit = matches[2]
       # weeks aren't natively supported in Ruby
-      if unit == 'week'
-        n = n * 7
-        unit = 'day'
+      if unit == "week"
+        n *= 7
+        unit = "day"
       end
       # dynamic method call
       return today.send "prev_#{unit}", n
     end
 
-    def self.get_webmention_endpoint( uri )
+    def self.get_webmention_endpoint(uri)
       # log 'info', "Looking for webmention endpoint at #{uri}"
       begin
-        endpoint = Webmention::Client.supports_webmention?( uri )
-        if ! endpoint
-          log 'info', "Could not find a webmention endpoint at #{uri}"
+        endpoint = Webmention::Client.supports_webmention?(uri)
+        unless endpoint
+          log "info", "Could not find a webmention endpoint at #{uri}"
         end
       rescue => e
-        log 'info', "Endpoint lookup failed for #{uri}: #{e.message}"
+        log "info", "Endpoint lookup failed for #{uri}: #{e.message}"
         endpoint = false
       end
       endpoint
     end
 
-    def self.webmention( source, target, endpoint )
-      log 'info', "Sending webmention of #{target} in #{source}"
-      #return `curl -s -i -d \"source=#{source}&target=#{target}\" -o /dev/null #{endpoint}`
-      response = Webmention::Client.send_mention( endpoint, source, target, true )
+    def self.webmention(source, target, endpoint)
+      log "info", "Sending webmention of #{target} in #{source}"
+      # return `curl -s -i -d \"source=#{source}&target=#{target}\" -o /dev/null #{endpoint}`
+      response = Webmention::Client.send_mention(endpoint, source, target, true)
       if response
-        log 'info', "Webmention successful!"
+        log "info", "Webmention successful!"
       else
-        log 'info', "Webmention failed, but will remain queued for next time"
+        log "info", "Webmention failed, but will remain queued for next time"
       end
       response
     end
 
-    def self.get_template_contents( template )
-      if Jekyll::WebmentionIO::config.dig( 'templates', template )
-          # Jekyll::WebmentionIO::log 'info', "Using custom #{template} template"
-          template_file = Jekyll::WebmentionIO::config['templates'][template]
-        else
-          # Jekyll::WebmentionIO::log 'info', "Using default #{template} template"
-          template_file = File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{template}.html")
+    def self.get_template_contents(template)
+      if Jekyll::WebmentionIO.config.dig("templates", template)
+        # Jekyll::WebmentionIO::log 'info', "Using custom #{template} template"
+        template_file = Jekyll::WebmentionIO.config["templates"][template]
+      else
+        # Jekyll::WebmentionIO::log 'info', "Using default #{template} template"
+        template_file = File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{template}.html")
         end
-        # Jekyll::WebmentionIO::log 'info', "Template file: #{template_file}"
-        handler = File.open(template_file, 'rb')
-        handler.read
+      # Jekyll::WebmentionIO::log 'info', "Template file: #{template_file}"
+      handler = File.open(template_file, "rb")
+      handler.read
     end
-    
+
     # Connections
-    def self.is_uri_ok( uri )
+    def self.is_uri_ok(uri)
       uri = URI.parse(URI.encode(uri))
       now = Time.now.to_s
-      bad_uris = open(@cache_files['bad_uris']) { |f| YAML.load(f) }
+      bad_uris = open(@cache_files["bad_uris"]) { |f| YAML.safe_load(f) }
       if bad_uris.key? uri.host
-        last_checked = DateTime.parse( bad_uris[uri.host] )
-        cache_bad_uris_for = @config['cache_bad_uris_for'] || 1 # in days
+        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
@@ -215,23 +222,23 @@ module Jekyll
     end
 
     # Cache bad URLs for a bit
-    def self.uri_is_not_ok( uri )
-      cache_file = @cache_files['bad_uris']
-      bad_uris = open(cache_file) { |f| YAML.load(f) }
+    def self.uri_is_not_ok(uri)
+      cache_file = @cache_files["bad_uris"]
+      bad_uris = open(cache_file) { |f| YAML.safe_load(f) }
       bad_uris[uri.host] = Time.now.to_s
-      File.open(cache_file, 'w') { |f| YAML.dump(bad_uris, f) }
+      File.open(cache_file, "w") { |f| YAML.dump(bad_uris, f) }
     end
-    
+
     def self.get_uri_source(uri, redirect_limit = 10, original_uri = false)
-      original_uri = original_uri || uri
-      if ! is_uri_ok(uri)
+      original_uri ||= uri
+      unless is_uri_ok(uri)
         return false
       end
       if redirect_limit > 0
         uri = URI.parse(URI.encode(uri))
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = 10
-        if uri.scheme == 'https'
+        if uri.scheme == "https"
           http.use_ssl = true
           http.ssl_version = :TLSv1
           http.ciphers = "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:-LOW"
@@ -241,45 +248,45 @@ module Jekyll
           request = Net::HTTP::Get.new(uri.request_uri)
           response = http.request(request)
         rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, OpenSSL::SSL::SSLError => e
-          log 'warn', "Got an error checking #{original_uri}: #{e}"
+          log "warn", "Got an error checking #{original_uri}: #{e}"
           uri_is_not_ok(uri)
           return false
         end
         case response
-          when Net::HTTPSuccess then
-            return response.body.force_encoding('UTF-8')
-          when Net::HTTPRedirection then
-            redirect_to = URI.parse(URI.encode(response['location']))
-            redirect_to = redirect_to.relative? ? "#{uri.scheme}://#{uri.host}" + redirect_to.to_s : redirect_to.to_s
-            return get_uri_source(redirect_to, redirect_limit - 1, original_uri)
-          else
-            uri_is_not_ok(uri)
-            return false
+        when Net::HTTPSuccess then
+          return response.body.force_encoding("UTF-8")
+        when Net::HTTPRedirection then
+          redirect_to = URI.parse(URI.encode(response["location"]))
+          redirect_to = redirect_to.relative? ? "#{uri.scheme}://#{uri.host}" + redirect_to.to_s : redirect_to.to_s
+          return get_uri_source(redirect_to, redirect_limit - 1, original_uri)
+        else
+          uri_is_not_ok(uri)
+          return false
         end
       else
         if original_uri
-          log 'warn', "too many redirects for #{original_uri}"
+          log "warn", "too many redirects for #{original_uri}"
         end
         uri_is_not_ok(uri)
         return false
       end
     end
 
-    def self.log( type, message )
-      Jekyll.logger.method(type).call( "#{@logger_prefix} #{message}" )
+    def self.log(type, message)
+      Jekyll.logger.method(type).call("#{@logger_prefix} #{message}")
     end
 
   end
 end
 
 # Load all the bits
-Dir[File.dirname(__FILE__) + '/commands/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + "/commands/*.rb"].each do |file|
   require file
 end
-Dir[File.dirname(__FILE__) + '/generators/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + "/generators/*.rb"].each do |file|
   require file
 end
 require "#{File.dirname(__FILE__)}/tags/_.rb"
-Dir[File.dirname(__FILE__) + '/tags/*.rb'].each do |file|
-  require file unless file.include? '_.rb'
+Dir[File.dirname(__FILE__) + "/tags/*.rb"].each do |file|
+  require file unless file.include? "_.rb"
 end

data/lib/jekyll-webmention_io.rb

@@ -1,4 +1,4 @@
-require 'jekyll'
-require 'jekyll/webmention_io'
+require "jekyll"
+require "jekyll/webmention_io"
 
-Jekyll::WebmentionIO::bootstrap();
+Jekyll::WebmentionIO.bootstrap

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -225,7 +225,7 @@ files:
 - lib/jekyll/assets/liquid.js
 - lib/jekyll/assets/webmention_counters.js
 - lib/jekyll/assets/webmention_loader.js
-- lib/jekyll/assets/webmention_websocket.js
+- lib/jekyll/assets/webmention_websocket.js.disabled
 - lib/jekyll/commands/webmention.rb
 - lib/jekyll/generators/compile_js.rb
 - lib/jekyll/generators/gather_webmentions.rb