jekyll-activity-pub 0.1.0rc3 → 0.1.0rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26bac0ac36c0c773eb36472016d30d6216f88ada00d9b8e1fe95724aad71d0ee
-  data.tar.gz: 0b4a434b6822dce44b84e1686046a955f2a7bdc3dabc21c434ffe2d56ee14c21
+  metadata.gz: d66addf28845d3eab9189a74b092bd617d4b82cc96810ad7f22494c5b0a159de
+  data.tar.gz: 025d2cd2f35f9295219106e87bf63008d782e247f9fbe7d0d61f44091ee8d6aa
 SHA512:
-  metadata.gz: c333f4bb7280710d5083fb09daabf4dd1dd84115a06859bdf4510c19dc7c63ee1a338cd0f1e80846388d3fde0468c33dfb358aa4987021259da645e9faa5893f
-  data.tar.gz: abb2a481fb1371adca065370b66d56e9eccc71a43bfba2e73edde42c24dfddf85aca633a08e7e1e5a0b52ed58ab75561b567aa05bbd49d6985a23c63ae4a13f0
+  metadata.gz: 9bbf3bbae9a7499a3d5c981026d75d7f2ab4288d399355dbf98cff5dc49bf23302d578cc3f961867b2e00e80ea88b630203ecc26e8bfafa4690bb99981d3915a
+  data.tar.gz: c23fb0af3b4ecd6df91fb4f42b121fd52dff0370d11816df272c5e994b53e2608f4cb09a13edf952f8c6cd190f1685bc27526475279766bafc0c22b855ed923b

data/lib/jekyll/activity_pub/create.rb

@@ -1,14 +1,19 @@
 # frozen_string_literal: true
 
+require 'jekyll/page'
 require_relative 'helper'
 
 module Jekyll
   module ActivityPub
     # Represents a Create activity
-    class Create
+    class Create < Jekyll::Page
       include Helper
 
-      attr_reader :data
+      # @param :object [Jekyll::ActivityPub::Activity]
+      attr_reader :object
+
+      # @param :actor [Jekyll::ActivityPub::Actor]
+      attr_reader :actor
 
       # Initialize with default data
       #
@@ -17,10 +22,26 @@ module Jekyll
       # @param :object [Jekyll::ActivityPub::Activity]
       def initialize(site, actor, object)
         @context = StubContext.new(registers: { site: site })
+        @object = object
+        @actor = actor
 
+        dest = Pathname.new(object.destination(site.dest)).relative_path_from(site.dest)
+        name = "#{type.downcase}.jsonld"
+        dir = File.join(
+          File.dirname(dest),
+          File.basename(dest, '.jsonld')
+        )
+
+        super(site, '', dir, name)
+
+        trigger_hooks :post_init
+      end
+
+      def read_yaml(*)
         @data = {
           '@context' => 'https://www.w3.org/ns/activitystreams',
-          'type' => 'Create',
+          'type' => type,
+          'id' => absolute_url(url),
           'actor' => absolute_url(actor.url),
           'published' => object.data['published'],
           'to' => object.data['to'],
@@ -28,8 +49,12 @@ module Jekyll
           'object' => absolute_url(object.url),
           'inReplyTo' => object.data['in_reply_to']
         }
+      end
 
-        trigger_hooks :post_init
+      private
+
+      def type
+        @type ||= self.class.name.split('::').last
       end
     end
   end

data/lib/jekyll/activity_pub/delete.rb

@@ -1,9 +1,15 @@
 # frozen_string_literal: true
 
+require_relative 'helper'
+
 module Jekyll
   module ActivityPub
     # Represents a Delete activity
     class Delete
+      include Helper
+
+      attr_reader :data
+
       # Initialize with default data
       #
       # @param :site [Jekyll::Site]
@@ -14,6 +20,7 @@ module Jekyll
 
         @data = {
           '@context' => 'https://www.w3.org/ns/activitystreams',
+          'id' => absolute_url(object.url).sub('.jsonld', '/delete.jsonld'),
           'type' => 'Delete',
           'actor' => absolute_url(actor.url),
           'object' => absolute_url(object.url)

data/lib/jekyll/activity_pub/helper.rb

@@ -15,12 +15,12 @@ module Jekyll
       #
       # @return [String]
       def content
-        data.to_json
+        pruned_data.to_json
       end
 
       # JSONify this object
       def to_json(*args)
-        data.to_json(*args)
+        pruned_data.to_json(*args)
       end
 
       # There's no excerpt to be generated
@@ -153,6 +153,12 @@ 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/notifier.rb

@@ -108,10 +108,12 @@ module Jekyll
           end
 
           # Remove notifications already performed and notify
-          data['notifications'].reject do |object_url, status|
-            done? object_url, status
+          data['notifications'].reject do |object_url, _|
+            done? object_url
           end.each do |object_url, status|
-            object = PseudoObject.new(url: object_url, data: JSON.parse(File.read(site.in_dest_dir(object_url))))
+            path = site.in_dest_dir(object_url)
+            data = JSON.parse(File.read(path)) if File.exist? path
+            object = PseudoObject.new(url: object_url, data: data || {})
             process_object(outbox_endpoint, actor_object, object, status)
           end
 
@@ -134,34 +136,72 @@ module Jekyll
         # Removes an activity if it was previously created
         #
         # @param :path [String]
-        # @return [Hash]
+        # @return [nil]
         def delete(path)
-          action(path, 'delete') if exist? path
+          action(path, 'delete') if exist?(path) && !deleted?(path)
         end
 
         # Updates an activity if it was previously created, otherwise
         # create it
         #
         # @param :path [String]
-        # @return [Hash]
+        # @return [nil]
         def update(path)
-          action(path, exist?(path) ? 'update' : 'create')
+          if created?(path)
+            action(path, 'update')
+          else
+            create(path)
+          end
+
+          nil
         end
 
-        # Creates an activity
+        # Creates an activity unless it has been already created
         #
         # @param :path [String]
-        # @return [Hash]
+        # @return [nil]
         def create(path)
-          action(path, 'create')
+          action(path, 'create') unless created?(path)
+
+          nil
         end
 
-        # Check if activity existed
+        # Gets status
+        #
+        # @param :path [String]
+        # @return [Hash]
+        def status(path)
+          data['notifications'][path_relative_to_dest(path)] || {}
+        end
+
+        # Detects if an action was already done
         #
         # @param :path [String]
-        # @return [Boolean]
+        def done?(path)
+          (status(path)['action'] == 'done').tap do |done|
+            Jekyll.logger.debug('ActivityPub:', "Skipping notification for #{path}") if done
+          end
+        end
+
+        # Already created
+        #
+        # @param :path [String]
+        def created?(path)
+          !(status(path)['created_at'].nil?)
+        end
+
+        # @param :path [String]
+        def updated?(path)
+          !(status(path)['updated_at'].nil?)
+        end
+
+        # @param :path [String]
+        def deleted?(path)
+          !(status(path)['deleted_at'].nil?)
+        end
+
         def exist?(path)
-          data['notifications'].key? path_relative_to_dest(path)
+          !(status(path)['action'].nil?)
         end
 
         # Stores data back to a file and optionally commits it
@@ -176,7 +216,7 @@ module Jekyll
           File.open(path, 'w') do |f|
             f.flock(File::LOCK_EX)
             f.rewind
-            f.write(YAML.dump(data))
+            f.write(YAML.dump(data.reject { |_, v| v.empty? }))
             f.flush
             f.truncate(f.pos)
           end
@@ -253,14 +293,8 @@ module Jekyll
         # @param :path [String]
         # @return [String]
         def path_relative_to_dest(path)
-          Pathname.new(site.in_dest_dir(path)).relative_path_from(site.dest).to_s
-        end
-
-        # Detects if an action was already done
-        def done?(url, status)
-          (status['action'] == 'done').tap do |done|
-            Jekyll.logger.debug('ActivityPub:', "Skipping notification for #{url}") if done
-          end
+          @@path_relative_to_dest ||= {}
+          @@path_relative_to_dest[path] ||= Pathname.new(site.in_dest_dir(path)).relative_path_from(site.dest).to_s
         end
 
         # Turns an object into an activity and notifies outbox

data/lib/jekyll/activity_pub/ordered_collection.rb

@@ -43,19 +43,23 @@ module Jekyll
         @content ||=
           begin
             order_items!
+            items_to_links!
 
-            return original_content unless always_paginate? || paginable?
-            return original_content if data['orderedItems'].empty?
-
-            paged_data = data.dup
-            pages = paginate(paged_data.delete('orderedItems'))
+            if !always_paginate? || !paginable?
+              original_content
+            elsif data['orderedItems'].empty?
+              original_content
+            else
+              paged_data = data.dup
+              pages = paginate(paged_data.delete('orderedItems'))
 
-            assign_links! pages
+              assign_links! pages
 
-            paged_data['first'] = absolute_url(pages.first.url)
-            paged_data['last'] = absolute_url(pages.last.url)
+              paged_data['first'] = absolute_url(pages.first.url)
+              paged_data['last'] = absolute_url(pages.last.url)
 
-            paged_data.to_json
+              paged_data.to_json
+            end
           end
       end
 
@@ -132,6 +136,12 @@ module Jekyll
           b.data['published'] <=> a.data['published']
         end
       end
+
+      def items_to_links!
+        data['orderedItems'] = data['orderedItems'].map do |item|
+          item.data['id']
+        end
+      end
     end
   end
 end

data/lib/jekyll/activity_pub/update.rb

@@ -5,19 +5,6 @@ require_relative 'create'
 module Jekyll
   module ActivityPub
     # Represents an Update activity
-    class Update < Create
-      # Initialize with default data
-      #
-      # @param :site [Jekyll::Site]
-      # @param :actor [Jekyll::ActivityPub::Actor]
-      # @param :object [Jekyll::ActivityPub::Activity]
-      def initialize(site, actor, object)
-        super
-
-        data['type'] = 'Update'
-
-        trigger_hooks :post_init
-      end
-    end
+    class Update < Create; end
   end
 end

data/lib/jekyll-activity-pub.rb

@@ -14,9 +14,11 @@ Jekyll::Hooks.register :site, :post_read, priority: :low do |site|
   begin
     private_key = File.read(site.config['activity_pub_private_key'])
   rescue StandardError
-    Jekyll.logger.warn 'ActivityPub:', 'There\'s an issue with your private key'
+    Jekyll.logger.warn 'ActivityPub:', 'There\'s an issue with your private key, skipping generation'
 
-    raise
+    site.config['activity_pub_disable'] = true
+
+    next
   end
 
   # We only need the public key at this point
@@ -42,15 +44,24 @@ end
 # Generate an activity for each document after the content has been
 # rendered as HTML.
 Jekyll::Hooks.register(:documents, :post_convert, priority: :high) do |doc|
+  next if site.config['activity_pub_disable']
   next unless doc.write?
   next if doc.data['sitemap'] == false
   next if doc.data['activity'] == false
 
   site = doc.site
-  dir = File.dirname(doc.url)
-  name = "#{File.basename(doc.url, '.html')}.jsonld"
   actor = site.config['actor']
   outbox = site.config['outbox']
+  dest = doc.destination(site.dest)
+  dir = Pathname.new(File.dirname(dest)).relative_path_from(site.dest).to_s
+
+  # /slug/ => /slug.jsonld
+  if (n = File.basename(dest, '.html')) == 'index'
+    name = "#{File.basename(dir)}.jsonld"
+    dir = File.dirname(dir)
+  else
+    name = "#{n}.jsonld"
+  end
 
   Jekyll::ActivityPub::Activity.new(site, actor, doc, nil, dir, name).tap do |activity|
     doc.data['activity'] = activity
@@ -70,6 +81,7 @@ Jekyll::Hooks.register(:documents, :post_convert, priority: :high) do |doc|
 
       outbox.data['totalItems'] += 1
       outbox.data['orderedItems'] << action
+      site.pages << action
     end
 
     site.pages << activity
@@ -78,6 +90,8 @@ end
 
 # This hook is shit because we don't have access to the site!
 Jekyll::Hooks.register(:clean, :on_obsolete, priority: :low) do |list|
+  next if site.config['activity_pub_disable']
+
   list.each do |path|
     Jekyll::ActivityPub::Notifier.delete path
   end
@@ -86,5 +100,7 @@ end
 # Store data generated between builds and commits if
 # jekyll-write-and-commit-changes is enabled.
 Jekyll::Hooks.register(:site, :post_write, priority: :low) do |_|
+  next if site.config['activity_pub_disable']
+
   Jekyll::ActivityPub::Notifier.save
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc3
+  version: 0.1.0rc4
 platform: ruby
 authors:
 - Sutty