distributed-press-api-client 0.5.0rc4 → 0.5.0rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9c267bf382bc379f9cbcb034747c09eac71af0b8873e3e2b4c45c60120bcf7
-  data.tar.gz: b2ffbec67481d7d48687653e2fb7ed76f8bd7f2a587d807b73f3133ef842a655
+  metadata.gz: 6b468eae410973ff56d5e6eb85e04e9a2bdeb375f274841fff3599a71adf220e
+  data.tar.gz: 4bba1c34d1d866264af766c57b3beadcc70a4e064d9b0e50686bf2a2940d4e9c
 SHA512:
-  metadata.gz: d06dc678b4bbceb7fa5c061ad3de5fa943108367ddbe48875a0eed24b9fa4e87b6f8af3aeca00d9c29453c75979c97eaf91afde98b0486028edf5cf0ffdad867
-  data.tar.gz: 1a67f604b966d5973df3bde6c620d0e3d6aeffbdf57ac723128571e3f9aa784745f1871a3eb6de5f873fb2d617f8a5e95b3b2a93d60b4bdb527e1e50393b80bb
+  metadata.gz: e90870a42b49134a6a2916f87363a11f35514effc99b72f38044c4a2d5bb1505b2d42c82e4c6f7277fa8ad9f321ef86f867e070e74aff3742826e2a16892ade5
+  data.tar.gz: 676e4969b7c5dcbc785157ee38599de7faf823c62659c21b9108dd04ae0cbff6e62e26390bbcc407f9ac76a8566758b646ee36b16baeb235b157c0af290124f1

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

@@ -7,6 +7,7 @@ require 'time'
 require 'digest/sha2'
 require 'uri'
 require_relative '../../version'
+require_relative '../../../httparty/parser/nokogiri'
 require_relative 'signed_headers'
 
 # Retro-compatibility for URI < 0.12

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'referenced_object'
+
+class DistributedPress
+  module V1
+    module Social
+      # A Collection or OrderedCollection is a an object with a list of
+      # items. Sometimes, collections are paginated, so we provide
+      # methods to traverse them.
+      class Collection < ReferencedObject
+        include Enumerable
+
+        RECURSIVE_ATTRIBUTES = %w[items orderedItems first next].freeze
+
+        # If the Collection has items, yield them and keep processing
+        # any pages forward until the end.
+        #
+        # @todo Use totalItems from the starting object for validation
+        # @todo Implement lazy loading
+        def each(&block)
+          Enumerator.new do |enum|
+            RECURSIVE_ATTRIBUTES.each do |attribute|
+              next unless object.key?(attribute)
+
+              object[attribute].each(&block).each do |item|
+                enum << item
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require 'addressable'
 require_relative 'reference'
 require_relative 'referenced_object'
+require_relative 'collection'
 
 class DistributedPress
   module V1
@@ -17,7 +18,7 @@ class DistributedPress
         def _dump(_)
           Marshal.dump(client)
         end
- 
+
         def self._load(client)
           new(client: Marshal.load(client))
         end
@@ -25,22 +26,61 @@ class DistributedPress
         # @param :client [DistributedPress::V1::Social::Client]
         def initialize(client:)
           @client = client
+          # @todo Replace with a class
           @parser =
             proc do |body, format|
+              next HTTParty::Parser.call(body, :html) if body&.starts_with? '<'
               next HTTParty::Parser.call(body, format || :plain) unless body&.starts_with? '{'
 
-              ReferencedObject.new(object: HTTParty::Parser.call(body, :json), dereferencer: self)
+              object = HTTParty::Parser.call(body, :json)
+
+              # @todo Actually validate objects
+              case object['type']
+              when 'Collection', 'OrderedCollection', 'CollectionPage'
+                Collection.new(object: object, dereferencer: self)
+              else
+                ReferencedObject.new(object: object, dereferencer: self)
+              end
             end
         end
 
-        # Fetch a URI
+        # Fetch a URI, if it's an HTML page, look for the alternate
+        # version so we always have the correct activity.
         #
+        # @todo Raise an error if the content-type is not supported?
         # @param :uri [String, Addressable::URI]
         # @return [HTTParty::Response]
         def get(uri:)
-          uri = uris(uri)
+          response = nil
+
+          loop do
+            uri = uris(uri)
+            client = clients(uri)
+            response = client.get(endpoint: uri.path, parser: @parser)
+
+            # Break the loop if the request failed
+            break unless response.success?
+            # Or if it's not an HTML document
+            break unless response.parsed_response.is_a?(::Nokogiri::HTML5::Document)
+
+            link = response.parsed_response.css('link[rel=alternate]').find do |link|
+              next unless link['type']
+              next true if client.class::ACCEPT.include?(link['type'])
+
+              client.class::ACCEPT.any? do |accept|
+                link['type'].start_with? accept
+              end
+            end
+
+            break if link.nil?
+            break if link['href'].nil?
+            break if link['href'].empty?
+
+            # Start loop again with the new URI
+            uri = link['href']
+          end
 
-          clients(uri).get(endpoint: uri.path, parser: @parser)
+          response
         end
 
         # Gets a client for a URI

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

@@ -8,6 +8,11 @@ class DistributedPress
       class Reference
         extend Forwardable
 
+        # Public addressing doesn't lead to an activity
+        #
+        # @return [String]
+        PUBLIC = 'https://www.w3.org/ns/activitystreams#Public'
+
         # @return [String]
         attr_reader :uri
 
@@ -28,11 +33,18 @@ class DistributedPress
           @object ||= dereferencer.get(uri: uri)
         end
 
+        # Is this a public post?
+        #
+        # @return [Bool]
+        def public?
+          [slice(*%w[audience to cc]).values].flatten.include? PUBLIC
+        end
+
         def inspect
           "#{self.class.name}(#{uri})"
         end
 
-        def_delegators :object, :[], :dig, :to_h, :to_json
+        def_delegators :object, :[], :dig, :to_h, :to_json, :slice
       end
     end
   end

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

@@ -18,6 +18,7 @@ class DistributedPress
             replies
             to
             publicKey
+            audience
 
             alsoKnownAs
             devices
@@ -73,13 +74,22 @@ class DistributedPress
                 when Hash
                   reference_object!(o)
                   o
-                when String then dereferencer.references(dereferencer.uris(o))
+                when String
+                  if o == DistributedPress::V1::Social::Reference::PUBLIC
+                    o
+                  else
+                    dereferencer.references(dereferencer.uris(o))
+                  end
+                else
+                  o
                 end
               end
             when Hash
               reference_object!(object[attribute])
             when String
-              object[attribute] = dereferencer.references(dereferencer.uris(object[attribute]))
+              unless object[attribute] == DistributedPress::V1::Social::Reference::PUBLIC
+                object[attribute] = dereferencer.references(dereferencer.uris(object[attribute]))
+              end
             end
           end
         end

data/lib/distributed_press/version.rb

@@ -3,5 +3,5 @@
 # API client
 class DistributedPress
   # Version
-  VERSION = '0.5.0rc4'
+  VERSION = '0.5.0rc5'
 end

data/lib/httparty/parser/nokogiri.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'httparty/parser'
+require 'nokogiri'
+
+module HTTParty
+  class Parser
+    # Parse HTML as Nokogiri documents
+    module Nokogiri
+      protected
+
+      def html
+        ::Nokogiri::HTML5(body)
+      end
+    end
+  end
+end
+
+HTTParty::Parser.class_eval do
+  prepend HTTParty::Parser::Nokogiri
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distributed-press-api-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0rc4
+  version: 0.5.0rc5
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -120,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -310,6 +324,7 @@ files:
 - lib/distributed_press/v1/social/allowlist.rb
 - lib/distributed_press/v1/social/blocklist.rb
 - lib/distributed_press/v1/social/client.rb
+- lib/distributed_press/v1/social/collection.rb
 - lib/distributed_press/v1/social/dereferencer.rb
 - lib/distributed_press/v1/social/followers.rb
 - lib/distributed_press/v1/social/hook.rb
@@ -324,6 +339,7 @@ files:
 - lib/distributed_press/version.rb
 - lib/dry/schema/processor_decorator.rb
 - lib/dry/schema/result_decorator.rb
+- lib/httparty/parser/nokogiri.rb
 - lib/jekyll-distributed-press-v0.rb
 homepage: https://0xacab.org/sutty/distributed-press-api-client
 licenses: