google-protobuf 3.18.1-x86-linux → 3.19.1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a8251054ae3b622a9bc9e8460679296aadf3db66e23626ce29651ce54832fb
-  data.tar.gz: bbc463d3b10635409c76765fdc054a3d6f8d56d9b8d66b9410514383fdea4627
+  metadata.gz: 3cf235846f81eab2c9d146de409ae389e719a145dd3216893cc8d0a46dbe25e0
+  data.tar.gz: 79a5931ca51f87a647938de4cb2d48ae1bedb9797dd6c95c4b1f8464eebd038c
 SHA512:
-  metadata.gz: e502e3e5d468b8c8c4eea9d140cd280a04118e3bfb083ea6a7c81eda6317ad94f5c3f96c3265aa423acba17653455ccae8f900c01dfb2078f2d374edb44fad9b
-  data.tar.gz: 22908b1e6e50e2a2fcc34b58cf168ada30df3a1f84aabe4b46cc5657aec0d33e5d85c079774704363746d0f72ce95550f089e7d984ddd5eb8879841355036b2b
+  metadata.gz: b814f82154a5ff69e30b67ba4d75d5e984f430638b7224ed5daefb34785348305811bec62994c8acc9f167be28a694047430fb7c5e1f82bbd4f0ae3df0671133
+  data.tar.gz: 2c9637f5e03e3df88e85095669a9df1dc187e90fd4e45243191d0dda1b7c8807100a74fe1ffea81b1b21194aa2571ac28fa31d2db648d6087276c60e6dd53e18

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
 
@@ -619,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.18.1
+  version: 3.19.1
 platform: x86-linux
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -64,20 +64,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: []
@@ -129,7 +115,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.18.1/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.19.1/ruby
 post_install_message: 
 rdoc_options: []
 require_paths: