activitypub 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed038947b69b69a8e0571743cbf28fdfaf7131c4922bc26b1e0d47a532dd6002
-  data.tar.gz: fdda56411f0ebc9d50365eea7bb028eb8b6f718947c10a57f4a838b8201e7d50
+  metadata.gz: 58943510abdbebb4cce7084adcd2fd5c587abed81f103db968148248a9b1e7c1
+  data.tar.gz: 5ccd6bd6cff637fdc5717d064b8b02a29282c9e6d7549c8ad322bd30a0ce2503
 SHA512:
-  metadata.gz: a1339e651c59ec7d18c9b82a48b15e15c7591821276c2d8934f9c8ecd5a014bbfed57e56cc20d95627bca5ac5182d6e6ba6e10e14c36f673948fa555f3cd76b8
-  data.tar.gz: dba788189a64fff38c808db2734bd567bb25bae0ffd0db6503242f56e1edf52b299474eeab4a11bdd40fd994782ee255cada4fa68fc4fbbe23b3056ef8cd28a7
+  metadata.gz: 7a8b4a3a8cdac1be9d069c47b413d00573640ad59e0deca098bf0a0b5f06124bd3c2a43b66462b2f3bf23b3b187c0de55478878b875fa38674b7c53eac968b54
+  data.tar.gz: c4981e523c2754b2d83c9cf6f52fc6de61353b3373097a55b5531f325b08c1477195ba7bac58f3ee47eb3138cb743d06c1719f61e3779a06a3f9b45112011770

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,21 @@ 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
 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 = ActivityPub::URI.new(ob.outbox).get
 PP.pp(ob)

data/lib/activitypub/base.rb

@@ -36,6 +36,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)
+        end
         ob.instance_variable_set("@#{attr}", v) if !v.nil?
       end
     end
@@ -51,6 +54,7 @@ module ActivityPub
     def _type = self.class.name.split("::").last
 
 
+    # FIXME: Allow specifying a type (e.g. URI)
     def self.ap_attr(*names)
       @ap_attributes ||= []
       @ap_attributes.concat(names)

data/lib/activitypub/types.rb

@@ -2,6 +2,7 @@
 # https://www.w3.org/TR/activitystreams-vocabulary/
 
 require_relative 'base'
+require_relative 'uri'
 
 module ActivityPub
 

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.3.7"
 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.3.7
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
-dependencies: []
+date: 2024-07-11 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: