activitypub 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 112ee8d199c09e5d9ff788e2bdf02b80e745513a8812d01cfbf377fb56daac3b
-  data.tar.gz: 7132a7c5d296315c29dad6672a511841a0557640d2b43139d1d4399c71e10487
+  metadata.gz: 8c0e1247ee89de99f86956188ce6bd17a3a5360b9abb222badc18b2671cca5b9
+  data.tar.gz: eeede65bac6dd07a3ba9acdb9569d764448d2ff06816e59741431f9a8f3fdbff
 SHA512:
-  metadata.gz: b3f3d2e3788239c080ac7354fa5a02e27ac242911374d86b579473c0ae451f1d46eff8033b7ae91abb8cda24e865cf9c58ebfd2fbc2c86257b4ed01e3856f0a4
-  data.tar.gz: 8c7b248e72822ca739272b4315fc3256aefe96a333b81ca0676a5717162fd345a6ff2e3eef2ff3d989172abbad8124a652c5aa6cf105c1a7880643aa20c03c53
+  metadata.gz: 62a13084316cbf4c333ab333f41639a1a41ec29e72d53c5a9ab61a82b13396a08eb553e2c147d9c2a35dc197756859f2c11d5c6dccfd8525573a2c1f9a74bbe3
+  data.tar.gz: acdb52191d7b1fc1ca31178dc8becbeaeac3c97e4a4c14e2fba27fee3ca22722edb3c766cc3d98a9188181541a8b6384643ee3d241953558fd44360d36418c95

data/lib/activitypub/base.rb

@@ -1,23 +1,42 @@
+# frozen_string_literal: true
 
 require 'json'
 
 module ActivityPub
   class Error < StandardError; end
+
   
   def self.from_json(json)
-    h = JSON.parse(json)
+    from_hash(JSON.parse(json))
+  end
+
+  def self.from_hash(h)
     type = h&.dig("type")
 
     raise Error, "'type' attribute is required" if !type
     raise NameError, "'type' attribute with '::' is not allowed" if !type.index("::").nil?
+
+    # FIXME: May need a way to override/handle custom namespaces.
     
     klass = ActivityPub.const_get(type)
 
     ob = klass ? klass.new : nil
 
     if ob
+      context = h.dig("@context")
+      ob.instance_variable_set("@_context", context) if context
+      
       klass.ap_attributes.each do |attr|
-        ob.instance_variable_set("@#{attr}", h.dig(attr.to_s))
+        v = h.dig(attr.to_s)
+
+        if v.is_a?(Hash) && v["type"]
+          v = from_hash(v)
+        elsif v.is_a?(Array)
+          v = v.map do |av|
+            av.is_a?(Hash) && av["type"] ? from_hash(av) : av
+          end
+        end
+        ob.instance_variable_set("@#{attr}", v)
       end
     end
 
@@ -28,7 +47,7 @@ module ActivityPub
   # for serialization and dezerialisation.
   #
   class Base
-    def _context = "https://www.w3.org/ns/activitystreams".freeze
+    def _context = @_context || "https://www.w3.org/ns/activitystreams"
     def _type = self.class.name.split("::").last
 
 

data/lib/activitypub/types.rb

@@ -31,6 +31,13 @@ module ActivityPub
   end
 
   class OrderedCollection < Collection
+    # "orderedItems" is not part of
+    # https://www.w3.org/TR/activitystreams-vocabulary/#dfn-orderedcollection,
+    # however it is part of at least some Mastodon exports, and so we include
+    # it here
+    #
+    # FIXME: Review/consider whether to marge orderedItems/items internally.
+    ap_attr :orderedItems
   end
 
   class CollectionPage < Collection
@@ -218,4 +225,13 @@ module ActivityPub
   class Tombstone < Object
     ap_attr :formerType, :deleted
   end
+
+  # Mastodon extensions
+
+  class Hashtag < Link
+  end
+
+  class PropertyValue < Object
+    ap_attr :value
+  end
 end

data/lib/activitypub/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activitypub
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: