google-protobuf 4.27.1 → 4.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1689f8aaf80c92c7de32a7c9855268c6e7d3cca4ec2f8a5f2003a2437f171cc8
-  data.tar.gz: 70c5c8a1bfe5eb4416b5a478e10c684d6336c656a4bb87c20c239f6d19548e20
+  metadata.gz: 1c08d8f8e7583f0f04cd7e83a1023c160a074722aa7f0b5e6c49be757b9c0da4
+  data.tar.gz: 53068a08d715f9fc871a6048a1fd2e92a507ec1852a7219277761848ce79cbe5
 SHA512:
-  metadata.gz: 1b0c148a0b05451581069cab709e02bfeb64b4f2ef25bd410bf200e140b0e6aa5c12d81e00321e48667d861f7af5707d43d3ec858357fccd0508cbb8a0405ff1
-  data.tar.gz: 3be5e7abd0fd576b9ebc1564c37a553fa24bee8404b3d4f727879e734c07125e161826e7c53aefd963fb6b07306d112e5056f6c4850cd24770822f6d195cd05d
+  metadata.gz: c5e1eb75b14e7f0019fdabb890b8bd8f9b5433793f4f0f30f183da396cec801ee21b27e96a8c7e44476c4005a4c90c34eedc42bdf82320a866231713ef9a7bf9
+  data.tar.gz: 319d39c3b6df81ec9c23cf1bcb14e922a398a95d33c7999db89bbb93b1ea07306c28c726ea028f5ae02f2e1aa0d1385c6aaff2d1b99da7e69d2f6f6b91236f51

data/ext/google/protobuf_c/convert.c

@@ -204,7 +204,8 @@ upb_MessageValue Convert_RubyToUpb(VALUE value, const char* name,
           ret.uint64_val = NUM2ULL(value);
           break;
         default:
-          break;
+          rb_raise(cTypeError, "Convert_RubyToUpb(): Unexpected type %d",
+                   (int)type_info.type);
       }
       break;
     default:

data/ext/google/protobuf_c/defs.c

@@ -1510,7 +1510,7 @@ static VALUE MethodDescriptor_initialize(VALUE _self, VALUE cookie,
   }
 
   RB_OBJ_WRITE(_self, &self->descriptor_pool, descriptor_pool);
-  self->methoddef = (const upb_ServiceDef*)NUM2ULL(ptr);
+  self->methoddef = (const upb_MethodDef*)NUM2ULL(ptr);
 
   return Qnil;
 }

data/ext/google/protobuf_c/ruby-upb.c

@@ -13212,8 +13212,7 @@ bool _upb_FieldDef_ValidateUtf8(const upb_FieldDef* f) {
 
 bool _upb_FieldDef_IsGroupLike(const upb_FieldDef* f) {
   // Groups are always tag-delimited.
-  if (UPB_DESC(FeatureSet_message_encoding)(upb_FieldDef_ResolvedFeatures(f)) !=
-      UPB_DESC(FeatureSet_DELIMITED)) {
+  if (f->type_ != kUpb_FieldType_Group) {
     return false;
   }
 
@@ -13647,12 +13646,6 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
       UPB_DESC(FieldDescriptorProto_has_type_name)(field_proto);
 
   f->type_ = (int)UPB_DESC(FieldDescriptorProto_type)(field_proto);
-  if (f->type_ == kUpb_FieldType_Message &&
-      // TODO: remove once we can deprecate kUpb_FieldType_Group.
-      UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) ==
-          UPB_DESC(FeatureSet_DELIMITED)) {
-    f->type_ = kUpb_FieldType_Group;
-  }
 
   if (has_type) {
     switch (f->type_) {
@@ -13673,7 +13666,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
     }
   }
 
-  if (!has_type && has_type_name) {
+  if ((!has_type && has_type_name) || f->type_ == kUpb_FieldType_Message) {
     f->type_ =
         UPB_FIELD_TYPE_UNSPECIFIED;  // We'll assign this in resolve_subdef()
   } else {
@@ -13823,8 +13816,15 @@ static void resolve_subdef(upb_DefBuilder* ctx, const char* prefix,
           break;
         case UPB_DEFTYPE_MSG:
           f->sub.msgdef = def;
-          f->type_ = kUpb_FieldType_Message;  // It appears there is no way of
-                                              // this being a group.
+          f->type_ = kUpb_FieldType_Message;
+          // TODO: remove once we can deprecate
+          // kUpb_FieldType_Group.
+          if (UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) ==
+                  UPB_DESC(FeatureSet_DELIMITED) &&
+              !upb_MessageDef_IsMapEntry(def) &&
+              !(f->msgdef && upb_MessageDef_IsMapEntry(f->msgdef))) {
+            f->type_ = kUpb_FieldType_Group;
+          }
           f->has_presence = !upb_FieldDef_IsRepeated(f);
           break;
         default:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 4.27.1
+  version: 4.27.5
 platform: ruby
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -188,7 +188,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.27.1/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.27.5/ruby
 post_install_message: 
 rdoc_options: []
 require_paths: