didkit 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f394023d5e7e3f864041dc39e81d1e2730972b6bfe8f3c0a0d0178e27e6557e
-  data.tar.gz: e622af3eea9c05a7831c7b4630e16e0a879faede2a38b6605bb622d0ebb2eaf6
+  metadata.gz: b81757b37a0aa45a3ccefe6e8ebac777a283a6f8d3b827308f1f029b30abe0c8
+  data.tar.gz: beef9f4a9cc71c9edc46fce5e95df2b1c6a442c223826054eafed721d744b8ad
 SHA512:
-  metadata.gz: 1dd40553f1f96d93bb746d1cfc628d3f4a2a34df99634a88775c3673f4ef721c2e13f85110e7a3a0b2880f29ffcbe7da21838378cdd04a3ea346a7ab2ccb2bfc
-  data.tar.gz: f32fc83842dcd9a1bf88817aa8a286f5a1bdf42004416f74ec2450104388426456c2d16b598ba4439d9cb6c13f5035d800df2abada369656ac0c883797f05d1d
+  metadata.gz: 24c046d3566c3816c700e60936f9313b837df8403dc0435e67c317eabaf4e554c29357573a825d72a4795185d942c67c0fc408457a2f3c72e8569c1fc9c718ab
+  data.tar.gz: d0e4bb8224a6a0c5b6d62edfee27869fc7227229d3d95f482beb2c917ac0ea99c45fed7e8993299c8a2b69ef0a9d5f58e1d610e108f0f15aac50ffebb7599dfe

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.3.1] - 2025-12-19
+
+- allow passing a DID string or object to `#resolve_handle` and just return that DID – so you can have a script that accepts either a handle or a DID, and passes the input to `DID.resolve_handle` without checking which one it is
+- allow passing another DID object to `DID.new` and return a copy of that DID
+- parse `seq` field in `PLCOperation` if included and expose it as a property
+- fixed some errors on Rubies older than 3.2 due to missing `filter_map` and `URI#origin`
+- `PLCOperation` verifies if the argument is a `Hash`
+
 ## [0.3.0] - 2025-12-15
 
 Breaking changes:

data/lib/didkit/did.rb

@@ -7,6 +7,8 @@ require_relative 'resolver'
 
 module DIDKit
   class DID
+    GENERIC_REGEXP = /\Adid\:\w+\:.+\z/
+
     include Requests
 
     def self.resolve_handle(handle)
@@ -16,9 +18,13 @@ module DIDKit
     attr_reader :type, :did, :resolved_by
 
     def initialize(did, resolved_by = nil)
-      if did =~ /^did\:(\w+)\:/
+      if did.is_a?(DID)
+        did = did.to_s
+      end
+
+      if did =~ GENERIC_REGEXP
         @did = did
-        @type = $1.to_sym
+        @type = did.split(':')[1].to_sym
       else
         raise DIDError.new("Invalid DID format")
       end
@@ -60,7 +66,7 @@ module DIDKit
       doc = self.document
       return nil if doc.pds_endpoint.nil?
 
-      pds_host = URI(doc.pds_endpoint).origin
+      pds_host = uri_origin(doc.pds_endpoint)
       url = URI("#{pds_host}/xrpc/com.atproto.sync.getRepoStatus")
       url.query = URI.encode_www_form(:did => @did)
 

data/lib/didkit/document.rb

@@ -21,24 +21,30 @@ module DIDKit
       @did = did
       @json = json
 
-      if service = json['service']
-        raise FormatError, "Invalid service data" unless service.is_a?(Array) && service.all? { |x| x.is_a?(Hash) }
-
-        @services = service.filter_map { |x|
-          id, type, endpoint = x.values_at('id', 'type', 'serviceEndpoint')
-          next unless id.is_a?(String) && id.start_with?('#') && type.is_a?(String) && endpoint.is_a?(String)
-
-          ServiceRecord.new(id.gsub(/^#/, ''), type, endpoint)
-        }
-      else
-        @services = []
-      end
-
+      @services = parse_services(json['service'] || [])
       @handles = parse_also_known_as(json['alsoKnownAs'] || [])
     end
 
     def get_verified_handle
       Resolver.new.get_verified_handle(self)
     end
+
+    private
+
+    def parse_services(service_data)
+      raise FormatError, "Invalid service data" unless service_data.is_a?(Array) && service_data.all? { |x| x.is_a?(Hash) }
+
+      services = []
+
+      service_data.each do |x|
+        id, type, endpoint = x.values_at('id', 'type', 'serviceEndpoint')
+
+        if id.is_a?(String) && id.start_with?('#') && type.is_a?(String) && endpoint.is_a?(String)
+          services << ServiceRecord.new(id.gsub(/^#/, ''), type, endpoint)
+        end
+      end
+
+      services
+    end
   end
 end

data/lib/didkit/plc_operation.rb

@@ -12,13 +12,16 @@ module DIDKit
     include AtHandles
     include Services
 
-    attr_reader :json, :did, :cid, :created_at, :type, :handles, :services
+    attr_reader :json, :did, :cid, :seq, :created_at, :type, :handles, :services
 
     def initialize(json)
       @json = json
+      raise FormatError, "Expected argument to be a Hash, got a #{json.class}" unless @json.is_a?(Hash)
+
+      @seq = json['seq']
       @did = json['did']
       raise FormatError, "Missing DID: #{json}" if @did.nil?
-      raise FormatError, "Invalid DID: #{@did}" unless @did.is_a?(String) && @did.start_with?('did:')
+      raise FormatError, "Invalid DID: #{@did.inspect}" unless @did.is_a?(String) && @did.start_with?('did:')
 
       @cid = json['cid']
       raise FormatError, "Missing CID: #{json}" if @cid.nil?

data/lib/didkit/requests.rb

@@ -30,7 +30,7 @@ module DIDKit
         end
 
         if response.is_a?(Net::HTTPRedirection) && redirects < max_redirects && (location = response['Location'])
-          url = URI(location.include?('://') ? location : (url.origin + location))
+          url = URI(location.include?('://') ? location : (uri_origin(url) + location))
 
           if visited_urls.include?(url)
             return response
@@ -74,5 +74,13 @@ module DIDKit
         raise ArgumentError, "Invalid expected_type: #{expected_type.inspect}"
       end
     end
+
+    # backported from https://github.com/ruby/uri/pull/30/files for older Rubies
+    def uri_origin(uri)
+      uri = uri.is_a?(URI) ? uri : URI(uri)
+      authority = (uri.port == uri.default_port) ? uri.host : "#{uri.host}:#{uri.port}"
+
+      "#{uri.scheme}://#{authority}"
+    end
   end
 end

data/lib/didkit/resolver.rb

@@ -19,6 +19,10 @@ module DIDKit
     end
 
     def resolve_handle(handle)
+      if handle.is_a?(DID) || handle =~ DID::GENERIC_REGEXP
+        return DID.new(handle)
+      end
+
       domain = handle.gsub(/^@/, '')
 
       return nil if RESERVED_DOMAINS.include?(domain.split('.').last)
@@ -71,7 +75,7 @@ module DIDKit
 
     def parse_did_from_well_known(text)
       text = text.strip
-      text.lines.length == 1 && text =~ /\Adid\:\w+\:.*\z/ ? text : nil
+      text.lines.length == 1 && text =~ DID::GENERIC_REGEXP ? text : nil
     end
 
     def resolve_did(did)

data/lib/didkit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DIDKit
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: didkit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kuba Suder
@@ -31,13 +31,13 @@ files:
 - lib/didkit/services.rb
 - lib/didkit/version.rb
 - sig/didkit.rbs
-homepage: https://github.com/mackuba/didkit
+homepage: https://ruby.sdk.blue
 licenses:
 - Zlib
 metadata:
-  bug_tracker_uri: https://github.com/mackuba/didkit/issues
-  changelog_uri: https://github.com/mackuba/didkit/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/mackuba/didkit
+  bug_tracker_uri: https://tangled.org/mackuba.eu/didkit/issues
+  changelog_uri: https://tangled.org/mackuba.eu/didkit/blob/master/CHANGELOG.md
+  source_code_uri: https://tangled.org/mackuba.eu/didkit
 rdoc_options: []
 require_paths:
 - lib
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.1
 specification_version: 4
 summary: A library for handling Distributed ID (DID) identifiers used in Bluesky AT
   Protocol