skyfall 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a508caa504715c30f9d9ff68dbf419c8b88ad00e5fbc6315ae6a3abb624e167
-  data.tar.gz: 9010ece05b7f1cce0a2573ecfa75965d1dba2b77cd7926eaa8fc510f8e2ae7e2
+  metadata.gz: 3917568c1283d599d3103b428599141e04d0df2cce33c4b17291bc935b8add4d
+  data.tar.gz: 329dd70a2f17bb689fa0a10c6646c7f522c1ac165b1e0ef49f96cd5b6d746d57
 SHA512:
-  metadata.gz: b9fc0370411496e76a4caaa7b2795e999b2fbf3445e21a02e3b9135e4c7fc5e3766d7ea3a94e145becf3ab96fd4d494b0f7d8a04a09eee03698a97125d44238d
-  data.tar.gz: b302a5f7eefc30509a6b721809105bd9439f6919b31ab73878d132fa8a67062d0d77c17d375d3d433cb77bbba63127a823d1817f5d1a71f16c2b6601dca7d493
+  metadata.gz: '09e6812b1234a0f7e4aeab3dee4fe962b47a781d7ddcf1151b1f310558e72837808caee9c1ca0d4e98f7e137e7147b72c8bdcd9ae17501c48f1d1dcc1a32ca35'
+  data.tar.gz: 5c558d41a7fc49ecc34273a791dc26a706c00708ca0b00b09a59d5bdc4684ff4f14611c065e35343f65d7989a948e5294b7c9edc55b41426f5b2eae893bea392

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [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)
+
 ## [0.2.1] - 2023-08-19
 
 - optimized `WebsocketMessage` parsing performance - lazy parsing of most properties (message decoding should be over 50% faster on average)

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'
 
@@ -32,11 +33,46 @@ module Skyfall
     end
 
     def section_with_cid(cid)
-      @sections.detect { |s| s.cid == cid }&.body
+      section = @sections.detect { |s| s.cid == cid }
+      section && section.body
     end
 
     private
 
+    def convert_data(object)
+      if object.is_a?(Hash)
+        object.each do |k, v|
+          if v.is_a?(Hash) || v.is_a?(Array)
+            convert_data(v)
+          elsif v.is_a?(CBOR::Tagged)
+            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_data(v)
+          elsif v.is_a?(CBOR::Tagged)
+            object[i] = make_cid_link(v)
+          elsif v.is_a?(String) && v.encoding == Encoding::ASCII_8BIT
+            object[i] = make_bytes(v)
+          end
+        end
+      else
+        raise DecodeError, "Unexpected value type in record: #{object}"
+      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
 
@@ -77,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.1"
+  VERSION = "0.2.3"
 end

metadata

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