jekyll-activity-pub 0.1.0rc13 → 0.1.0rc14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1484d32011db73dd1d0db605244a6ac077f0820aa4ef0b2c78111a210f0c04
-  data.tar.gz: 17841d449364d36b5b8a78377234b0215aa09951797776c51a8fd4835142c758
+  metadata.gz: aaea38dc037b09e85e37555dfcf89e0f974107a0699a600d9c2f8f5f031f6a72
+  data.tar.gz: fef291e74969a128d2ed950ea9a0f2fda5fc93b5fc45fa851ea8b6f07d15aed9
 SHA512:
-  metadata.gz: 1ec20c6425542d0b83a2e995dcf38e3d9196728fcb5358e782ee66f23ba26aa625ab1523bd9235eebb2684cc1548912f9dd3a24ceac6ec30660fd0664969fac2
-  data.tar.gz: 8ec390af344d3e4f7558119a00e153c194029206af5c6b431282f2af1d73de22eeeafa6001757ebd368a8d0c5433753df7e09a8596de75b03915a1fca9a0cf2f
+  metadata.gz: e27745239477eef2a66b1d0dee32af27b4e58219d381e5720abf0d158a38ea31a3e113a9b812b40b4faadbfed48925e0e242c7012d9c4cd428fd725e77f18f07
+  data.tar.gz: ee3dff54f5c6f549286bc3009063d99513a2d2fc73ffaec6d188f9988866d1c15135dc8662ca0cc1a4b9d9dfc4891546a9391bec7e579ef88481e4f6e6f64176

data/lib/jekyll/activity_pub/notifier.rb

@@ -53,14 +53,20 @@ module Jekyll
           @@site
         end
 
+        def url
+          config['url'].tap do |u|
+            abort_if_missing('activity_pub.url', u, '_config.yml')
+          end
+        end
+
         # @return [String]
         def followers_url
-          "#{config['url']}/v1/#{actor}/followers"
+          "#{url}/v1/#{actor}/followers"
         end
 
         # @return [String]
         def following_url
-          "#{config['url']}/v1/#{actor}/following"
+          "#{url}/v1/#{actor}/following"
         end
 
         # Save the public key URL for later
@@ -70,11 +76,13 @@ module Jekyll
           data['public_key_url'] = url
         end
 
-        # Public key URL
+        # Public key URL, raises error if missing
         #
-        # @return [String,nil]
+        # @return [String]
         def public_key_url
-          data['public_key_url']
+          data['public_key_url'].tap do |pk|
+            abort_if_missing('public_key_url', pk)
+          end
         end
 
         def actor=(actor)
@@ -82,7 +90,9 @@ module Jekyll
         end
 
         def actor
-          data['actor']
+          data['actor'].tap do |a|
+            abort_if_missing('actor', a)
+          end
         end
 
         def actor_url=(url)
@@ -90,7 +100,9 @@ module Jekyll
         end
 
         def actor_url
-          data['actor_url']
+          data['actor_url'].tap do |au|
+            abort_if_missing('actor_url', au)
+          end
         end
 
         # Send notifications
@@ -148,6 +160,8 @@ module Jekyll
 
           # Store everything for later
           save
+        rescue NotificationError => e
+          Jekyll.logger.abort_with 'ActivityPub:', e.message
         end
 
         # Return data
@@ -274,7 +288,9 @@ module Jekyll
         #
         # @return [String, nil]
         def private_key_path
-          @@private_key_path ||= site.config['activity_pub_private_key']
+          @@private_key_path ||= site.config['activity_pub_private_key'].tap do |pk|
+            abort_if_missing '--key', pk, 'notify command'
+          end
         end
 
         # Returns the private key
@@ -283,8 +299,7 @@ module Jekyll
         def private_key
           @@private_key ||= File.read private_key_path
         rescue StandardError
-          Jekyll.logger.warn 'ActivityPub:', 'There\'s an issue with your private key'
-          raise
+          Jekyll.logger.abort_with 'ActivityPub:', 'There\'s an issue with your private key'
         end
 
         # @return [Hash]
@@ -295,7 +310,7 @@ module Jekyll
         def client
           @@client ||= DistributedPress::V1::Social::Client.new(
             private_key_pem: private_key,
-            url: config['url'],
+            url: url,
             public_key_url: public_key_url,
             logger: Jekyll.logger
           )
@@ -361,6 +376,12 @@ module Jekyll
               PseudoObject.new(url: rel, site: site, relative_path: rel, data: data)
             end
         end
+
+        def abort_if_missing(key_name, value, file = '_data/activity_pub.yml')
+          return unless value.nil? || value.empty?
+
+          Jekyll.logger.abort_with 'ActivityPub:', "Missing #{key_name} in #{file}"
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc13
+  version: 0.1.0rc14
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client
@@ -143,7 +143,6 @@ files:
 - lib/jekyll/activity_pub.rb
 - lib/jekyll/activity_pub/activity.rb
 - lib/jekyll/activity_pub/actor.rb
-- lib/jekyll/activity_pub/cache.rb
 - lib/jekyll/activity_pub/commands.rb
 - lib/jekyll/activity_pub/create.rb
 - lib/jekyll/activity_pub/delete.rb
@@ -158,7 +157,6 @@ files:
 - lib/jekyll/activity_pub/outbox.rb
 - lib/jekyll/activity_pub/property_value.rb
 - lib/jekyll/activity_pub/public_key.rb
-- lib/jekyll/activity_pub/tomsbtone.rb
 - lib/jekyll/activity_pub/update.rb
 - lib/jekyll/activity_pub/webfinger.rb
 - lib/jekyll/command_extension.rb

data/lib/jekyll/activity_pub/cache.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'jekyll/cache'
-
-module Jekyll
-  module ActivityPub
-    class Cache < Jekyll::Cache
-    end
-  end
-end

data/lib/jekyll/activity_pub/tomsbtone.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'jekyll/page'
-require_relative 'helper'
-
-module Jekyll
-  module ActivityPub
-    # Represents a removed activity
-    class Tombstone < Jekyll::Page
-      include Helper
-
-      # @param :object_id [String]
-      attr_reader :object_id
-
-      # Initialize with default data
-      #
-      # @param :site [Jekyll::Site]
-      # @param :object_id [String]
-      def initialize(site, object_id, )
-        @context = StubContext.new(registers: { site: site })
-        @object_id = object_id
-
-        dest = Pathname.new(object.destination(site.dest)).relative_path_from(site.dest)
-        name = 'tombstone.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' => 'Tomsbtone',
-          'id' => absolute_url(object_id),
-          'published' => object.data[DATE_ATTRIBUTE],
-          'to' => object.data['to'],
-          'cc' => object.data['cc'],
-          'object' => object.data,
-          'inReplyTo' => object.data['in_reply_to']
-        }
-      end
-
-      # @return [Time]
-      def date
-        @date ||= Time.parse(object.data[DATE_ATTRIBUTE])
-      end
-
-      private
-
-      def type
-        @type ||= self.class.name.split('::').last
-      end
-    end
-  end
-end
-