google-protobuf 3.16.0.rc.1 → 3.16.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57569c93833158d3d6d9da018bd50eb632b14dd1fe7053f71eca7a3a02c64f5
-  data.tar.gz: 42dd6340c3cc428bda4bd11a87a87a91dd7e6120fc3abe93529270d11208f8e7
+  metadata.gz: bfaf150069e2b2c2925d46d165a12f301785ba5910b6047983597628c4e9c5d5
+  data.tar.gz: 9e53268efb4ab1d0efe410a5b3a4c18052fbe87cc3e6ae950f03cde4b16c2db9
 SHA512:
-  metadata.gz: 24e7315eb7726d3868d90aef56505147ca2559c145dbfd0bf9d500f8ac339de7eabb624d657a24ab8b46ece53cfe4fb79648b16a2b2f1592a574605a4c865de9
-  data.tar.gz: 55a75221f8ec087613ecdee1faefb84538d444be11d7030270b69d356e20f3aa1d15128a1ecf2a944a76b385a99d79216f7b2f1dc6d6b4ffaeff945cd2098bfb
+  metadata.gz: 2f01304f4626f148421445a5b9bfe1662d910f017419258a58e2808acf5abb3eb1471222a21b3593c3ec38ef5bd396d3d5dcb56e500592237e95260dc7f7bce5
+  data.tar.gz: 1a57e3e9456dd80496dba69dc4cffe64e75a2c5943366dc81c5db2647ca64728cea07de4a04422e6764f3d6fb26bd9a2cb0c656f9b1efff3252e74d20d2f51d9

data/ext/google/protobuf_c/defs.c

@@ -868,6 +868,20 @@ static VALUE FieldDescriptor_default(VALUE _self) {
   return Convert_UpbToRuby(default_val, TypeInfo_get(self->fielddef), Qnil);
 }
 
+
+/*
+ * call-seq:
+ *     FieldDescriptor.json_name => json_name
+ *
+ * Returns this field's json_name, as a Ruby string, or nil if not yet set.
+ */
+static VALUE FieldDescriptor_json_name(VALUE _self) {
+  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
+  const upb_fielddef *f = self->fielddef;
+  const char *json_name = upb_fielddef_jsonname(f);
+  return rb_str_new2(json_name);
+}
+
 /*
  * call-seq:
  *     FieldDescriptor.label => label
@@ -1043,6 +1057,7 @@ static void FieldDescriptor_register(VALUE module) {
   rb_define_method(klass, "name", FieldDescriptor_name, 0);
   rb_define_method(klass, "type", FieldDescriptor__type, 0);
   rb_define_method(klass, "default", FieldDescriptor_default, 0);
+  rb_define_method(klass, "json_name", FieldDescriptor_json_name, 0);
   rb_define_method(klass, "label", FieldDescriptor_label, 0);
   rb_define_method(klass, "number", FieldDescriptor_number, 0);
   rb_define_method(klass, "submsg_name", FieldDescriptor_submsg_name, 0);
@@ -1750,6 +1765,16 @@ static void msgdef_add_field(VALUE msgbuilder_rb, upb_label_t label, VALUE name,
           field_proto,
           FileBuilderContext_strdup(self->file_builder, default_value));
     }
+
+    if (rb_funcall(options, rb_intern("key?"), 1,
+                   ID2SYM(rb_intern("json_name"))) == Qtrue) {
+      VALUE json_name =
+          rb_hash_lookup(options, ID2SYM(rb_intern("json_name")));
+
+      google_protobuf_FieldDescriptorProto_set_json_name(
+          field_proto,
+          FileBuilderContext_strdup(self->file_builder, json_name));
+    }
   }
 
   if (oneof_index >= 0) {
@@ -1899,18 +1924,20 @@ static VALUE MessageBuilderContext_required(int argc, VALUE* argv,
  */
 static VALUE MessageBuilderContext_repeated(int argc, VALUE* argv,
                                             VALUE _self) {
-  VALUE name, type, number, type_class;
+  VALUE name, type, number;
+  VALUE type_class, options = Qnil;
 
-  if (argc < 3) {
-    rb_raise(rb_eArgError, "Expected at least 3 arguments.");
+  rb_scan_args(argc, argv, "32", &name, &type, &number, &type_class, &options);
+
+  // Allow passing (name, type, number, options) or
+  // (name, type, number, type_class, options)
+  if (argc == 4 && RB_TYPE_P(type_class, T_HASH)) {
+    options = type_class;
+    type_class = Qnil;
   }
-  name = argv[0];
-  type = argv[1];
-  number = argv[2];
-  type_class = (argc > 3) ? argv[3] : Qnil;
 
   msgdef_add_field(_self, UPB_LABEL_REPEATED, name, type, number, type_class,
-                   Qnil, -1, false);
+                   options, -1, false);
 
   return Qnil;
 }

data/ext/google/protobuf_c/protobuf.c

@@ -180,6 +180,7 @@ static void Arena_mark(void *data) {
 static void Arena_free(void *data) {
   Arena *arena = data;
   upb_arena_free(arena->arena);
+  xfree(arena);
 }
 
 static VALUE cArena;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.16.0.rc.1
+  version: 3.16.0.rc.2
 platform: ruby
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -123,7 +123,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.16.0-rc1/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.16.0-rc2/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Protocol Buffers