google-protobuf 3.19.2-java → 3.20.0.rc.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743c901a3e0ea1ab30b8f8f2605f7f81b80437fb633f742ea203ec8b19f34924
-  data.tar.gz: 5eac1834597c4dab4efda0cc7e1d124f43546f6317cd7f7e7d9089547662f06e
+  metadata.gz: c4bff95b4c9cc0eaa1919591d364931caf3afbd4a762054321177907e757aa8d
+  data.tar.gz: 72a63586a7b39db79cf0cb4227f944b28641e855a437b6e6f4d5d210b8cb6860
 SHA512:
-  metadata.gz: 9e9e8d1192419a798a1a15622c862b53a3d05784f35efefaeb82d7514025a5c82781073489a7b7b4c1ce484619bfdb034fba1eeb5a4b0e9c3f07858e4ddc53c5
-  data.tar.gz: 1d83100c7872dd478683fc39305b9ed03e3923c486622889b740520970dddffcbb0b2a1ce7099abe4009580262b09aa8a50fa6ab3e739080142b3f451c6cc3ce
+  metadata.gz: 69bf5a9cacfd87d4daafef41c823d932d6879b2b5cf00df4b21f963262616aa6af2befd13b53b1197e17e158a355c19bcc96ac7de2fa2c1858722b27eb1e2ec8
+  data.tar.gz: d9ab3969ba4b9c514135bdf9dad0d431f1a9b395f99b0889c392cfa3d51d282ab97063065e57c7d6a32a90c9753870386e2d3660deddd647451561485202e611

data/lib/google/protobuf/descriptor_dsl.rb

@@ -2,7 +2,14 @@
 #
 # Code that implements the DSL for defining proto messages.
 
-require 'google/protobuf/descriptor_pb'
+# Suppress warning: loading in progress, circular require considered harmful.
+# This circular require is intentional to avoid missing dependency.
+begin
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  require 'google/protobuf/descriptor_pb'
+ensure
+  $VERBOSE = old_verbose
+end
 
 module Google
   module Protobuf

data/lib/google/protobuf/descriptor_pb.rb

@@ -192,12 +192,13 @@ deprecated 
(:false
 deprecated 
(:false
 	map_entry 
(C
 uninterpreted_option� (2$.google.protobuf.UninterpretedOption*	�����JJJJ	J	
-"�
+"�
 FieldOptions:
 ctype
 
(2#.google.protobuf.FieldOptions.CType:STRING
 packed 
(?
 jstype 
(2$.google.protobuf.FieldOptions.JSType:	JS_NORMAL
-lazy 
(:false
+lazy 
(:false
+unverified_lazy 
(:false
 
 deprecated 
(:false
 weak

data/lib/google/protobuf/message_exts.rb

@@ -44,8 +44,8 @@ module Google
         self.class.encode_json(self, options)
       end
 
-      def to_proto
-        self.class.encode(self)
+      def to_proto(options = {})
+        self.class.encode(self, options)
       end
 
     end

data/lib/google/protobuf/well_known_types.rb

@@ -82,16 +82,16 @@ module Google
         end
       end
 
+      def self.from_time(time)
+        new.from_time(time)
+      end
+
       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
         self.seconds
       end
@@ -137,10 +137,14 @@ module Google
         end
       end
 
+      def self.from_ruby(value)
+        self.new.from_ruby(value)
+      end
+
       def from_ruby(value)
         case value
         when NilClass
-          self.null_value = 0
+          self.null_value = :NULL_VALUE
         when Numeric
           self.number_value = value
         when String
@@ -160,6 +164,8 @@ module Google
         else
           raise UnexpectedStructType
         end
+
+        self
       end
     end
 
@@ -230,6 +236,5 @@ module Google
         ret
       end
     end
-
   end
 end

data/lib/google/protobuf.rb

@@ -59,16 +59,16 @@ require 'google/protobuf/repeated_field'
 module Google
   module Protobuf
 
-    def self.encode(msg)
-      msg.to_proto
+    def self.encode(msg, options = {})
+      msg.to_proto(options)
     end
 
     def self.encode_json(msg, options = {})
       msg.to_json(options)
     end
 
-    def self.decode(klass, proto)
-      klass.decode(proto)
+    def self.decode(klass, proto, options = {})
+      klass.decode(proto, options)
     end
 
     def self.decode_json(klass, json, options = {})

data/tests/basic.rb

@@ -71,6 +71,14 @@ module BasicTest
       TestMessage.encode(msg)
     end
 
+    def test_issue_9440
+      msg = HelloRequest.new
+      msg.id = 8
+      assert_equal 8, msg.id
+      msg.version = '1'
+      assert_equal 8, msg.id
+    end
+
     def test_has_field
       m = TestSingularFields.new
       assert !m.has_singular_msg?
@@ -636,5 +644,19 @@ module BasicTest
       assert_equal 2, m.map_string_int32.size
       assert_equal 1, m.map_string_msg.size
     end
+
+    def test_string_with_singleton_class_enabled
+      str = 'foobar'
+      # NOTE: Accessing a singleton class of an object changes its low level class representation
+      #       as far as the C API's CLASS_OF() method concerned, exposing the issue
+      str.singleton_class
+      m = proto_module::TestMessage.new(
+        optional_string: str,
+        optional_bytes: str
+      )
+
+      assert_equal str, m.optional_string
+      assert_equal str, m.optional_bytes
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.19.2
+  version: 3.20.0.rc.1
 platform: java
 authors:
 - Protobuf Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.19.2/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.20.0-rc1/ruby
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -86,9 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: