Atmosfire 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e059c19199525a9436b51dc419fa63dd881800b3a2bbb976350742da931a131
-  data.tar.gz: b19e78694cf71cc16a563d0a8f7e6a863c9f216107cee4226efa1f553dd8ba57
+  metadata.gz: 83cc1ffc021213e0fc91521cedcb674b095521c8d426ec78736b8729511cc763
+  data.tar.gz: 48b36faf67694ee803c68c21e30f411e125b1b265edc7eba14bf9c5fc35f83f6
 SHA512:
-  metadata.gz: f2abdb67eb28583c69ec45e6d1c8c140dd61b568060fe5dc95f74666cfb4bdb132c9c88fbcad15af46c4bb1f248a5f0a2edc28fd42231b9209909757ec765b6f
-  data.tar.gz: 3073642340513a9c597586258dcb26c0451d085c297776730de66e35870c64b29728ddcad01b871019e9b13421712d93e2af7031b7a9c32eeab0100a232bfede
+  metadata.gz: b11ff02dd2a66ae2f6dbc441646e8c004336aa5c3ba1feedf0931e68f951ebb87d4f2e9feaf6931485666ae0e4f49c286d8b7b39119fa6069f5bfe198845768e
+  data.tar.gz: 5cb83d2bdce1178192334682cca26954744f8f9d7afaa117d5dc86eb39c6c30d9011846d4bea81362f680378091ea20d2e24989a4b68c96b08cc89ddd231d38b

data/lib/atmosfire/at_uri.rb

@@ -8,19 +8,7 @@ module Atmosfire
     sig { params(url: String, atp_host: String).returns(T.nilable(AtUri)) }
 
     def at_uri(url, atp_host = "https://bsky.social")
-      rulesets = [
-        AtUriParser.create_rule(%r{^#{Regexp.escape("https://")}(bsky\.app)/profile/(.+)/post/([\w]+)$}) do |handle, collection, rkey, pds|
-          handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
-          AtUri.new(did, "app.bsky.feed.post", rkey)
-        end,
-
-        AtUriParser.create_rule(%r{^at://(.+)/(.+)/(\w+)$}) do |handle, collection, rkey, pds|
-          handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
-          AtUri.new(did, collection, rkey)
-        end,
-
-      ]
-      AtUriParser.parse(url, rulesets, pds: atp_host)
+      AtUriParser.parse(url, AtUriParser::RuleSets, pds: atp_host)
     end
   end
 end
@@ -28,6 +16,8 @@ end
 module Atmosfire
   module AtUriParser
     extend T::Sig
+    include RequestUtils
+
     Rule = Struct.new(:pattern, :transform)
 
     sig { params(url: String, rulesets: T::Array[Rule], pds: String).returns(T.nilable(AtUri)) }
@@ -49,20 +39,24 @@ module Atmosfire
       end
       Rule.new(pattern, transform)
     end
+    RuleSets = [
+      AtUriParser.create_rule(%r{^#{Regexp.escape("https://")}(bsky\.app)/profile/(.+)/post/([\w]+)$}) do |handle, collection, rkey, pds|
+        handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
+        AtUri.new(repo: did, collection: "app.bsky.feed.post", rkey: rkey)
+      end,
+
+      AtUriParser.create_rule(%r{^at://(.+)/(.+)/(\w+)$}) do |handle, collection, rkey, pds|
+        handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
+        AtUri.new(repo: did, collection: collection, rkey: rkey)
+      end,
+    ]
   end
 
-  AtUri = Struct.new :repo, :collection, :rkey do
+  class AtUri < T::Struct
     extend T::Sig
-
-    def initialize(*args)
-      if args.count == 1
-        parts = args[0].split("/")
-        repo, collection, rkey = parts[2], parts[3], parts[4]
-      elsif args.count == 3
-        repo, collection, rkey = args
-      end
-      super(repo, collection, rkey)
-    end
+    const :repo, T.any(Atmosfire::Repo, String)
+    const :collection, T.nilable(T.any(Atmosfire::Repo::Collection, String))
+    const :rkey, T.nilable(String)
 
     sig { returns(String) }
 

data/lib/atmosfire/collection.rb

@@ -1,19 +1,16 @@
-# typed: true
+# typed: strict
 module Atmosfire
   class Repo
-    Collection = Struct.new :repo, :collection do
+    class Collection < T::Struct
       include RequestUtils
       extend T::Sig
 
-      sig { params(repo: Atmosfire::Repo, lexicon_name: String).void }
-
-      def initialize(repo, lexicon_name)
-        super(repo, lexicon_name)
-      end
+      const(:repo, Atmosfire::Repo)
+      const(:collection, String)
 
       sig { params(limit: Integer).returns(T::Array[Atmosfire::Record]) }
 
-      def list_records(limit = 10)
+      def list(limit = 10)
         self.repo.pds_endpoint
           .get.com_atproto_repo_listRecords(
             repo: self.repo.did,
@@ -27,10 +24,16 @@ module Atmosfire
 
       sig { returns(String) }
 
-      def to_s
+      def to_uri
         "at://#{self.repo.did}/#{self.collection}"
       end
 
+      sig { returns(String) }
+
+      def to_s
+        @collection
+      end
+
       sig { params(rkey: String).returns(T.nilable(Atmosfire::Record)) }
 
       def [](rkey)

data/lib/atmosfire/record.rb

@@ -4,24 +4,32 @@ module Atmosfire
     extend T::Sig
     class << self
       extend T::Sig
+      include RequestUtils
 
       sig { params(json_hash: Hash).returns(T.nilable(Atmosfire::Record)) }
 
       def from_hash(json_hash)
+        return nil if json_hash["value"].nil?
         timestamp = nil
-        timestamp = Time.parse json_hash["value"]["createdAt"] if json_hash["value"]["createdAt"]
+        timestamp = Time.parse json_hash["value"]["createdAt"] if json_hash["value"] && json_hash["value"]["createdAt"]
         raw_content = json_hash["value"]
-        new(AtUri.new(json_hash["uri"]), json_hash["cid"], timestamp, raw_content)
+        new(
+          at_uri(
+            T.must(json_hash["uri"])
+          ),
+          json_hash["cid"],
+          timestamp, raw_content
+        )
       end
 
       sig { params(uri: Atmosfire::AtUri, pds: String).returns(T.nilable(Atmosfire::Record)) }
 
       def from_uri(uri, pds = "https://bsky.social")
-        self.from_hash XRPC::Client.new(pds).get.com_atproto_repo_getRecord(
-          repo: uri.repo,
-          collection: uri.collection,
+        from_hash(XRPC::Client.new(pds).get.com_atproto_repo_getRecord(
+          repo: uri.repo.to_s,
+          collection: "#{uri.collection}",
           rkey: uri.rkey,
-        )
+        ))
       end
 
       sig { params(content_hash: Hash, session: Atmosfire::Session, rkey: T.nilable(String)).returns(T.nilable(Atmosfire::Record)) }
@@ -29,19 +37,17 @@ module Atmosfire
       def create(content_hash, session, rkey = nil)
         return nil if content_hash["$type"].nil?
         if rkey.nil?
-          rec = from_uri(session.xrpc.post.com_atproto_repo_createRecord(
+          from_uri(at_uri(session.xrpc.post.com_atproto_repo_createRecord(
             repo: session.did,
             collection: content_hash["$type"],
             record: content_hash,
-          )["uri"])
-          return rec
-        else rec = from_uri(session.xrpc.post.com_atproto_repo_createRecord(
+          )["uri"]))
+        else from_uri(at_uri(session.xrpc.post.com_atproto_repo_createRecord(
           repo: session.did,
           collection: content_hash["$type"],
           rkey: rkey,
           record: content_hash,
-        )["uri"])
-          return rec;         end
+        )["uri"]))         end
       end
     end
 

data/lib/atmosfire/repo.rb

@@ -6,6 +6,11 @@ class Atmosfire::Repo
 
   sig { params(username: String, pds: String, open: T::Boolean, authenticate: T.nilable(Atmosfire::Session)).void }
 
+  # @param username [String] The username or DID (Decentralized Identifier) to use.
+  # @param pds [String] The URL of the personal data server (default: "https://bsky.social").
+  # @param open [Boolean] Whether to open the repository or not (default: true).
+  # @param authenticate [NilClass, Object] Additional authentication data (default: nil).
+
   def initialize(username, pds = "https://bsky.social", open: true, authenticate: nil)
     @pds = pds
     @pds_endpoint = XRPC::Client.new(pds)
@@ -24,6 +29,16 @@ class Atmosfire::Repo
     @collections = describe_repo["collections"]
   end
 
+  sig { returns(String) }
+
+  def to_uri
+    "at://#{@did}"
+  end
+
+  def to_s
+    @did
+  end
+
   sig { returns(Hash) }
 
   def describe_repo
@@ -39,7 +54,7 @@ class Atmosfire::Repo
   sig { params(collection: String).returns(Atmosfire::Repo::Collection) }
 
   def [](collection)
-    Collection.new(self, collection)
+    Collection.new(repo: self, collection: collection)
   end
 
   attr_reader :did, :record_list, :pds, :pds_endpoint

data/lib/atmosfire/requests.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Atmosfire
   class Error < StandardError; end
 
@@ -38,10 +39,6 @@ module Atmosfire
       "#{pds}/xrpc/com.atproto.server.getSession"
     end
 
-    def create_record_uri(pds)
-      "#{pds}/xrpc/com.atproto.repo.createRecord"
-    end
-
     def delete_record_uri(pds)
       "#{pds}/xrpc/com.atproto.repo.deleteRecord"
     end

data/lib/atmosfire/session.rb

@@ -1,7 +1,5 @@
 # typed: true
 
-require "atmosfire/requests"
-
 module Atmosfire
   Credentials = Struct.new :username, :pw, :pds do
     extend T::Sig

data/lib/atmosfire/version.rb

@@ -1,3 +1,4 @@
+# typed: strict
 module Atmosfire
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/atmosfire.rb

@@ -2,8 +2,9 @@
 # frozen_string_literal: true
 require "sorbet-runtime"
 require "xrpc"
-require "atmosfire/at_uri"
+require "atmosfire/requests"
 require "atmosfire/session"
 require "atmosfire/collection"
 require "atmosfire/repo"
 require "atmosfire/record"
+require "atmosfire/at_uri"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Atmosfire
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Shreyan Jain