google-protobuf 3.6.0-x86-mingw32 → 3.6.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21cb98947ceb60e539d5e17d91bb2c1776d7afce6ddf42fa7598caef7248d2fd
-  data.tar.gz: b12b875f691d822e8a3dd0876155fc46e789caa943607c551ab5a807a8d890a2
+  metadata.gz: 8ae99c60d07ea472fe76ad66afb1fca5a493dce9f0ed696dfa79b6ec08b61236
+  data.tar.gz: 211a0435909b906b2ad3492fc364c9a6466ce71f474eb1acb766be2c7d3106df
 SHA512:
-  metadata.gz: 37041c185969eeeb156f8146f33342bdca11216b0583a11cabd027e1b3823114ff8ca3fed94ab49fa771056c6b39e10c9c5fdf910dad9d27875d0b83c3e32527
-  data.tar.gz: afbdc52dbeef8f08a88ea00cc4e9dbe958c446558053d9268c8dd4ed19c4f8c02a9e88a53764da2b07bb5851519c6b1cf636bc73e7a8e3ab3955695bdc922771
+  metadata.gz: 2b05fd47b557e1c5e6e486c573db3d192bbe3ce0d9b54362b6fc42c2f58214a67ba5d9382209ab4f66d522ad8f25462bee0f35e772561680e39703bccdf43cc8
+  data.tar.gz: be78be18ad0273d1d911d7d4cc06479ede0e9ea578242227534edd43f1187ddecae028ee660070144209f9717769c417ad914f3f829e7c644c6a379cc324d106

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-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