jekyll-activity-pub 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b6801d86becb5ee13ad13e9f46f50e54670d8c4fb77483b6f387efdec5657a
-  data.tar.gz: 8e7461bfc3508ebf9cde56f67c2b5b4967da5f15dd0586308a2b4b8b37fa326d
+  metadata.gz: 9b0dd7df568e8344f4d9c0c3e41cfe2cf3a2384737800d0c3b3b5120f447ed63
+  data.tar.gz: 8974b30de62eda46a8aa375a04f4a037ce81741f8a99181003823726c1076f10
 SHA512:
-  metadata.gz: 26952a76b93dd2483926672ee6360a81562d7af097d5516949d3229f4c869e283f4a1939bf4fb1f6ec28a213b946a6f93f07ad7bd8c8d8f4451cd465e31dcd35
-  data.tar.gz: e33538ae2ef792e5d1405658ac2a936e869e6d1adca347b53dd0d00b2da6fab0ac38257353628c75c3482cb1405b7910f5071c3af0c732d1c043d59f65c1e025
+  metadata.gz: dd1358be16b0324bd309e13c8c98d69166a3991025139f0929e2103ab63d2a914287a3bccec89c85ff3eb556932c63dd4150b68ee259114095f3a4f01477f949
+  data.tar.gz: 79a769c926dbf3dc4f6371da235e9d2b06dde561f80ececcb8ce54789e343603f04d7d9e3f852c8a219e9694af1b730eab3a5d22c8b66e6a02f5112b799394db

data/lib/jekyll-activity-pub-fep-1042.rb

@@ -16,6 +16,19 @@ Jekyll::Hooks.register %i[actor activity], :post_init, priority: 8 do |page|
 
   site = page.site
 
+  # @param uri [URI,Addressable::URI]
+  # @param protocol [String]
+  # @return [URI,Addressable::URI]
+  def add_protocol_to_uri(uri, protocol)
+    uri.scheme = protocol
+
+    if protocol != 'https' && uri.path.end_with?('.jsonld')
+      uri.path = uri.path.sub('.jsonld', ".#{protocol}.jsonld")
+    end
+
+    uri
+  end
+
   # Changes the URLs from a base URL to have a different scheme
   #
   # @param object [Any]
@@ -33,9 +46,7 @@ Jekyll::Hooks.register %i[actor activity], :post_init, priority: 8 do |page|
       end
     when String
       if object.start_with? base_url
-        Addressable::URI.parse(object).tap do |uri|
-          uri.scheme = scheme
-        end.to_s
+        add_protocol_to_uri(Addressable::URI.parse(object), scheme).to_s
       else
         object
       end
@@ -52,24 +63,30 @@ Jekyll::Hooks.register %i[actor activity], :post_init, priority: 8 do |page|
     end
   end
 
-  uri = Addressable::URI.parse page.data['id']
   url = page.data['url']
+  formats = ['application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'application/activity+json']
+  data = page.pruned_data
 
+  # TODO: Fetch enabled protocols from DP API
   %w[https ipns hyper bittorrent].each do |protocol|
-    uri.scheme = protocol
-    url <<
-      Jekyll::ActivityPub::Link.new(site, uri.to_s, 'alternate', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"')
-    url <<
-      Jekyll::ActivityPub::Link.new(site, uri.to_s, 'alternate', 'application/activity+json')
+    uri = Addressable::URI.parse(page.data['id'])
+    add_protocol_to_uri(uri, protocol)
+
+    formats.each do |format|
+      url << Jekyll::ActivityPub::Link.new(site, uri.to_s, 'alternate', format)
+    end
   end
 
   %w[ipns hyper bittorrent].each do |protocol|
-    json = convert_uris(page.pruned_data, site.config['url'], protocol)
-    json['url'] = url
+    uri = Addressable::URI.parse(page.data['id'])
+    add_protocol_to_uri(uri, protocol)
 
-    uri = Addressable::URI.parse(json['id'])
-    uri.path = uri.path.sub('.jsonld', ".#{protocol}.jsonld")
+    Jekyll.logger.debug 'FEP 1042:', "Generating #{uri.path} (#{protocol})"
+
+    json = convert_uris(data, site.config['url'], protocol)
+    json['url'] = url
     json['id'] = uri.to_s
+
     # XXX: Only works on forward slash OSes
     path = uri.path.sub(%r{\A/}, '')
 

metadata

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