jekyll-webmention_io 2.3.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c117bdfd999aabbbaf34a7baa34510806ec30250
-  data.tar.gz: df0874f2a17993d0fc40fc8d826b1fe7f64c3cb6
+  metadata.gz: 02faf38bb1fff4fb2fdb3e3274bbef6a97374912
+  data.tar.gz: 4f15f2fc0a505a8cabed08d870dd03cfb434add7
 SHA512:
-  metadata.gz: 90bac1c91f4c780eb9ad39ee4eec4dad12272797bd8d00ec3e7924c670449450281b0e6b2970877202ca8d9b9fc490ae4426f207aee29b552fb291817434d069
-  data.tar.gz: 89524277af525e270403ed3f9e57cfa966e72348fbb61971d44f435ba362d4fedd8c711ce4b529f1636762d46f8c89d17d699e94b512a58f8f4972c49261dec6
+  metadata.gz: a99c35424a946da6fd8eaed7c00311bab66787f970c9f91d0c79c466bd4f6b3bc7a0816bb8288f3ef467fead2a8ae8613e2dde9a47c34b13d34133d6026e40c6
+  data.tar.gz: 4556763d36bea886bd93df5f6f8ba8516a83f5920ed2dad23a0add451bb8cce68120afd911d4b74e208b9677936e692d658f1cf8562718ff0fead673a1b3bc7b

data/lib/jekyll/commands/webmention.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Jekyll
   module Commands
     class WebmentionCommand < Command
@@ -11,21 +13,16 @@ module Jekyll
       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.'
+        end
+        count = 0
         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 )
+          outgoing.each do |source, targets|
+            targets.each do |target, response|
+              if response === false
                 if target.index( "//" ) == 0
                   target  = "http:#{target}"
                 end
@@ -33,13 +30,17 @@ module Jekyll
                 if endpoint
                   response = Jekyll::WebmentionIO::webmention( source, target, endpoint )
                   if response
-                    sent[source].push( target )
+                    outgoing[source][target] = JSON.parse response.body
+                    count += 1
                   end
                 end
               end
             end
           end
-          File.open(cached_sent, 'w') { |f| YAML.dump(sent, f) }
+          if count > 0
+            File.open(cached_outgoing, 'w') { |f| YAML.dump(outgoing, f) }
+          end
+          Jekyll::WebmentionIO::log 'info', "#{count} webmentions sent."
         end # file exists (outgoing)
       end # def process
     end # WebmentionCommand

data/lib/jekyll/generators/gather_webmentions.rb

@@ -24,11 +24,7 @@ module Jekyll
       Jekyll::WebmentionIO::set_api_suffix('&perPage=9999')
 
       cache_file = Jekyll::WebmentionIO::get_cache_file_path 'incoming'
-      if File.exists?(cache_file)
-        @cached_webmentions = open(cache_file) { |f| YAML.load(f) }
-      else
-        @cached_webmentions = {}
-      end
+      @cached_webmentions = open(cache_file) { |f| YAML.load(f) }
       
       if Jekyll::VERSION >= "3.0.0"
         posts = site.posts.docs
@@ -48,11 +44,19 @@ module Jekyll
       posts.each do |post|
         # Gather the URLs
         targets = get_webmention_target_urls(site, post)
+
+        # Get the last id we have in the hash
+        since_id = false
+        if @cached_webmentions.has_key? post.url
+          past_webmentions = @cached_webmentions[post.url]
+          since_id = past_webmentions[past_webmentions.keys.last]['raw']['id']
+        end
         
         # execute the API
         api_params = targets.collect { |v| "target[]=#{v}" }.join('&')
+        api_params << "&since_id=#{since_id}" if since_id
         response = Jekyll::WebmentionIO::get_response(api_params)
-        # @webmention_io.log 'info', response.inspect
+        # Jekyll::WebmentionIO::log 'info', response.inspect
         
         process_webmentions( post.url, response )
       end # posts loop
@@ -157,8 +161,8 @@ module Jekyll
           # 	webmentions[the_date] = {}
           # end
 
-          # Make sure we have the webmention
-          if ! webmentions.has_key? id
+          # Make sure we don’t have the webmention
+          unless webmentions.has_key? id
             
             # Scaffold the webmention
             webmention = {
@@ -237,7 +241,7 @@ module Jekyll
             # @webmention_io.log 'info', webmention.inspect
             webmentions[id] = webmention
 
-          end # if ID does not exist
+          end # Make sure we don’t have the webmention
         
         end # each link
 

data/lib/jekyll/generators/queue_webmentions.rb

@@ -12,44 +12,82 @@ module Jekyll
     priority :low
     
     def generate(site)
-			if site.config['webmentions']['pause_lookups'] == true
-				Jekyll::WebmentionIO::log 'info', 'Webmention lookups are currently paused.'
-				return
-			end
+      if site.config['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.'
 
-      webmentions = {}
+      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 = site.posts.docs
+      else
+        posts = site.posts
+      end
+        
       posts.each do |post|
         uri = "#{site.config['url']}#{post.url}"
-        webmentions[uri] = get_mentioned_uris(post)
+        mentions = get_mentioned_uris(post)
+        if webmentions.has_key? uri
+          mentions.each do |mentioned_uri, response|
+            unless webmentions[uri].has_key? mentioned_uri
+              webmentions[uri][mentioned_uri] = response
+            end
+          end
+        else
+          webmentions[uri] = mentions
+        end
       end
 
-			cache_file = Jekyll::WebmentionIO::get_cache_file_path 'outgoing'
+      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
+        return
+      end
+      sent_webmentions = open(old_sent_file) { |f| YAML.load(f) }
+      outgoing_webmentions = open(old_outgoing_file) { |f| YAML.load(f) }
+      merged = {}
+      outgoing_webmentions.each do |source_url, webmentions|
+        collection = {}
+        webmentions.each do |target_url|
+          if sent_webmentions.has_key? source_url and sent_webmentions[source_url].include? target_url
+            collection[target_url] = ""
+          else
+            collection[target_url] = 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) }
+      File.delete old_sent_file, old_outgoing_file
+      Jekyll::WebmentionIO::log 'info', 'Upgraded your sent webmentions cache.'
+    end  
+
     def get_mentioned_uris(post)
-			uris = []
-			if post.data['in_reply_to']
-				uris.push(post.data['in_reply_to'])
-			end
-			post.content.scan(/(?:https?:)?\/\/[^\s)#"]+/) do |match|
-				if ! uris.find_index( match )
-					uris.push(match)
-				end
-			end
-    	return uris
-		end
+      uris = {}
+      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
+          uris[match] = false
+        end
+      end
+      return uris
+    end
     
   end
 end

data/lib/jekyll/webmention_io/version.rb

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

data/lib/jekyll/webmention_io.rb

@@ -31,17 +31,16 @@ module Jekyll
       @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.exists?(@cache_folder)
+      @file_prefix = ''
+      if ! @cache_folder.include? 'webmention'
+        @file_prefix = 'webmention_io_'
       end
       @cache_files = {
-        'incoming' => "#{cache_folder}/#{file_prefix}received.yml",
-        'outgoing' => "#{cache_folder}/#{file_prefix}queued.yml",
-        'sent'     => "#{cache_folder}/#{file_prefix}sent.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)
@@ -60,6 +59,12 @@ module Jekyll
     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
@@ -98,18 +103,24 @@ module Jekyll
     end
     
     def self.get_webmention_endpoint( uri )
-      log 'info', "Looking for webmention endpoint at #{uri}"
+      # log 'info', "Looking for webmention endpoint at #{uri}"
       endpoint = Webmention::Client.supports_webmention?( uri )
-      if ! endpoint
-        log 'info', "No webmention endpoint at #{uri}"
-      end
+      # if ! endpoint
+      #   log 'info', "No webmention endpoint at #{uri}"
+      # end
       endpoint
     end
 
     def self.webmention( source, target, endpoint )
-      log 'info', "Sending webmention of #{target} in #{source} to #{endpoint}"
+      log 'info', "Sending webmention of #{target} in #{source}"
       #return `curl -s -i -d \"source=#{source}&target=#{target}\" -o /dev/null #{endpoint}`
-      return Webmention::Client.send_mention( endpoint, source, target, true )
+      response = Webmention::Client.send_mention( endpoint, source, target, true )
+      if response
+        log 'info', "Webmention successful!"
+      else
+        log 'info', "Webmention failed, but will remain queued for next time"
+      end
+      response
     end
 
     # Utilities

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll