skyfall 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52f2f3c63530b1e032666c7bfb71ba0b0279bfe0128c7432b8e267f1e2f9e95
-  data.tar.gz: 1c7e2e5cac7ec4f421be5c291a311dede53221150901a44418f01f7a6cdeae9e
+  metadata.gz: fb0b83e7dfffdd7d36673ef3b1472ab6efdefbca6f39c2b80a5a1cf80061b4f2
+  data.tar.gz: 6edbd2f5b2130197de5b41e902047bceb0e243867eed517f40bfb7b169c9d427
 SHA512:
-  metadata.gz: 1eb9556cbc363f6a9c2ae42d27dc9a4471a24f8e08f0b1b8046c131fe320b63de73498d839367f0fd89c3841b27877c53bc0a937b9eeed41ea486f05b55a38c3
-  data.tar.gz: 9b61caf5cc63834efd8185622c435a9102b4a310f890a988fd029e9e691e80acf7527e0afc5e5fecde967c4f2de538559168d07a72a2af4dd9d5ef06cc16ab50
+  metadata.gz: f145928fb2afc5ad2ace9a0614d2f0b4debfa0b76eab52cf98f59624e091c170ff397130e87d9d64a007d66856ca69b31cb406a022ea3a72641c03580b3fc9b8
+  data.tar.gz: c137e90709bf92171f1f8731687b3916ab72cf27cecf5392e8cc001adfacd0ebcc36ab03263997784c64685faa037ff15a1366de29da8b8c590948e93dc48e14

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.7.2] - 2026.08-17
+
+- bumped up Oxygene dependency (see below under 0.7.1) to 0.1, with a stricter dependency rule
+  - includes various performance improvements for Base 32 en/decoding, CID & CAR parsing
+  - commit message decoding can be around 30% faster
+- un-deprecated `#path` in both `Operation` classes (marked deprecated in 0.7.0)
+- added `#ops` as alias for `#operations` in all message classes
+- fixed `CommitMessage#prev_data` throwing an error if `prevData` is nil
+- updated Firehose message constructors to verify that required fields aren't nil (not only that they're present), and for `LabelsMessage` that `labels` is an array
+- some minor optimizations
+- added some unit tests
+
 ## [0.7.1] - 2026-08-05
 
 - extracted `CID` and `CarArchive` to a new gem "oxygene"

data/lib/skyfall/firehose/commit_message.rb

@@ -40,7 +40,7 @@ module Skyfall
 
     # @return [Oxygene::CID, nil] CID (Content Identifier) of data of the previous commit in the repo
     def prev_data
-      @prev_data ||= Oxygene::CID.from_cbor_tag(@data_object['prevData'])
+      @prev_data ||= @data_object['prevData'] && Oxygene::CID.from_cbor_tag(@data_object['prevData'])
     end
 
     # @return [Oxygene::CID] CID (Content Identifier) of the commit
@@ -60,11 +60,14 @@ module Skyfall
       @operations ||= @data_object['ops'].map { |op| Firehose::Operation.new(self, op) }
     end
 
+    alias ops operations
+
     # Looks up record data assigned to a given operation in the commit's CAR archive.
     # @param op [Firehose::Operation]
     # @return [Hash, nil]
     def raw_record_for_operation(op)
-      op.cid && blocks.section_with_cid(op.cid)
+      cid = op.cid
+      cid && blocks.section_with_cid(cid, use_map: false, return_body: false)&.json_body
     end
   end
 end

data/lib/skyfall/firehose/labels_message.rb

@@ -28,7 +28,10 @@ module Skyfall
       super
       check_if_not_nil 'seq', 'labels'
 
-      @labels = @data_object['labels'].map { |x| Label.new(x) }
+      label_data = @data_object['labels']
+      raise DecodeError.new("Invalid labels field") unless label_data.is_a?(Array)
+
+      @labels = label_data.map { |x| Label.new(x) }
     end
 
     protected

data/lib/skyfall/firehose/message.rb

@@ -109,6 +109,8 @@ module Skyfall
       []
     end
 
+    alias ops operations
+
     #
     # @return [Boolean] true if the message is {Firehose::UnknownMessage} (of unrecognized type)
     #
@@ -157,13 +159,13 @@ module Skyfall
 
     # Note: this method is written this way as an optimization
     def check_if_not_nil(a, b = nil, c = nil, d = nil, e = nil, f = nil, g = nil)
-      ok =   @data_object.has_key?(a)
-      ok &&= @data_object.has_key?(b) if b
-      ok &&= @data_object.has_key?(c) if c
-      ok &&= @data_object.has_key?(d) if d
-      ok &&= @data_object.has_key?(e) if e
-      ok &&= @data_object.has_key?(f) if f
-      ok &&= @data_object.has_key?(g) if g
+      ok =   !@data_object[a].nil?
+      ok &&= !@data_object[b].nil? if b
+      ok &&= !@data_object[c].nil? if c
+      ok &&= !@data_object[d].nil? if d
+      ok &&= !@data_object[e].nil? if e
+      ok &&= !@data_object[f].nil? if f
+      ok &&= !@data_object[g].nil? if g
 
       if !ok
         expected_fields = [a, b, c, d, e, f, g].compact
@@ -183,10 +185,6 @@ module Skyfall
 
       type, data = objects
 
-      if data['error']
-        raise SubscriptionError.new(data['error'], data['message'])
-      end
-
       raise DecodeError.new("Invalid object type: #{type.inspect}") unless type.is_a?(Hash)
       raise DecodeError.new("Missing data: #{type.inspect}") unless type['op'] && type['t']
       raise DecodeError.new("Invalid object type: #{type['op'].inspect}") unless type['op'].is_a?(Integer)
@@ -195,6 +193,10 @@ module Skyfall
       raise UnsupportedError.new("Unsupported version: #{type['op']}") unless type['op'] == 1
       raise DecodeError.new("Invalid object type: #{data.inspect}") unless data.is_a?(Hash)
 
+      if data['error']
+        raise SubscriptionError.new(data['error'], data['message'])
+      end
+
       [type, data]
     end
 

data/lib/skyfall/firehose/operation.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../collection'
+require_relative '../errors'
 require_relative '../firehose'
 require 'oxygene'
 
@@ -42,36 +43,40 @@ module Skyfall
     alias did repo
 
     # @return [String] path part of the record URI (collection + rkey)
-    # @deprecated Use {#collection} + {#rkey}
     def path
-      @@path_warning_printed ||= false
-
-      unless @@path_warning_printed
-        $stderr.puts "Warning: Skyfall::Firehose::Operation#path is deprecated - use #collection + #rkey"
-        @@path_warning_printed = true
-      end
-
       @json['path']
     end
 
     # @return [Symbol] type of the operation (`:create`, `:update` or `:delete`)
     def action
-      @json['action'].to_sym
+      @action ||= @json['action'].to_sym
     end
 
     # @return [String] record collection NSID
     def collection
-      @json['path'].split('/')[0]
+      @collection ||= begin
+        path = @json['path']
+        slash = path.index('/')
+        raise DecodeError, "Path doesn't contain a /: #{path}" if slash.nil?
+
+        path[0...slash]
+      end
     end
 
     # @return [String] record rkey
     def rkey
-      @json['path'].split('/')[1]
+      @rkey ||= begin
+        path = @json['path']
+        slash = path.index('/')
+        raise DecodeError, "Path doesn't contain a /: #{path}" if slash.nil?
+
+        path[(slash + 1)..-1]
+      end
     end
 
     # @return [String] full AT URI of the record
     def uri
-      "at://#{repo}/#{@json['path']}"
+      @uri ||= "at://#{repo}/#{path}"
     end
 
     # @return [Oxygene::CID, nil] CID (Content Identifier) of the record (nil for delete operations)

data/lib/skyfall/jetstream/commit_message.rb

@@ -45,5 +45,7 @@ module Skyfall
     def operations
       [operation]
     end
+
+    alias ops operations
   end
 end

data/lib/skyfall/jetstream/message.rb

@@ -114,6 +114,8 @@ module Skyfall
       []
     end
 
+    alias ops operations
+
     #
     # Timestamp decoded from the message.
     #

data/lib/skyfall/jetstream/operation.rb

@@ -42,16 +42,8 @@ module Skyfall
     alias did repo
 
     # @return [String] path part of the record URI (collection + rkey)
-    # @deprecated Use {#collection} + {#rkey}
     def path
-      @@path_warning_printed ||= false
-
-      unless @@path_warning_printed
-        $stderr.puts "Warning: Skyfall::Jetstream::Operation#path is deprecated - use #collection + #rkey"
-        @@path_warning_printed = true
-      end
-
-      @json['collection'] + '/' + @json['rkey']
+      @path ||= "#{@json['collection']}/#{@json['rkey']}"
     end
 
     # @return [Symbol] type of the operation (`:create`, `:update` or `:delete`)

data/lib/skyfall/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skyfall
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Kuba Suder
@@ -47,16 +47,16 @@ dependencies:
   name: oxygene
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 description: "\n    Skyfall is a Ruby gem for connecting to the \"firehose\" of the
   AT Protocol network that Bluesky is built on,\n    i.e. a websocket which streams
   all new posts and everything else happening on the network in real time. The code\n