jekyll-webmention_io 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc2baf7e1ce8ecdb8928406d0194e562eea7e486
-  data.tar.gz: a2fe21b63d34830511960e890edccb645aab2b1d
+  metadata.gz: c117bdfd999aabbbaf34a7baa34510806ec30250
+  data.tar.gz: df0874f2a17993d0fc40fc8d826b1fe7f64c3cb6
 SHA512:
-  metadata.gz: aa7a34a559d02bb541ff95ac9e36c7832ff3b5f9f50a92d0623506958a3f27068bafded7e8d293ab94aa4c881fb4a3ca6a396cff3806e811f013ae5687c308b8
-  data.tar.gz: 8ba3e8e580f1d9674e6b89cc7a01dad1bb2871ff5754425120205de6cda1413ff5ca99fcb7f2fa60bf8763452121102e80b9be91b0c5be9e1a6708c7a9ba8d88
+  metadata.gz: 90bac1c91f4c780eb9ad39ee4eec4dad12272797bd8d00ec3e7924c670449450281b0e6b2970877202ca8d9b9fc490ae4426f207aee29b552fb291817434d069
+  data.tar.gz: 89524277af525e270403ed3f9e57cfa966e72348fbb61971d44f435ba362d4fedd8c711ce4b529f1636762d46f8c89d17d699e94b512a58f8f4972c49261dec6

data/lib/jekyll/commands/webmention.rb

@@ -5,44 +5,43 @@ module Jekyll
         prog.command(:webmention) do |c|
           c.syntax 'webmention'
           c.description 'Sends queued webmentions'
-					
-					c.action { |args, options| process args, options }
+          
+          c.action { |args, options| process args, options }
         end
       end
 
       def self.process( args=[], options={} )
-				cached_outgoing = Jekyll::WebmentionIO::get_cache_file_path 'outgoing'
-				cached_sent     = Jekyll::WebmentionIO::get_cache_file_path 'sent'
-				if File.exists?(cached_outgoing)
-					if File.exists?(cached_sent)
-						sent = open(cached_sent) { |f| YAML.load(f) }
-					else
-						sent = {}
-					end  # file exists (sent)
-					outgoing = open(cached_outgoing) { |f| YAML.load(f) }
-					outgoing.each_pair do |source, targets|
-						if ! sent[source] or ! sent[source].kind_of? Array
-							sent[source] = Array.new
-						end
-						targets.each do |target|
-							if target and ! sent[source].find_index( target )
-								if target.index( "//" ) == 0
-									target  = "http:#{target}"
-								end
-								endpoint = Jekyll::WebmentionIO::get_webmention_endpoint( target )
-								if endpoint
-									endpoint.scan(/href="([^"]+)"/) do |endpoint_url|
-										endpoint_url = endpoint_url[0]
-										Jekyll::WebmentionIO::webmention( source, target, endpoint )
-									end
-									sent[source].push( target )
-								end
-							end
-						end
-					end
-					File.open(cached_sent, 'w') { |f| YAML.dump(sent, f) }
-				end # file exists (outgoing)
-			end # def process
+        cached_outgoing = Jekyll::WebmentionIO::get_cache_file_path 'outgoing'
+        cached_sent     = Jekyll::WebmentionIO::get_cache_file_path 'sent'
+        if File.exists?(cached_outgoing)
+          if File.exists?(cached_sent)
+            sent = open(cached_sent) { |f| YAML.load(f) }
+          else
+            sent = {}
+          end  # file exists (sent)
+          outgoing = open(cached_outgoing) { |f| YAML.load(f) }
+          outgoing.each_pair do |source, targets|
+            if ! sent[source] or ! sent[source].kind_of? Array
+              sent[source] = Array.new
+            end
+            targets.each do |target|
+              if target and ! sent[source].find_index( target )
+                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
+                    sent[source].push( target )
+                  end
+                end
+              end
+            end
+          end
+          File.open(cached_sent, 'w') { |f| YAML.dump(sent, f) }
+        end # file exists (outgoing)
+      end # def process
     end # WebmentionCommand
   end # Commands
 end # Jekyll

data/lib/jekyll/tags/webmentions_head.rb

@@ -25,6 +25,12 @@ module Jekyll
           head << "<meta property=\"webmention:redirected_from\" content=\"#{redirect}\">"
         end
 
+        config = site.config['webmentions']
+        if config.has_key? 'username'
+          head << "<link rel=\"pingback\" href=\"https://webmention.io/#{config['username']}/xmlrpc\">"
+          head << "<link rel=\"webmention\" href=\"https://webmention.io/#{config['username']}/webmention\">"
+        end
+
         head
       end
     end

data/lib/jekyll/webmention_io/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module WebmentionIO
-    VERSION = "2.2.1"
+    VERSION = "2.3.0"
   end
 end

data/lib/jekyll/webmention_io.rb

@@ -12,6 +12,7 @@ require 'net/http'
 require 'uri'
 require 'openssl'
 require 'string_inflection'
+require 'webmention'
 
 module Jekyll
   module WebmentionIO
@@ -98,12 +99,17 @@ module Jekyll
     
     def self.get_webmention_endpoint( uri )
       log 'info', "Looking for webmention endpoint at #{uri}"
-      return `curl -s --location "#{uri}" | grep 'rel="webmention"'`
+      endpoint = Webmention::Client.supports_webmention?( uri )
+      if ! endpoint
+        log 'info', "No webmention endpoint at #{uri}"
+      end
+      endpoint
     end
 
     def self.webmention( source, target, endpoint )
-      log 'info', "Sending webmention of #{source} to #{endpoint}"
-      return `curl -s -i -d \"source=#{source}&target=#{target}\" -o /dev/null #{endpoint}`
+      log 'info', "Sending webmention of #{target} in #{source} to #{endpoint}"
+      #return `curl -s -i -d \"source=#{source}&target=#{target}\" -o /dev/null #{endpoint}`
+      return Webmention::Client.send_mention( endpoint, source, target, true )
     end
 
     # Utilities

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: webmention
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement