jekyll-activity-pub 0.1.0rc6 → 0.1.0rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0432f12fa7b080bf6e5f77478fabe7c01a6919c77d1eeab8cf372bc6b1f1d417
-  data.tar.gz: 1c3f751d9a0697390c080b32a7442bea666358f263587984917bb4cd63152ec2
+  metadata.gz: c3f40efde2e6c8e1756d287e7eba3dbc53ac5010024ca07334658080b245b8e8
+  data.tar.gz: 3cb0fb8eff21b13fdc2c56fb0ec62cc75d169927f0a946c090a53f748f3f13d3
 SHA512:
-  metadata.gz: 0c281f24d8c8a64cf66cf73603f875d7559c33e8a1f25d194dc109aa413b2a2fb71418ee551ec7b2cb54df7a5e39631c23d3143ebe75bcb37ed586346195672e
-  data.tar.gz: 26e16bf662476a96f34ec496a41de3d0bea267bd2b6016713608d055574487d274101d220ab9169d0da9031f5a3adad5919bcefaac86a6f9525d1fa4a2d21701
+  metadata.gz: 746d7a0037cf21fa1e3d0fb3e9c3e9a6494f80b74e4f4aee2e2fdbd771f11d9feb70fd3af04fa804142bdb38486a27f61adc04c2de169ee056f9e9143fd9c00c
+  data.tar.gz: 72a6457cbdfa9b2fb81a70c41b061e286a220f4d00d100d398a952dc52a269b15c5c47b77ce9ad13a7aea8506d87d35b4ee79b25c027db5e139483617bb12847

data/lib/jekyll/activity_pub/helper.rb

@@ -30,6 +30,16 @@ module Jekyll
         false
       end
 
+      # Avoid
+      def render_with_liquid?
+        false
+      end
+
+      # Avoid
+      def place_in_layout?
+        false
+      end
+
       # Trigger hooks
       #
       # @param :hook_name [Symbol]

data/lib/jekyll/activity_pub/notifier.rb

@@ -16,8 +16,12 @@ module Jekyll
     # Needs to be a singleton so we can use the same data across all of
     # Jekyll's build process.
     class Notifier
-      # An struct that responds to a #url method
-      PseudoObject = Struct.new(:url, :data, keyword_init: true)
+      # An struct that behaves like a page
+      PseudoObject = Struct.new(:url, :data, :site, :relative_path, keyword_init: true) do
+        def destination(_)
+          site.in_dest_dir(relative_path)
+        end
+      end
 
       class << self
         # Set the site and initialize data
@@ -118,7 +122,7 @@ module Jekyll
           end.each do |object_url, status|
             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 || {})
+            object = PseudoObject.new(url: object_url, site: site, relative_path: object_url, data: data || {})
             process_object(outbox_endpoint, actor_object, object, status)
           end
 

data/lib/jekyll/activity_pub/ordered_collection.rb

@@ -34,33 +34,44 @@ module Jekyll
         }
       end
 
-      alias original_content content
+      # Sort items
+      #
+      # @return [nil]
+      def order_items!
+        data['orderedItems'].sort! do |a, b|
+          b.data['published'] <=> a.data['published']
+        end
+
+        nil
+      end
+
+      # Turn items to URLs
+      #
+      # @return [nil]
+      def items_to_links!
+        data['orderedItems'] = data['orderedItems'].map do |item|
+          item.data['id']
+        end
+
+        nil
+      end
 
       # Paginates the collection if it has too many activities
       #
-      # @return [String]
-      def content
-        @content ||=
-          begin
-            order_items!
-            items_to_links!
+      # @return [nil]
+      def paginate!
+        return if always_paginate? || paginable?
+        return if data['orderedItems'].empty?
 
-            if !always_paginate? || !paginable?
-              original_content
-            elsif data['orderedItems'].empty?
-              original_content
-            else
-              paged_data = data.dup
-              pages = paginate(paged_data.delete('orderedItems'))
+        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
-            end
-          end
+        nil
       end
 
       private
@@ -127,21 +138,6 @@ module Jekyll
 
         nil
       end
-
-      # Sort items
-      #
-      # @return [nil]
-      def order_items!
-        data['orderedItems'].sort! do |a, b|
-          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.rb

@@ -104,3 +104,12 @@ Jekyll::Hooks.register(:site, :post_write, priority: :low) do |site|
 
   Jekyll::ActivityPub::Notifier.save
 end
+
+# Paginate the outbox if needed
+Jekyll::Hooks.register(:outbox, :pre_render) do |outbox|
+  next if site.config['activity_pub_disable']
+
+  outbox.order_items!
+  outbox.items_to_links!
+  outbox.paginate!
+end

metadata

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