google-protobuf 3.18.0 → 3.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f2dcb01a739e3c119f6e7e7a5a5c941fd5ee836b10b910c5da89ebcdf12fc3
-  data.tar.gz: 585efb56cdd7925d0e81ee2fb34c746c943fd4d4744a2213b1cefc5b98ee8f25
+  metadata.gz: 50ca7252b0a388069de54b5c0a5fdc52c9322db5ed2bc50a8b7bf566d87e4086
+  data.tar.gz: a5648c645a3028a3344af64ea44e7c27ef831e4e4cffb346cd367ed05743dbc8
 SHA512:
-  metadata.gz: a076e9f325b025a642aecf4cfb964e78747e9e69ba55122f012bf82ee79146ea5ef9e299df52cda670c074ff46c6cb46d962cced6911ebd27877cd7f5c8db54e
-  data.tar.gz: e30941aee70746583a3a0f48dd8303113d799e3d6d95653224800f398bd1188e1fa3dd20113e8d1fff6f4ee340cc44ac30c2714210981342d87bfb99b0a90126
+  metadata.gz: a638b95e37e223648f6266a1b8759a1648c11a8d0508996627ddcff704b470885b28d8a5db0d506b67fd3493312c61d94237aa3fec16609ba3a7967cd91062bd
+  data.tar.gz: e49def45fba20fd7b686a08dc059be02b95c6f7c3fef23f55eacd8ac0efc8e039c1f21647d14d5c288732b7452ebabdc6e14b5427aa2a16211760b1e73e1ace2

data/ext/google/protobuf_c/map.c

@@ -680,7 +680,10 @@ void Map_register(VALUE module) {
   rb_define_method(klass, "delete", Map_delete, 1);
   rb_define_method(klass, "clear", Map_clear, 0);
   rb_define_method(klass, "length", Map_length, 0);
+  rb_define_method(klass, "size", Map_length, 0);
   rb_define_method(klass, "dup", Map_dup, 0);
+  // Also define #clone so that we don't inherit Object#clone.
+  rb_define_method(klass, "clone", Map_dup, 0);
   rb_define_method(klass, "==", Map_eq, 1);
   rb_define_method(klass, "freeze", Map_freeze, 0);
   rb_define_method(klass, "hash", Map_hash, 0);

data/ext/google/protobuf_c/message.c

@@ -1012,7 +1012,6 @@ static VALUE Message_decode_json(int argc, VALUE* argv, VALUE klass) {
  */
 static VALUE Message_encode(VALUE klass, VALUE msg_rb) {
   Message* msg = ruby_to_Message(msg_rb);
-  upb_arena *arena = upb_arena_new();
   const char *data;
   size_t size;
 
@@ -1020,6 +1019,8 @@ static VALUE Message_encode(VALUE klass, VALUE msg_rb) {
     rb_raise(rb_eArgError, "Message of wrong type.");
   }
 
+  upb_arena *arena = upb_arena_new();
+
   data = upb_encode(msg->msg, upb_msgdef_layout(msg->msgdef), arena,
                     &size);
 

data/lib/google/protobuf/api_pb.rb

@@ -1,9 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: google/protobuf/api.proto
 
+require 'google/protobuf'
+
 require 'google/protobuf/source_context_pb'
 require 'google/protobuf/type_pb'
-require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("google/protobuf/api.proto", :syntax => :proto3) do

data/lib/google/protobuf/descriptor_pb.rb

@@ -1,6 +1,8 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: google/protobuf/descriptor.proto
 
+require 'google/protobuf'
+
 descriptor_data = File.binread(__FILE__).split("\n__END__\n", 2)[1]
 Google::Protobuf::DescriptorPool.generated_pool.add_serialized_file(descriptor_data)
 

data/lib/google/protobuf/type_pb.rb

@@ -1,9 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: google/protobuf/type.proto
 
+require 'google/protobuf'
+
 require 'google/protobuf/any_pb'
 require 'google/protobuf/source_context_pb'
-require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("google/protobuf/type.proto", :syntax => :proto3) do

data/lib/google/protobuf/well_known_types.rb

@@ -85,6 +85,11 @@ module Google
       def from_time(time)
         self.seconds = time.to_i
         self.nanos = time.nsec
+        self
+      end
+
+      def self.from_time(time)
+        new.from_time(time)
       end
 
       def to_i

data/lib/google/protobuf.rb

@@ -51,9 +51,9 @@ else
     require 'google/protobuf_c'
   end
 
-  require 'google/protobuf/descriptor_dsl'
 end
 
+require 'google/protobuf/descriptor_dsl'
 require 'google/protobuf/repeated_field'
 
 module Google

data/tests/basic.rb

@@ -66,7 +66,8 @@ module BasicTest
     def test_issue_8559_crash
       msg = TestMessage.new
       msg.repeated_int32 = ::Google::Protobuf::RepeatedField.new(:int32, [1, 2, 3])
-      GC.start(full_mark: true, immediate_sweep: true)
+      # TODO: Remove the platform check once https://github.com/jruby/jruby/issues/6818 is released in JRuby 9.3.0.0
+      GC.start(full_mark: true, immediate_sweep: true) unless RUBY_PLATFORM == "java"
       TestMessage.encode(msg)
     end
 
@@ -168,6 +169,17 @@ module BasicTest
       assert_equal nil, m.singular_msg
     end
 
+    def test_import_proto2
+      m = TestMessage.new
+      assert !m.has_optional_proto2_submessage?
+      m.optional_proto2_submessage = ::FooBar::Proto2::TestImportedMessage.new
+      assert m.has_optional_proto2_submessage?
+      assert TestMessage.descriptor.lookup('optional_proto2_submessage').has?(m)
+
+      m.clear_optional_proto2_submessage
+      assert !m.has_optional_proto2_submessage?
+    end
+
     def test_clear_repeated_fields
       m = TestMessage.new
 
@@ -487,6 +499,7 @@ module BasicTest
         :optional_int64=>0,
         :optional_msg=>nil,
         :optional_msg2=>nil,
+        :optional_proto2_submessage=>nil,
         :optional_string=>"foo",
         :optional_uint32=>0,
         :optional_uint64=>0,
@@ -607,5 +620,21 @@ module BasicTest
       assert_raise(FrozenErrorType) { m.map_string_int32.delete('a') }
       assert_raise(FrozenErrorType) { m.map_string_int32.clear }
     end
+
+    def test_map_length
+      m = proto_module::MapMessage.new
+      assert_equal 0, m.map_string_int32.length
+      assert_equal 0, m.map_string_msg.length
+      assert_equal 0, m.map_string_int32.size
+      assert_equal 0, m.map_string_msg.size
+
+      m.map_string_int32['a'] = 1
+      m.map_string_int32['b'] = 2
+      m.map_string_msg['a'] = proto_module::TestMessage2.new
+      assert_equal 2, m.map_string_int32.length
+      assert_equal 1, m.map_string_msg.length
+      assert_equal 2, m.map_string_int32.size
+      assert_equal 1, m.map_string_msg.size
+    end
   end
 end

data/tests/stress.rb

@@ -30,7 +30,7 @@ module StressTest
       100_000.times do
         mnew = TestMessage.decode(data)
         mnew = mnew.dup
-        assert_equal mnew.inspect, m.inspect
+        assert_equal m.inspect, mnew.inspect
         assert TestMessage.encode(mnew) == data
       end
     end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.2
 platform: ruby
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.9
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
 description: Protocol Buffers are Google's data interchange format.
 email: protobuf@googlegroups.com
 executables: []
@@ -124,7 +104,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.18.0/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.19.2/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -140,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.3.4
 signing_key: 
 specification_version: 4
 summary: Protocol Buffers