google-protobuf 4.27.1-x86_64-darwin → 4.27.2-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f8f4eb771a0ed03e846f3705ebc55ea3a8858ed5e545d8b03682832f19f9da
-  data.tar.gz: aa5d3805f4f734a9f06938342cf2057585a28e0e4308e5a08ec5a1695e68801f
+  metadata.gz: f9590a7a80b712867cdec82ee744930edf39b56727e060c1aaf97f75233ee11d
+  data.tar.gz: a3f76795c5ede0afea539419961f3334be6413c188c391cffc23ff9b4a222f17
 SHA512:
-  metadata.gz: 1ebdcfb3a88206e31aaedcbb81061b6d65eb7947ad90fe892a9ae0f0128e3c4f84692ff9902cdcc83bacc02dd4877c466b9ef2d03939a3c3130e12f1d010d9fb
-  data.tar.gz: dfa666952e6371902b517ed9cf9cb83885fac10bd53f0b828b3f26a53eed3377f1dc6c2daff7bbce9945d17ddc835453396977212c5fcc5ae1894cd326306fbf
+  metadata.gz: a4aaeff6ede41e54de73ea8eb4c6f461fc650e7cea346a890320f61790cbbef3078a5c24bb9998c60bbc35317e5e57642c22cd8701aed5fb037aa04e63760156
+  data.tar.gz: 210ed0b154ae3b77c3ec1bf490eebcf07996622014594410842ee5675160fa226e12b160e291cd5acb586bb88968f267dd88e077778c7a1b800e1791ad628604

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: x86_64-darwin
 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
@@ -190,7 +190,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: