activitypub 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed038947b69b69a8e0571743cbf28fdfaf7131c4922bc26b1e0d47a532dd6002
-  data.tar.gz: fdda56411f0ebc9d50365eea7bb028eb8b6f718947c10a57f4a838b8201e7d50
+  metadata.gz: 1c8cae4b7204912811e11efa38d689ee0cb418c480a7e3240a70a8d4dcafd699
+  data.tar.gz: 4c732f4669c8ed60428d75b45bda5aac7ffa24e439d9fc4f8c733e51241438f3
 SHA512:
-  metadata.gz: a1339e651c59ec7d18c9b82a48b15e15c7591821276c2d8934f9c8ecd5a014bbfed57e56cc20d95627bca5ac5182d6e6ba6e10e14c36f673948fa555f3cd76b8
-  data.tar.gz: dba788189a64fff38c808db2734bd567bb25bae0ffd0db6503242f56e1edf52b299474eeab4a11bdd40fd994782ee255cada4fa68fc4fbbe23b3056ef8cd28a7
+  metadata.gz: 3f5e26e20e624d3c9ae77f66832e8ed6bee1516c84ec4cc1ef2d24f47b468c2e473ee15e4ecab7e000e910adef998870df26650aa7060753d5430dfb699c8717
+  data.tar.gz: 40cfe87f071e5b8be1e6848f86232523f206e90b8b78c25ad9be0b7aa29c7b72f3da6c64da669edc384424c1e7ea9b4b5f813a15c0b1816ee3360568ec5d40cf

data/examples/get_actor.rb

@@ -1,17 +1,14 @@
 
-require 'webfinger'
-require 'faraday'
 require 'pp'
 $: << File.expand_path(__FILE__ + "/../../lib")
-require 'activitypub/types'
-require 'activitypub/base'
+require 'activitypub'
 
 acct = ARGV.shift || "vidar@galaxybound.com"
 
 puts "Trying webfinger for #{acct} (to choose your own account, provide it as an argument)"
 puts
 
-wf = WebFinger.discover!(acct)
+wf = ActivityPub.webfinger(acct)
 if !wf
   puts "Unable to find #{acct}"
   exit(1)
@@ -22,35 +19,22 @@ puts
 puts "Enter to continue"
 gets
 
-link = wf["links"].find{ _1["rel"] == "self" && _1["type"] == "application/activity+json" }
-if !link || !link["href"]
+href = wf.activitypub
+if !href
   puts "Unable to find a link to the actor"
   exit(2)
 end
 
-href = link["href"]
-
 puts "Trying to retrieve the Actor from #{href}"
 puts
 
-response = Faraday.get(href,{}, {"Accept": "application/activity+json"})
-if response.status != 200
-  PP.pp response
-  exit(3)
-end
-
-ob = ActivityPub.from_json(response.body)
+ob = href.get
 PP.pp(ob)
+puts ob.to_json
 puts
 puts "Enter to continue"
 gets
 
 puts "Trying to retrieve outbox"
-response = Faraday.get(ob.outbox, {}, {"Accept": "application/activity+json"})
-if response.status != 200
-  PP.pp response
-  exit(4)
-end
-
-ob = ActivityPub.from_json(response.body)
+ob = ob.outbox.get
 PP.pp(ob)

data/lib/activitypub/base.rb

@@ -36,6 +36,10 @@ module ActivityPub
             av.is_a?(Hash) && av["type"] ? from_hash(av) : av
           end
         end
+
+        if t = klass.ap_types[attr]
+          v = t.new(v)
+        end
         ob.instance_variable_set("@#{attr}", v) if !v.nil?
       end
     end
@@ -51,12 +55,20 @@ module ActivityPub
     def _type = self.class.name.split("::").last
 
 
-    def self.ap_attr(*names)
+    # FIXME: Allow specifying a type (e.g. URI)
+    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

@@ -2,23 +2,57 @@
 # https://www.w3.org/TR/activitystreams-vocabulary/
 
 require_relative 'base'
+require_relative 'uri'
 
 module ActivityPub
 
   class Link < Base
-    ap_attr :href, :rel, :mediaType, :name, :hreflang, :height, :width, :preview
+    ap_attr :href
+    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
+    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
+    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
@@ -27,7 +61,11 @@ module ActivityPub
   end
 
   class Collection < Object
-    ap_attr :totalItems, :current, :first, :last, :items
+    ap_attr :totalItems
+    ap_attr :current
+    ap_attr :first
+    ap_attr :last
+    ap_attr :items
   end
 
   class OrderedCollection < Collection
@@ -41,7 +79,9 @@ module ActivityPub
   end
 
   class CollectionPage < Collection
-    ap_attr :partOf, :next, :prev
+    ap_attr :partOf
+    ap_attr :next
+    ap_attr :prev
   end
   
   class OrderedCollectionPage < CollectionPage
@@ -129,7 +169,9 @@ module ActivityPub
   end
 
   class Question < IntransitiveActivity
-    ap_attr :oneOf, :anyOf, :closed
+    ap_attr :oneOf
+    ap_attr :anyOf
+    ap_attr :closed
   end
 
   # ## Actor Types
@@ -143,20 +185,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
@@ -172,7 +221,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
@@ -182,7 +233,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
@@ -198,7 +251,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
@@ -223,7 +277,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

@@ -0,0 +1,23 @@
+
+require 'uri'
+require 'faraday'
+
+module ActivityPub
+  class URI
+    def initialize(href)
+      @href = href
+    end
+
+    def to_s = @href
+    def to_json(...) = @href
+
+    def get
+      response = Faraday.get(self.to_s, {}, {"Accept": "application/activity+json"})
+      if response.status == 200
+        ActivityPub.from_json(response.body)
+      else
+        response
+      end
+    end
+  end
+end

data/lib/activitypub/version.rb

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

data/lib/activitypub/webfinger.rb

@@ -0,0 +1,27 @@
+
+require 'webfinger'
+
+module ActivityPub
+  class WebFingerResult
+    def initialize(hash)
+      @h = hash
+
+      @h["aliases"] = @h["aliases"].map{ ActivityPub::URI.new(_1) }
+      @h["links"].each do |v|
+        if v["href"]
+          v["href"] = ActivityPub::URI.new(v["href"])
+        end
+      end
+    end
+
+    def[](i) = @h[i]
+
+    def activitypub
+      @activitypub ||= self["links"].find{ _1["rel"] == "self" && _1["type"] == "application/activity+json" }&.dig("href")
+    end
+  end
+  
+  def self.webfinger(acct)
+    WebFingerResult.new(WebFinger.discover!(acct))
+  end
+end

data/lib/activitypub.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require_relative "activitypub/version"
+require_relative "activitypub/base"
 require_relative "activitypub/types"
+require_relative "activitypub/uri"
+require_relative "activitypub/webfinger"
 
 module ActivityPub
   class Error < StandardError; end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activitypub
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
-dependencies: []
+date: 2024-07-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: webfinger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.3
 description: 
 email:
 - vidar@hokstad.com
@@ -27,7 +41,9 @@ files:
 - lib/activitypub.rb
 - lib/activitypub/base.rb
 - lib/activitypub/types.rb
+- lib/activitypub/uri.rb
 - lib/activitypub/version.rb
+- lib/activitypub/webfinger.rb
 - sig/activitypub.rbs
 homepage: https://github.com/vidarh/activitypub
 licenses: