google-protobuf 3.6.0-x64-mingw32 → 3.6.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf48c05cc15f69fb9372a2586421c56798cb7c69e5706d4dd42327ebfa66489
-  data.tar.gz: 20dd0468bf3264eeb33909f581ab6282007c75909f068ae91d6ac47d7d55a164
+  metadata.gz: 11fb0823c6031696bd81f02712b69a05faf30d49855314b64c82bb6f7451e19f
+  data.tar.gz: 58fe90c1bae09225c4f49d7581811ed258934c1da936172b4456848f29db40d8
 SHA512:
-  metadata.gz: 66b68fc8e54f80fdfd53a24a706048b6b837a4bba364d5a58ec67af089a327d4d9c1965093e31173277447dd080f09e275c389115c6a45f03e01fe814be6ba5a
-  data.tar.gz: 44152247b3cb94334a46ed99a954015b30dbb6d007ee5b7a1bb9ffd7e67d795ae44b4e4f95f34eee51df133725887c6344d405f6a9319ad75ea400e9889c083c
+  metadata.gz: 68c0e8957c44128d310a8d9dd28a1ac6c851e811f096491b6e1d5ed75d5df51b99de9740df38b977677e1742948bfe683a1ea5b0620172e85cc251303c6a5e07
+  data.tar.gz: adcd67769f32a5d0ae350a2a726dd2ca2f951ae9da380dae26482601a82f05c3585ba581e2e30ddff62eba43dabdcfbcd163d41a564329b7e406cb4754192fef

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: x64-mingw32
 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