google-protobuf 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28049363eebcb842bbc56cbca6225c1459acc909c4f1f116ef0a267fdfad0ef5
-  data.tar.gz: 86bdaa737c380e1e7f0629b845503519fbc1d9761e8197efef00c16928bf4a1b
+  metadata.gz: 9d569f11638f86d200646f0e97e5728a6064c2d4339128cacdc21f8179795756
+  data.tar.gz: 5834db27d3d49a3c98f1e6f751250622085bf216d6f09c76acf85b6a7c8668d6
 SHA512:
-  metadata.gz: c1ecf4b286637c8c7212b5e8b8232293aa5094d8d2d6ec919529f0a875cfc36a80bdf36612a74abef2913f1102c31ec261ba3ee87890f3d42899ddeecb0bb9a6
-  data.tar.gz: 91e283f37c9cada200e7d0021ab7cf8721ac7a838d17e8b357e58474b8d5c93e1030078b8885dd2ee4c9cef710d629f699ba356893b7c9a47aceeab10e9ebed4
+  metadata.gz: 71807cae129bb0a8df615d538d1c3bdada1bed8164f15cd57eb857da83e139d000b07f94471b8fbe4f9057b84803ea3bb1b3bee309b1ccb787285cdaf2dc5e02
+  data.tar.gz: 33b10d0c2d5c3d964ae23c451b2fa8cef10fac1a606233f8c82b3a6a3cb62cedd76728a7227013ed7a968551f543d02684bb1e70afb0341ed5d08e4706f3d875

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