google-protobuf 4.27.1 → 4.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1689f8aaf80c92c7de32a7c9855268c6e7d3cca4ec2f8a5f2003a2437f171cc8
-  data.tar.gz: 70c5c8a1bfe5eb4416b5a478e10c684d6336c656a4bb87c20c239f6d19548e20
+  metadata.gz: ed0702b2b37613a87f420424018e9f4ac5f04c8ecd24bbbe8eef896742165146
+  data.tar.gz: a0fe013361c732b9dcb6430dc92444869303426b4670921a8dc08f4178528bc9
 SHA512:
-  metadata.gz: 1b0c148a0b05451581069cab709e02bfeb64b4f2ef25bd410bf200e140b0e6aa5c12d81e00321e48667d861f7af5707d43d3ec858357fccd0508cbb8a0405ff1
-  data.tar.gz: 3be5e7abd0fd576b9ebc1564c37a553fa24bee8404b3d4f727879e734c07125e161826e7c53aefd963fb6b07306d112e5056f6c4850cd24770822f6d195cd05d
+  metadata.gz: 9f908beee8408e633869c417a2397d319acc629fc5255f18da568647d76fc680711280be57055a4bbf1444fe0789dc730416e8f17142044102ac90d6dad2fe23
+  data.tar.gz: 032c01bfe89544c82f9028468e8db1a22129dfa2dc0132d52a39b1b5b2bbe4481b610484c4df7510d0c0df117027ad5171fa67efabc94e364d8ec69034bb8139

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.2
 platform: ruby
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-25 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.2/ruby
 post_install_message: 
 rdoc_options: []
 require_paths: