google-protobuf 3.6.0-x86-linux → 3.6.1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47b5ab58e98b499a6d2e1cdf0612572a011e0e103e42f94c09530faebc18fd8e
-  data.tar.gz: 7ebb782b8e7ce6d56b0c4edb197c89c78e6f1e648201601e55768b54b805dfd0
+  metadata.gz: 7667454cd59977c5a272e88c81870cdb5d5f6d4a342a6b19c573e20ff3baedff
+  data.tar.gz: 668ef17b67ea46d1eeb5991dc3a3e68787e09321f639098f55ec1b0ae4a2571e
 SHA512:
-  metadata.gz: 97c23abd82faeb77da290e870cc257aa9329d2d92063d3945f0fcfdbccecb56212654f96afae075b6fcfcea7b7ec3c0ca61b17bff775ce79cb05d62819f6d359
-  data.tar.gz: 2be97edb819c0387bd058695b9f7a747955a962aa850074858fc967aeff88d8b326f195d622ab63b33d4b4e21c4e1d07fc28232610a57d356842b92e59ed15be
+  metadata.gz: 302763ef3c277294e212a2e3ca266f3f68eb3286e04199d5e69bccd1e0da37239d95047a79d128b790191ee3a2953f5426e70d8b09f77c45bca53f6091f0d3d0
+  data.tar.gz: cf18bafe8865c96138ee45bfb04b17f3c382da9cba6d86d880f6fb83433f0624570167e6eb2c9a3e54c85a2975b7e8fa9d94cf1f26854df67b6e85a11aa75a99

data/ext/google/protobuf_c/encode_decode.c

@@ -1106,6 +1106,13 @@ static void putmsg(VALUE msg_rb, const Descriptor* desc,
 
   TypedData_Get_Struct(msg_rb, MessageHeader, &Message_type, msg);
 
+  if (desc != msg->descriptor) {
+    rb_raise(rb_eArgError,
+             "The type of given msg is '%s', expect '%s'.",
+             upb_msgdef_fullname(msg->descriptor->msgdef),
+             upb_msgdef_fullname(desc->msgdef));
+  }
+
   for (upb_msg_field_begin(&i, desc->msgdef);
        !upb_msg_field_done(&i);
        upb_msg_field_next(&i)) {

data/ext/google/protobuf_c/storage.c

@@ -177,7 +177,7 @@ void native_slot_set_value_and_case(upb_fieldtype_t type, VALUE type_class,
     }
     case UPB_TYPE_STRING:
       if (CLASS_OF(value) == rb_cSymbol) {
-        value = rb_funcall(value, rb_intern("to_s"), 0, NULL);
+        value = rb_funcall(value, rb_intern("to_s"), 0);
       } else if (CLASS_OF(value) != rb_cString) {
         rb_raise(rb_eTypeError, "Invalid argument for string field.");
       }
@@ -207,7 +207,7 @@ void native_slot_set_value_and_case(upb_fieldtype_t type, VALUE type_class,
     case UPB_TYPE_ENUM: {
       int32_t int_val = 0;
       if (TYPE(value) == T_STRING) {
-        value = rb_funcall(value, rb_intern("to_sym"), 0, NULL);
+        value = rb_funcall(value, rb_intern("to_sym"), 0);
       } else if (!is_ruby_num(value) && TYPE(value) != T_SYMBOL) {
         rb_raise(rb_eTypeError,
                  "Expected number or symbol type for enum field.");

data/tests/basic.rb

@@ -336,7 +336,9 @@ module BasicTest
 
       # strings are immutable so we can't do this, but serialize should catch it.
       m.optional_string = "asdf".encode!('UTF-8')
-      assert_raise RuntimeError do
+      # Ruby 2.5 changed to raise FrozenError. However, assert_raise don't
+      # accept subclass. Don't specify type here.
+      assert_raise do
         m.optional_string.encode!('ASCII-8BIT')
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: x86-linux
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock