activitypub 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58943510abdbebb4cce7084adcd2fd5c587abed81f103db968148248a9b1e7c1
-  data.tar.gz: 5ccd6bd6cff637fdc5717d064b8b02a29282c9e6d7549c8ad322bd30a0ce2503
+  metadata.gz: 422c4769d3efddf0251d5cb9f64f92b6f4c9c72c054bed80bd2e2e4d74fb6870
+  data.tar.gz: 8d503eed716a1a54d62e654ba647415c6d9b89cfeb060bedc6dbc52a1735aaf5
 SHA512:
-  metadata.gz: 7a8b4a3a8cdac1be9d069c47b413d00573640ad59e0deca098bf0a0b5f06124bd3c2a43b66462b2f3bf23b3b187c0de55478878b875fa38674b7c53eac968b54
-  data.tar.gz: c4981e523c2754b2d83c9cf6f52fc6de61353b3373097a55b5531f325b08c1477195ba7bac58f3ee47eb3138cb743d06c1719f61e3779a06a3f9b45112011770
+  metadata.gz: 487e02cb6426a2ac76d3ccedcea22f9fe1693b697aea51969b16d0164a1e9fdbc8233c355182e2e695b04177a4bd2e81f05cb4e25090f972a36938f6cc4260b1
+  data.tar.gz: 6ca2c9ca57226499972c51b6d9017a96ace046964d754e0a8eaa46ae5b0d6441d900c473cd16d6ed670eed3838b0181e1f7b31fb7b29d757b0324cb2d2ed066a

data/examples/get_actor.rb

@@ -30,10 +30,25 @@ puts
 
 ob = href.get
 PP.pp(ob)
+#puts ob.to_json
 puts
 puts "Enter to continue"
 gets
 
 puts "Trying to retrieve outbox"
-ob = ActivityPub::URI.new(ob.outbox).get
+ob = ob.outbox.get
 PP.pp(ob)
+puts
+puts "Enter to continue"
+gets
+
+puts
+puts "PAGE: #{ob.first}"
+ob = ob.first.get
+PP.pp(ob)
+
+# For now, this will let you iterate through the collection.
+# while ob && ob.orderedItems.length > 0
+#   PP.pp ob.id
+#   ob = ob.next&.get
+# end

data/lib/activitypub/base.rb

@@ -22,6 +22,9 @@ module ActivityPub
 
     ob = klass ? klass.new : nil
 
+    # FIXME: Useful for debug. Add flag to allow enabling.
+    # ob.instance_variable_set("@_raw",h)
+    
     if ob
       context = h.dig("@context")
       ob.instance_variable_set("@_context", context) if context
@@ -36,8 +39,9 @@ module ActivityPub
             av.is_a?(Hash) && av["type"] ? from_hash(av) : av
           end
         end
-        if attr.to_s == "href" && v.is_a?(String)
-          v = ActivityPub::URI.new(v)
+
+        if t = klass.ap_types[attr]
+          v = t.new(v) if v
         end
         ob.instance_variable_set("@#{attr}", v) if !v.nil?
       end
@@ -55,12 +59,19 @@ module ActivityPub
 
 
     # FIXME: Allow specifying a type (e.g. URI)
-    def self.ap_attr(*names)
+    def self.ap_attr(name, type=nil)
       @ap_attributes ||= []
-      @ap_attributes.concat(names)
-      attr_accessor *names
+      @ap_attributes << name
+      @ap_types ||= {}
+      @ap_types[name] = type
+      attr_accessor name
     end
 
+    def self.ap_types
+      parent = superclass.respond_to?(:ap_types) ? superclass.ap_types : {}
+      parent.merge(@ap_types || {})
+    end
+    
     def self.ap_attributes
       parent = superclass.respond_to?(:ap_attributes) ? superclass.ap_attributes : []
       parent.concat(@ap_attributes||[])

data/lib/activitypub/types.rb

@@ -7,19 +7,57 @@ require_relative 'uri'
 module ActivityPub
 
   class Link < Base
-    ap_attr :href, :rel, :mediaType, :name, :hreflang, :height, :width, :preview
+    ap_attr :href, URI
+
+    # We don't mark "rel" as a URI as it's effectively
+    # used as an identifier for comparison rather than to
+    # dereference
+    ap_attr :rel
+
+    ap_attr :mediaType
+    ap_attr :name
+    ap_attr :hreflang
+    ap_attr :height
+    ap_attr :width
+    ap_attr :preview
   end
 
   class Object < Base
     ap_attr :id
-    ap_attr :attachment, :attributedTo, :audience, :content, :context,
-      :name, :endTime, :generator, :icon, :image, :inReplyTo, :location,
-      :preview, :published, :replies, :startTime, :summary, :tag, :updated,
-      :url, :to, :bto, :cc, :mediaType, :duration
+    ap_attr :attachment
+    ap_attr :attributedTo
+    ap_attr :audience
+    ap_attr :content
+    ap_attr :context
+    ap_attr :name
+    ap_attr :endTime
+    ap_attr :generator
+    ap_attr :icon
+    ap_attr :image
+    ap_attr :inReplyTo, URI
+    ap_attr :location
+    ap_attr :preview
+    ap_attr :published
+    ap_attr :replies
+    ap_attr :startTime
+    ap_attr :summary
+    ap_attr :tag
+    ap_attr :updated
+    ap_attr :url, URI
+    ap_attr :to
+    ap_attr :bto
+    ap_attr :cc
+    ap_attr :mediaType
+    ap_attr :duration
   end
 
   class Activity < Object
-    ap_attr :actor, :object, :target, :result, :origin, :instrument
+    ap_attr :actor
+    ap_attr :object
+    ap_attr :target
+    ap_attr :result
+    ap_attr :origin
+    ap_attr :instrument
   end
 
   # @FIXME
@@ -28,7 +66,11 @@ module ActivityPub
   end
 
   class Collection < Object
-    ap_attr :totalItems, :current, :first, :last, :items
+    ap_attr :totalItems
+    ap_attr :current
+    ap_attr :first, URI
+    ap_attr :last, URI
+    ap_attr :items
   end
 
   class OrderedCollection < Collection
@@ -42,10 +84,18 @@ module ActivityPub
   end
 
   class CollectionPage < Collection
-    ap_attr :partOf, :next, :prev
+    ap_attr :partOf, URI
+    ap_attr :next, URI
+    ap_attr :prev, URI
   end
-  
-  class OrderedCollectionPage < CollectionPage
+
+  # FIXME: OrderedCollectionPage inherits both CollectionPage and
+  # OrderedCollection.
+  #
+  class OrderedCollectionPage < OrderedCollection
+    ap_attr :partOf, URI
+    ap_attr :next, URI
+    ap_attr :prev, URI
     ap_attr :startIndex
   end
 
@@ -130,7 +180,9 @@ module ActivityPub
   end
 
   class Question < IntransitiveActivity
-    ap_attr :oneOf, :anyOf, :closed
+    ap_attr :oneOf
+    ap_attr :anyOf
+    ap_attr :closed
   end
 
   # ## Actor Types
@@ -144,20 +196,27 @@ module ActivityPub
     # Section 4.1
 
     # MUST have:
-    ap_attr :inbox, :outbox
+    ap_attr :inbox, URI
+    ap_attr :outbox, URI
 
     # SHOULD have:
-    ap_attr :following, :followers
+    ap_attr :following
+    ap_attr :followers
     
     # MAY have:
-    ap_attr :liked, :streams, :preferredUsername,
-      :endpoints
+    ap_attr :liked
+    ap_attr :streams
+    ap_attr :preferredUsername
+    ap_attr :endpoints
 
 
     # Per https://docs-p.joinmastodon.org/spec/activitypub/#extensions
     # These are extensions used by Mastodon for Actor types
-    ap_attr :publicKey, :featured, :featuredTags,
-      :discoverable, :suspended
+    ap_attr :publicKey
+    ap_attr :featured
+    ap_attr :featuredTags
+    ap_attr :discoverable
+    ap_attr :suspended
   end
 
   # FIXME: Add "toot:Emoji
@@ -173,7 +232,9 @@ module ActivityPub
 
     # Mastodon extension per
     # https://docs-p.joinmastodon.org/spec/activitypub/#extensions
-    ap_attr :likes, :bookmarks, :manuallyApprovesFollowers
+    ap_attr :likes
+    ap_attr :bookmarks
+    ap_attr :manuallyApprovesFollowers
   end
 
   class Service < Actor
@@ -183,7 +244,9 @@ module ActivityPub
   # ## Object types
 
   class Relationship < Object
-    ap_attr :subject, :object, :relationship
+    ap_attr :subject
+    ap_attr :object
+    ap_attr :relationship
   end
 
   class Article < Object
@@ -199,7 +262,8 @@ module ActivityPub
     
     # Mastodon extension per
     # https://docs-p.joinmastodon.org/spec/activitypub/#extensions
-    ap_attr :focalPoint, :blurhash
+    ap_attr :focalPoint
+    ap_attr :blurhash
   end
 
   class Video < Document
@@ -224,7 +288,8 @@ module ActivityPub
   end
 
   class Tombstone < Object
-    ap_attr :formerType, :deleted
+    ap_attr :formerType
+    ap_attr :deleted
   end
 
   # Mastodon extensions

data/lib/activitypub/uri.rb

@@ -9,7 +9,7 @@ module ActivityPub
     end
 
     def to_s = @href
-    def to_json = @href
+    def to_json(...) = @href
 
     def get
       response = Faraday.get(self.to_s, {}, {"Accept": "application/activity+json"})

data/lib/activitypub/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActivityPub
-  VERSION = "0.3.7"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activitypub
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.1
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webfinger