proto_turf 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748636abfd68b4fbf48cb1786c3d2617ae0b48400c23e14c9ff03786601a4dd8
-  data.tar.gz: 9b3e76306ecefa2cfe6ca7b097b366d8145ec4c3a2c1dbe59b05625b1d1b37e7
+  metadata.gz: a059f77cfc5a504cf09140a84a578a3609ef40c83074897f8dda0eb42bcc011e
+  data.tar.gz: 1f0156bec33ddd18a48d90a3500b20066bf3a99a57627ef5a811e4efe439a60f
 SHA512:
-  metadata.gz: 58e153ed45709e81d7b1d6d2b35523282d866a20f925e549ace5930daf29d1f2afafadcdd48b383bc7f27e662e401aa72cabc7cbd9e4a3d5bc3abad3f121f0d2
-  data.tar.gz: 5715d4b57c35db06292f30ec6228a19d4e089e65558cf0e2c0c698ec930fc471541a1b92d9743344a173a6b7b67ba2c8593bbe198bca5eb58841112d8f5339ce
+  metadata.gz: 6d7d01d659d17256f3cb3bcba5abb9a1b5634c0e423cb7a0b603855ddbd3c26abb882ca8ae23e651fa5b1e7d39286ff024933fb31c058b57a6077d5b6a4f37ae
+  data.tar.gz: eab1c0e1e9b220a1eb1a9adf2b969adde64298d248816faffa9ed96f15d0ca565997d9d7e201f8d4fef5fe7cf3d128d971720b3393532fb083704bf1ca640774

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## UNRELEASED
+
+# 0.0.2 - 2025-8-14
+
+* Initial release.

data/README.md

@@ -40,9 +40,5 @@ If you're using [buf](https://buf.build/) to manage your Protobuf definitions, y
 
 ## Notes about usage
 
-* For now, this library only supports a single message per `.proto` file that is registered with the Schema Registry. You can reference as many other files and messages as you like from that message, but keeping it to one message per file simplifies the workflow significantly.
 * When decoding, this library does *not* attempt to fully parse the Proto definition stored on the schema registry and generate dynamic classes. Instead, it simply parses out the package and message and assumes that the reader has the message available in the descriptor pool. Any compatibility issues should be detected through normal means, i.e. just by instantiating the message and seeing if any errors are raised.
 
-## TODO
-
-* Support multi-message proto files

data/lib/proto_turf/version.rb

@@ -1,3 +1,3 @@
 class ProtoTurf
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/proto_turf.rb

@@ -90,7 +90,8 @@ class ProtoTurf
   def encode(message, subject: nil)
     load_schemas! if @all_schemas.empty?
 
-    id = register_schema(message.class.descriptor.file_descriptor, subject: subject)
+    file_descriptor = message.class.descriptor.file_descriptor
+    id = register_schema(file_descriptor, subject: subject)
 
     stream = StringIO.new
     # Always start with the magic byte.
@@ -99,9 +100,15 @@ class ProtoTurf
     # The schema id is encoded as a 4-byte big-endian integer.
     stream.write([id].pack("N"))
 
-    # For now, we're only going to support a single message per schema. See
-    # https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format
-    write_int(stream, 0)
+    _, indexes = find_index(message.class.descriptor.to_proto,
+                            file_descriptor.to_proto.message_type)
+
+    if indexes == [0]
+      write_int(stream, 0)
+    else
+      write_int(stream, indexes.length)
+      indexes.each { |i| write_int(stream, i) }
+    end
 
     # Now we write the actual message.
     stream.write(message.to_proto)
@@ -135,17 +142,49 @@ class ProtoTurf
 
     # For now, we're only going to support a single message per schema. See
     # https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format
-    read_int(stream)
+    index_length = read_int(stream)
+    indexes = []
+    if index_length.zero?
+      indexes.push(0)
+    else
+      index_length.times do
+        indexes.push(read_int(stream))
+      end
+    end
 
     schema = @registry.fetch(schema_id)
     encoded = stream.read
-    decode_protobuf(schema, encoded)
+    decode_protobuf(schema, encoded, indexes)
   rescue Excon::Error::NotFound
     raise SchemaNotFoundError.new("Schema with id: #{schema_id} is not found on registry")
   end
 
   private
 
+  def find_index(descriptor, messages, indexes=[])
+    messages.each_with_index do |sub_descriptor, i|
+      if sub_descriptor == descriptor
+        indexes.push(i)
+        return [true, indexes]
+      else
+        found, found_indexes = find_index(descriptor, sub_descriptor.nested_type, indexes + [i])
+        return [true, found_indexes] if found
+      end
+    end
+    []
+  end
+
+  def find_descriptor(indexes, messages)
+    first_index = indexes.shift
+    message = messages[first_index]
+    path = [message.name]
+    while indexes.length.positive?
+      message = message.nested_type[indexes.shift]
+      path.push(message.name)
+    end
+    path
+  end
+
   # Write an int with zig-zag encoding. Copied from Avro.
   def write_int(stream, n)
     n = (n << 1) ^ (n >> 63)
@@ -169,7 +208,7 @@ class ProtoTurf
     (n >> 1) ^ -(n & 1)
   end
 
-  def decode_protobuf(schema, encoded)
+  def decode_protobuf(schema, encoded, indexes)
     # get the package
     package = schema.match(/package (\S+);/)[1]
     # get the first message in the protobuf text
@@ -181,7 +220,9 @@ class ProtoTurf
     unless descriptor
       raise "Could not find schema for #{full_name}. Make sure the corresponding .proto file has been compiled and loaded."
     end
-    descriptor.msgclass.decode(encoded)
+    path = find_descriptor(indexes, descriptor.file_descriptor.to_proto.message_type)
+    correct_message = Google::Protobuf::DescriptorPool.generated_pool.lookup("#{package}.#{path.join('.')}")
+    correct_message.msgclass.decode(encoded)
   end
 
   def register_schema(file_descriptor, subject: nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proto_turf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel Orner
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/proto_turf.rb