jekyll-activity-pub 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e61984240bfd3db494bd595ba46d733ac9449eea47c6f822f772e8f3745fd1f
-  data.tar.gz: 245acdaf13711a3529dc8b9f5bccfb92e42a717cb0da43970d97409df9e8b7b6
+  metadata.gz: 9694a2d1df46c23e5c6ca51bfa88fb80a7df0709014be6fc0d48cae3e3e4cc6f
+  data.tar.gz: 3f844b85c3e200db65e7d1de6cfd25ee59b8450b18bad191bd4036731443e1ee
 SHA512:
-  metadata.gz: c6069172361e462639d19b64f2554659b13cd3c9fa58765dcc750b72e0c01761ee30bfd8655f0da8d79c85873481096ca2fb99e713f9b8794c5345a4866246d3
-  data.tar.gz: 16e3b5e5ae50c6fbf3487f904acdb9e2b0f3f5e93f3ac942cb5209aaa5dd0275ebccb821205c6e3c118d5349ad55d824b7ce71d2c0b91b312a4d1155d22ac1f7
+  metadata.gz: 95cfe56875a41b933d99cecc6788cb44823bad551e88ac152ad6c5bb3d33742945be3b14d75ac4f4e23bc85d961c8b97bb27663ebf10da4c36b0dfd3c1d279c1
+  data.tar.gz: f44349daeaed27d6e7d8ac8ff53a55a5b5925b635ca40785a156a1a58d83de4e7b65844d202e7d4138ff9046680863b1bb314855d70f7452247f2a5707f86336

data/lib/jekyll/activity_pub/helper.rb

@@ -16,6 +16,15 @@ module Jekyll
       # Some filters needs a Liquid-like context
       StubContext = Struct.new(:registers, keyword_init: true)
 
+      # Removes empty values from data
+      #
+      # @return [Hash]
+      def pruned_data
+        data.reject do |_, v|
+          v.nil? || (v.respond_to?(:empty?) && v.empty?)
+        end
+      end
+
       # Renders the data hash as a stringified JSON
       #
       # @return [String]
@@ -188,12 +197,6 @@ module Jekyll
 
         absolute_url url
       end
-
-      def pruned_data
-        data.reject do |_, v|
-          v.nil? || (v.respond_to?(:empty?) && v.empty?)
-        end
-      end
     end
   end
 end

data/lib/jekyll-activity-pub-fep-fffd-distributed-press.rb

@@ -6,8 +6,9 @@
 # Priority is low so it's the last thing we do.  If you need to modify
 # the original activities after this plugins runs, use priority 0.
 #
-# The hook runs on pre render so we can add the extra pages.
-Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
+# The hook runs on post render so we can add the extra pages after
+# activity generation but before write.
+Jekyll::Hooks.register :site, :post_render, priority: 1 do |site|
   require 'jekyll/activity_pub/link'
 
   # Changes the URLs from a base URL to have a different scheme
@@ -49,7 +50,6 @@ Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
   site.pages.each do |page|
     case page
     when Jekyll::ActivityPub::Activity, Jekyll::ActivityPub::Actor
-      site = page.site
       uri = Addressable::URI.parse page.data['id']
       url = [ Jekyll::ActivityPub::Link.new(site, page.data['url'], 'canonical', 'text/html') ]
 
@@ -62,9 +62,8 @@ Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
       end
 
       %w[ipns hyper bittorrent].each do |protocol|
-        json = convert_uris(page.data, site.config['url'], protocol).reject do |_, v|
-          v.nil? || (v.respond_to?(:empty?) && v.empty?)
-        end
+        json = convert_uris(page.pruned_data, site.config['url'], protocol)
+        json['url'] = url
 
         uri  = Addressable::URI.parse(json['id'])
         uri.path = uri.path.sub('.jsonld', ".#{protocol}.jsonld")
@@ -74,9 +73,14 @@ Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
         Jekyll::PageWithoutAFile.new(site, site.source, File.dirname(path), File.basename(path)).tap do |alternate|
           site.pages << alternate
 
-          alternate.content = json.to_json
+          alternate.output = alternate.content = json.to_json
         end
       end
+
+      page.data['url'] = url
+      page.output = page.content
+
+      Jekyll.logger.info 'FEP fffd:', 'Generated'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client