distributed-press-api-client 0.4.0rc3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee95dc9deb3cb19084a66ee33ee4970906619c6489ce0bf29b0aa9f90ae99d93
-  data.tar.gz: abcb6a90f1e16ad51aac21f15b79067c141f4cdc45edfbddc69704dd235adac7
+  metadata.gz: 6a5f4b33d4222028ca00dfe7e4a3f9e0fd5a4e4c620068e8ae094df84e4d4a2c
+  data.tar.gz: ba21a56decb67357d65243ea5f7a12f92e705f689a2501fe3419921d6ffeea0f
 SHA512:
-  metadata.gz: 5d3e98400b29ee2258a29beb1c47fab70a07d1cbdd43a96df9842a507d2ee3f3aaf9d3eeef1dee381967363227fb8af68b0b9f080861feac67595b1a081c43b0
-  data.tar.gz: 55291cec6e026520a3e9f111fd80e55b4762aa551f1dcae12015951a01d9d6dd55bbda07394f5f36566e3500abed7673e2a71c90feaf2f4092ef838361d3c8e8
+  metadata.gz: 3a8f016d1fba233cf4e106b6f114fa82b34949af8b88cde9c252d4c33bb440c30c233eadee120205d4ff9c019327f44d9f9e4971abc8733c4e2c5856ec2a5986
+  data.tar.gz: 43019f74c34831fa3a9164db342e971307ab8c76e225445a7a95cf82f025e2496af8cfa0c1264fcd620ad2126f1066093280bbcfa5d113705c658247583c7aec

data/lib/distributed_press/v1/social/client.rb

@@ -86,12 +86,12 @@ class DistributedPress
 
         def _dump(_)
           Marshal.dump({
-            public_key_url: public_key_url,
-            url: url,
-            private_key_pem: @private_key_pem,
-            key_size: key_size,
-            cache_store: self.class.cache_store
-          })
+                         public_key_url: public_key_url,
+                         url: url,
+                         private_key_pem: @private_key_pem,
+                         key_size: key_size,
+                         cache_store: self.class.cache_store
+                       })
         end
 
         def self._load(hash)
@@ -202,7 +202,7 @@ class DistributedPress
           # after the request is instantiated. No need to process
           # cookies for now. Uses the public key URL as a caching key so
           # we revalidate access on shared caches.
-          options = { body: body, headers: headers, base_uri: url, parser: parser, stream_body: true, cache_key: public_key_url }
+          options = { body: body, headers: headers, base_uri: url, parser: parser, stream_body: true }
           options = HTTParty::ModuleInheritableAttributes.hash_deep_dup(self.class.default_options).merge(options)
           response_body = ''.dup
 
@@ -211,6 +211,14 @@ class DistributedPress
           end.perform do |fragment|
             fragment_to_body!(fragment, response_body)
           end.tap do |response|
+            # Brotli decompression is delayed until after full download
+            if response.headers['content-encoding'] == 'br'
+              ''.dup.tap do |inflated_response_body|
+                inflate_body!(response_body, inflated_response_body)
+                response_body = inflated_response_body
+              end
+            end
+
             next if response_body.empty?
 
             fix_response!(response, response_body)
@@ -275,16 +283,19 @@ class DistributedPress
         # tests, 2GB of zeroes were compressed to a 1.6KB fragment.
         #
         # @todo Maybe each_char is too slow?
-        # @param fragment [HTTParty::ResponseFragment]
+        # @param body [String]
         # @param append_to [String]
-        def inflate_fragment!(fragment, append_to)
-          fragment_io = StringIO.new(fragment)
+        def inflate_body!(body, append_to)
+          body_io = StringIO.new(body)
 
-          BRS::Stream::Reader.new(fragment_io, source_buffer_length: 256,
-                                               destination_buffer_length: 1024).each_char do |char|
+          BRS::Stream::Reader.new(body_io, source_buffer_length: 256,
+                                           destination_buffer_length: 1024).each_char do |char|
             append_to << char
 
-            raise ContentTooLargeError if append_to.bytesize > 1_000_000
+            if append_to.bytesize > 1_000_000
+              raise ContentTooLargeError,
+                    "Content too large after inflating, stopped at #{append_to.bytesize} bytes!"
+            end
           end
         end
 
@@ -294,22 +305,16 @@ class DistributedPress
         # @param :fragment [HTTParty::ResponseFragment]
         # @param :append_to [String]
         def fragment_to_body!(fragment, append_to)
-          case fragment.http_response['content-encoding']
-          when 'br'
-            # Raise an error rather than returning an empty body
-            unless brotli?
-              raise BrotliUnsupportedError,
-                    'Server sent brotli-encoded response but ruby-brs gem is missing'
-            end
-
-            inflate_fragment!(fragment, append_to)
-          else
-            append_to << fragment
+          if fragment.http_response['content-encoding'] == 'br' && !brotli?
+            raise BrotliUnsupportedError, 'Server sent brotli-encoded response but ruby-brs gem is missing'
           end
 
-          raise ContentTooLargeError if append_to.bytesize > 1_000_000
-        rescue ContentTooLargeError
-          raise ContentTooLargeError, "Content too large #{append_to.bytesize} bytes!"
+          append_to << fragment
+
+          return unless append_to.bytesize > 1_000_000
+
+          raise ContentTooLargeError,
+                "Content too large, stopped at #{append_to.bytesize} bytes!"
         end
 
         # Re-adds a streamed body to the response and caches it again so

data/lib/distributed_press/v1/social/followers.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'uri'
+require_relative 'client'
+
+class DistributedPress
+  module V1
+    module Social
+      # Manages the actor's followers on the Social Inbox
+      class Followers
+        # @return [DistributedPress::V1::Social::Client]
+        attr_reader :client
+
+        # @return [String]
+        attr_reader :actor
+
+        # @param :client [DistributedPress::V1::Social::Client]
+        # @param :actor [String]
+        def initialize(client:, actor:)
+          @client = client
+          @actor = actor
+        end
+
+        # Get the actor's inbox
+        #
+        # @return [HTTParty::Response]
+        def get
+          client.get(endpoint: endpoint)
+        end
+
+        # 
+        #
+        # @param :id [String] Activity ID
+        # @return [HTTParty::Response]
+        def remove(id:)
+          client.delete(endpoint: "#{endpoint}/#{URI.encode_uri_component(id)}")
+        end
+
+        # Followers
+        #
+        # @return [String]
+        def endpoint
+          @endpoint ||= "/v1/#{actor}/followers"
+        end
+      end
+    end
+  end
+end

data/lib/distributed_press/v1/social/inbox.rb

@@ -21,6 +21,23 @@ class DistributedPress
           @actor = actor
         end
 
+        # Creates a Social Inbox by uploading the keypair to it.
+        #
+        # @param actor_url [String] The URL where the Actor profile is hosted
+        # @return [HTTParty::Response]
+        def create(actor_url)
+          inbox_body = {
+            'actorUrl' => actor_url,
+            'publicKeyId' => "#{actor_url}#main-key",
+            'keypair' => {
+              'publicKeyPem' => client.public_key.public_to_pem,
+              'privateKeyPem' => client.private_key.export
+            }
+          }
+
+          client.post(endpoint: "/v1/#{actor}", body: inbox_body)
+        end
+
         # Get the actor's inbox
         #
         # @return [HTTParty::Response]

data/lib/distributed_press/version.rb

@@ -3,5 +3,5 @@
 # API client
 class DistributedPress
   # Version
-  VERSION = '0.4.0rc3'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distributed-press-api-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0rc3
+  version: 0.4.1
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -311,7 +311,7 @@ files:
 - lib/distributed_press/v1/social/blocklist.rb
 - lib/distributed_press/v1/social/client.rb
 - lib/distributed_press/v1/social/dereferencer.rb
-- lib/distributed_press/v1/social/dereferencer.rb.orig
+- lib/distributed_press/v1/social/followers.rb
 - lib/distributed_press/v1/social/hook.rb
 - lib/distributed_press/v1/social/inbox.rb
 - lib/distributed_press/v1/social/outbox.rb
@@ -351,9 +351,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.26
 signing_key:

data/lib/distributed_press/v1/social/dereferencer.rb.orig

@@ -1,132 +0,0 @@
-# frozen_string_literal: true
-
-require 'addressable'
-require_relative 'reference'
-
-class DistributedPress
-  module V1
-    module Social
-      # Fetches ActivityStreams from different instances by
-      # instantiating clients.
-      class Dereferencer
-        # @return [DistributedPress::V1::Social::Client]
-        attr_reader :client
-
-        REFERENTIABLE_ATTRIBUTES =
-          %w[
-            actor
-            owner
-            attributedTo
-            cc
-            inReplyTo
-            object
-            replies
-            to
-            publicKey
-
-            alsoKnownAs
-            devices
-            featured
-            featuredTags
-            followers
-            following
-            inbox
-            movedTo
-            outbox
-
-            first
-            items
-            next
-            orderedItems
-            partOf
-            prev
-          ].freeze
-
-        # @param :client [DistributedPress::V1::Social::Client]
-        def initialize(client:)
-          @client = client
-          @parser =
-            proc do |body, format|
-              next HTTParty::Parser.call(body, format || :plain) unless body&.starts_with? '{'
-
-              HTTParty::Parser.call(body, :json).tap do |object|
-                reference_object! object
-              end
-            end
-        end
-
-        # Fetch a URI
-        #
-        # @param :uri [String, Addressable::URI]
-        # @return [HTTParty::Response]
-        def get(uri:)
-          uri = uris(uri)
-
-          clients(uri).get(endpoint: uri.path, parser: @parser)
-        end
-
-        # Gets a client for a URI
-        #
-        # @param :uri [Addressable::URI]
-        # @return [DistributedPress::V1::Social::Client]
-        def clients(uri)
-          @clients ||= {}
-          @clients[uri.origin] ||=
-            client.class.new(
-              url: uri.origin,
-              public_key_url: client.public_key_url,
-              private_key_pem: client.private_key.to_s,
-              logger: client.logger,
-              cache_store: client.class.cache_store
-            )
-        end
-
-        # Gets a reference for a URI and indexes it by the complete
-        # and normalized URI
-        #
-        # @param :uri [String, Addressable::URI]
-        # @return [DistributedPress::V1::Social::Reference]
-        def references(uri)
-          @references ||= {}
-          @references[uri.to_s] ||= Reference.new(uri: uri.to_s, dereferencer: self)
-        end
-
-        # Make sure we're getting a normalized Addressable::URI
-        #
-        # @param :uri [String, Addressable::URI]
-        # @return [Addressable::URI]
-        def uris(uri)
-          @uris ||= {}
-          @uris[uri.to_s] ||=
-            (if uri.is_a? Addressable::URI
-               uri
-             else
-               Addressable::URI.parse(uri)
-             end).normalize
-        end
-
-        def reference_object!(object)
-          REFERENTIABLE_ATTRIBUTES.each do |attribute|
-            next unless object.key? attribute
-
-            case object[attribute]
-            when Array
-              object[attribute].map! do |o|
-                case o
-                when Hash
-                  reference_object!(o)
-                  o
-                when String then references(uris(o))
-                end
-              end
-            when Hash
-              reference_object!(object[attribute])
-            when String
-              object[attribute] = references(uris(object[attribute]))
-            end
-          end
-        end
-      end
-    end
-  end
-end