skyfall 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e7396b9d5f8de50025ea41e80b17578607e40aab7bfce17ffd948aa428cdd0f
-  data.tar.gz: 8915e1d9cc0169c9c8bf0c3995f92fd36a14a49cab846c876a766afd92e31ab1
+  metadata.gz: 3917568c1283d599d3103b428599141e04d0df2cce33c4b17291bc935b8add4d
+  data.tar.gz: 329dd70a2f17bb689fa0a10c6646c7f522c1ac165b1e0ef49f96cd5b6d746d57
 SHA512:
-  metadata.gz: 7fb7381a4fd818a6a9e956107dadb51e0a519898eb6b19f94d28cf3c41d2a25775460aace039b2b4713105e46ec5fef9bf9e5595a0170642f3d6cc59da56ca3f
-  data.tar.gz: db58dc53caacf3eda013732b9324bd03be5b93445500beac2b035d5e15273dd6f2f7b59f05887f3dab8518a95809126f31d7a6c79eac9c6760d268fc11cc5a19
+  metadata.gz: '09e6812b1234a0f7e4aeab3dee4fe962b47a781d7ddcf1151b1f310558e72837808caee9c1ca0d4e98f7e137e7147b72c8bdcd9ae17501c48f1d1dcc1a32ca35'
+  data.tar.gz: 5c558d41a7fc49ecc34273a791dc26a706c00708ca0b00b09a59d5bdc4684ff4f14611c065e35343f65d7989a948e5294b7c9edc55b41426f5b2eae893bea392

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.2.3] - 2023-09-28
+
+- fixed encoding of image CIDs again (they should be wrapped in a `$link` object)
+- binary strings are now correctly returned as `$bytes` objects
+- added `list`, `listblock` and `threadgate` to record type symbols and collection constants
+
 ## [0.2.2] - 2023-09-06
 
 - fixed image CIDs returned in the record JSON as CBOR tag objects (they are now returned decoded to the string form)

data/lib/skyfall/car_archive.rb

@@ -2,6 +2,7 @@ require_relative 'cid'
 require_relative 'errors'
 require_relative 'extensions'
 
+require 'base64'
 require 'cbor'
 require 'stringio'
 
@@ -33,30 +34,30 @@ module Skyfall
 
     def section_with_cid(cid)
       section = @sections.detect { |s| s.cid == cid }
-
-      if section
-        convert_cids(section.body)
-        section.body
-      end
+      section && section.body
     end
 
     private
 
-    def convert_cids(object)
+    def convert_data(object)
       if object.is_a?(Hash)
         object.each do |k, v|
           if v.is_a?(Hash) || v.is_a?(Array)
-            convert_cids(v)
+            convert_data(v)
           elsif v.is_a?(CBOR::Tagged)
-            object[k] = CID.from_cbor_tag(v)
+            object[k] = make_cid_link(v)
+          elsif v.is_a?(String) && v.encoding == Encoding::ASCII_8BIT
+            object[k] = make_bytes(v)
           end
         end
       elsif object.is_a?(Array)
         object.each_with_index do |v, i|
           if v.is_a?(Hash) || v.is_a?(Array)
-            convert_cids(v)
+            convert_data(v)
           elsif v.is_a?(CBOR::Tagged)
-            object[i] = CID.from_cbor_tag(v)
+            object[i] = make_cid_link(v)
+          elsif v.is_a?(String) && v.encoding == Encoding::ASCII_8BIT
+            object[i] = make_bytes(v)
           end
         end
       else
@@ -64,6 +65,14 @@ module Skyfall
       end
     end
 
+    def make_cid_link(cid)
+      { '$link' => CID.from_cbor_tag(cid) }
+    end
+
+    def make_bytes(data)
+      { '$bytes' => Base64.encode64(data).chomp.gsub(/=+$/, '') }
+    end
+
     def read_header(buffer)
       len = buffer.read_varint
 
@@ -104,6 +113,7 @@ module Skyfall
 
       body_data = sbuffer.read
       body = CBOR.decode(body_data)
+      convert_data(body)
 
       @sections << CarSection.new(cid, body)
     end

data/lib/skyfall/collection.rb

@@ -1,12 +1,15 @@
 module Skyfall
   module Collection
-    BSKY_POST = "app.bsky.feed.post"
-    BSKY_LIKE = "app.bsky.feed.like"
-    BSKY_FOLLOW = "app.bsky.graph.follow"
-    BSKY_REPOST = "app.bsky.feed.repost"
-    BSKY_BLOCK = "app.bsky.graph.block"
-    BSKY_PROFILE = "app.bsky.actor.profile"
-    BSKY_LISTITEM = "app.bsky.graph.listitem"
-    BSKY_FEED = "app.bsky.feed.generator"
+    BSKY_PROFILE    = "app.bsky.actor.profile"
+    BSKY_FEED       = "app.bsky.feed.generator"
+    BSKY_LIKE       = "app.bsky.feed.like"
+    BSKY_POST       = "app.bsky.feed.post"
+    BSKY_REPOST     = "app.bsky.feed.repost"
+    BSKY_THREADGATE = "app.bsky.feed.threadgate"
+    BSKY_BLOCK      = "app.bsky.graph.block"
+    BSKY_FOLLOW     = "app.bsky.graph.follow"
+    BSKY_LIST       = "app.bsky.graph.list"
+    BSKY_LISTBLOCK  = "app.bsky.graph.listblock"
+    BSKY_LISTITEM   = "app.bsky.graph.listitem"
   end
 end

data/lib/skyfall/operation.rb

@@ -41,14 +41,17 @@ module Skyfall
 
     def type
       case collection
-      when Collection::BSKY_POST then :bsky_post
-      when Collection::BSKY_LIKE then :bsky_like
-      when Collection::BSKY_FOLLOW then :bsky_follow
-      when Collection::BSKY_REPOST then :bsky_repost
-      when Collection::BSKY_BLOCK then :bsky_block
-      when Collection::BSKY_PROFILE then :bsky_profile
-      when Collection::BSKY_LISTITEM then :bsky_listitem
-      when Collection::BSKY_FEED then :bsky_feed
+      when Collection::BSKY_BLOCK      then :bsky_block
+      when Collection::BSKY_FEED       then :bsky_feed
+      when Collection::BSKY_FOLLOW     then :bsky_follow
+      when Collection::BSKY_LIKE       then :bsky_like
+      when Collection::BSKY_LIST       then :bsky_list
+      when Collection::BSKY_LISTBLOCK  then :bsky_listblock
+      when Collection::BSKY_LISTITEM   then :bsky_listitem
+      when Collection::BSKY_POST       then :bsky_post
+      when Collection::BSKY_PROFILE    then :bsky_profile
+      when Collection::BSKY_REPOST     then :bsky_repost
+      when Collection::BSKY_THREADGATE then :bsky_threadgate
       else :unknown
       end
     end

data/lib/skyfall/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Skyfall
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skyfall
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Kuba Suder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base32