jekyll-webmention_io 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d0274bb949c53137ce51261e4c2ff534b85806
-  data.tar.gz: 94dc7afb53715fb5e6661b9fa7fad76cc225e2ca
+  metadata.gz: 03fd32c2683f0ffc0d9494ffa0be93ae40835b97
+  data.tar.gz: 30f080cb695df8870b9919b0783f91a744d382fb
 SHA512:
-  metadata.gz: ed77eae6a0645a492b91a3e7d75aedf006e684290735cee508ec6fd5385cadad0530e47f59b29450c1398bec096c202aa13c30ee4542a6cfd2c425c6b6fba640
-  data.tar.gz: 8b60976284215965fc4295c444a6059ab5f5409dfa4a6ffa650c03900322f8614d00ec53271d58e1bc5c7a7b98387809f9a7d850a3bd9a41433398cfad8c4871
+  metadata.gz: f7f1ba64a3b949dd3fa9a5e724ba788f5513d5914f9256b5ec1ce88069fd5d74ed38213c7c1c3f55f438a6722dc0c6ac065e979aa8b8786e403d65bfe25d3077
+  data.tar.gz: b92a21d5542a6cb586bbf47bb0abdbf50c961e3d766c43880d59367fa51a8a15252bca5bcbc4b9c1a2a9656271d047cbd479c370e6534af5778e31779fe8a38b

data/lib/jekyll/commands/webmention.rb

@@ -14,7 +14,10 @@ module Jekyll
         end
       end
 
-      def self.process(_args = [], _options = {})
+      def self.process(_args = [], options = {})
+        options = configuration_from_options(options)
+        WebmentionIO.bootstrap(Jekyll::Site.new(options))
+
         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
@@ -24,17 +27,26 @@ module Jekyll
           outgoing = WebmentionIO.load_yaml(cached_outgoing)
           outgoing.each do |source, targets|
             targets.each do |target, response|
+              # skip ones we’ve handled
               next unless response == false
 
+              # convert protocol-less links
               if target.index("//").zero?
                 target = "http:#{target}"
               end
+
+              # skip bad URLs
+              next unless WebmentionIO.uri_ok?(target)
+
+              # get the endpoint
               endpoint = WebmentionIO.get_webmention_endpoint(target)
               next unless endpoint
 
+              # get the response
               response = WebmentionIO.webmention(source, target, endpoint)
               next unless response
 
+              # capture JSON responses in case site wants to do anything with them
               begin
                 response = JSON.parse response
               rescue JSON::ParserError

data/lib/jekyll/generators/gather_webmentions.rb

@@ -147,7 +147,7 @@ module Jekyll
 
         if response && response["links"]
           response["links"].reverse_each do |link|
-            webmention = WebmentionIO::Webmention.new(link, @site)
+            webmention = WebmentionIO::WebmentionItem.new(link, @site)
 
             # Do we already have it?
             if webmentions.key? webmention.id

data/lib/jekyll/webmention_io.rb

@@ -8,7 +8,7 @@
 #  using http://webmention.io/ and the following syntax:
 #
 require_relative "webmention_io/version"
-require_relative "webmention_io/webmention"
+require_relative "webmention_io/webmention_item"
 require_relative "webmention_io/js_handler"
 
 require "json"
@@ -209,9 +209,13 @@ module Jekyll
       # log "info", "Looking for webmention endpoint at #{uri}"
       begin
         endpoint = Webmention::Client.supports_webmention?(uri)
-        log("info", "Could not find a webmention endpoint at #{uri}") unless endpoint
+        unless endpoint
+          log("info", "Could not find a webmention endpoint at #{uri}")
+          uri_is_not_ok(uri)
+        end
       rescue StandardError => e
         log "info", "Endpoint lookup failed for #{uri}: #{e.message}"
+        uri_is_not_ok(uri)
         endpoint = false
       end
       endpoint
@@ -220,12 +224,12 @@ module Jekyll
     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)
-      status = response.dig("parsed_response", "data", "status").to_s
-      if status == "200"
+      mention = Webmention::Client.send_mention(endpoint, source, target, true)
+      if (mention.response.is_a? Net::HTTPOK) || (mention.response.is_a? Net::HTTPCreated) || (mention.response.is_a? Net::HTTPAccepted)
         log "info", "Webmention successful!"
-        return response.response.body
+        return mention.response.body
       else
+        log "info", mention.inspect
         log "info", "Webmention failed, but will remain queued for next time"
         false
       end
@@ -235,8 +239,8 @@ module Jekyll
       @template_file_cache[template] ||= begin
         configured_template = @config.dig("templates", template)
         if configured_template
-          log "info", "Using custom #{template} template"
-          configured_template
+          log "info", "Using custom #{template} template from site source"
+          @site.in_source_dir configured_template
         else
           File.expand_path("templates/#{template}.html", __dir__)
         end
@@ -252,10 +256,15 @@ module Jekyll
     end
 
     def self.html_templates
+      proofer = if @config['html_proofer'] == true
+                  ' data-proofer-ignore'
+                else
+                  ''
+                end
       @html_templates ||= begin
         templates = +"" # unfrozen String
         supported_templates.each do |template|
-          templates << "<template style=\"display:none\" id=\"webmention-#{template}\">"
+          templates << "<template style=\"display:none\" id=\"webmention-#{template}\"#{proofer}>"
           templates << get_template_contents(template)
           templates << "</template>"
         end
@@ -364,7 +373,7 @@ module Jekyll
       return true
     end
 
-    private_class_method :get_http_response, :uri_is_not_ok, :uri_ok?
+    private_class_method :get_http_response, :uri_is_not_ok
   end
 end
 

data/lib/jekyll/webmention_io/version.rb

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

data/lib/jekyll/webmention_io/{webmention.rb → webmention_item.rb}

@@ -4,12 +4,12 @@
 #  https://github.com/aarongustafson/jekyll-webmention_io
 #  Licence : MIT
 #
-#  this liquid plugin insert a webmentions into your Octopress or Jekyll blog
+#  this liquid plugin insert a webmention into your Octopress or Jekyll blog
 #  using http://webmention.io/ and the following syntax:
 #
 module Jekyll
   module WebmentionIO
-    class Webmention
+    class WebmentionItem
       attr_reader :id, :hash
 
       def initialize(mention, site)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -257,7 +257,7 @@ files:
 - lib/jekyll/webmention_io.rb
 - lib/jekyll/webmention_io/js_handler.rb
 - lib/jekyll/webmention_io/version.rb
-- lib/jekyll/webmention_io/webmention.rb
+- lib/jekyll/webmention_io/webmention_item.rb
 homepage: https://github.com/aarongustafson/jekyll-webmention_io
 licenses:
 - MIT