jekyll-webmention_io 2.6.4 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec29b9c319f23f77ea68e3c4a6853a8d01f17e1
-  data.tar.gz: b79fbe01941187bb9ee66d9cc809e3531d17147f
+  metadata.gz: 9690fa4573a7c0d2a45c5e86f9bd66ef28de2f9d
+  data.tar.gz: 0a9fab2e11ea1fe25f708cc6eb3f2ee7f4d3434f
 SHA512:
-  metadata.gz: a0092774e964689fb79b54232bcf51418e1981a1beda3be024f52c4f939424a17d67e60224061d8f943406aaa77f8d329ab2eacde4acf2e462f3436a3922cf05
-  data.tar.gz: 96ddc4cdb837916792d57058d62214a0ee1f9212e462207d29fadfb545e0456c184fdd6f8d969553697357a5331eb1c1134bef1971cbca78a31844b5b5bedd37
+  metadata.gz: 1d5b8ddd87ac116a4575a1f6e03dd897d31d9f24197b039c39a14d05462e1e2c4ffa293fbcc637f1c0408585e7b716633f8e36c2ab8e1307553cf896c11b1037
+  data.tar.gz: 8da3ba2bc5ca88e6c500a5f7da8161c9b447b3f9f00ce1f7be3d54b47694aaf4a5d32111b8aebdc1aba7609d3dfaf0cfc22adf78ff75ed93f599dc5264c0bf93

data/lib/jekyll/generators/gather_webmentions.rb

@@ -42,18 +42,24 @@ module Jekyll
       end
         
       posts.each do |post|
-        # Gather the URLs
-        targets = get_webmention_target_urls(site, post)
+        # get the last webmention
+        last_webmention = @cached_webmentions.dig( post.url,  @cached_webmentions.dig( post.url )&.keys&.last )
+        
+        # should we throttle?
+        if last_webmention && Jekyll::WebmentionIO::post_should_be_throttled?( post, post.date, last_webmention.dig( 'raw', 'verified_date' ) )
+          # Jekyll::WebmentionIO::log 'info', "Throttling #{post.url}"    
+          next
+        end
+
+        # past_webmentions.dig( past_webmentions&.keys&.last )
+        # past_webmentions[past_webmentions.keys.last]['raw']['verified_date']
 
         # 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]
-          if past_webmentions.dig( past_webmentions&.keys&.last )
-            since_id = past_webmentions[past_webmentions.keys.last]['raw']['id']
-          end
-        end
+        since_id = last_webmention ? last_webmention.dig( 'raw', 'id' ) : false
         
+        # Gather the URLs
+        targets = get_webmention_target_urls(site, post)
+
         # execute the API
         api_params = targets.collect { |v| "target[]=#{v}" }.join('&')
         api_params << "&since_id=#{since_id}" if since_id

data/lib/jekyll/webmention_io.rb

@@ -101,7 +101,64 @@ module Jekyll
         ""
       end
     end
-    
+
+    # 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' )
+      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})"
+          return true
+        end
+      end
+      return false      
+    end
+    def self.get_timeframe_from_date( time )
+      date = time.to_date
+      timeframes = {
+        '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 )
+          timeframe = key
+          break
+        end
+      end
+      if ! 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 )
+      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 )
+      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'
+      end
+      # dynamic method call
+      return today.send "prev_#{unit}", n
+    end
+
     def self.get_webmention_endpoint( uri )
       # log 'info', "Looking for webmention endpoint at #{uri}"
       begin

data/lib/jekyll/webmention_io/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module WebmentionIO
-    VERSION = "2.6.4"
+    VERSION = "2.7.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.7.0
 platform: ruby
 authors:
 - Aaron Gustafson