google-protobuf 3.6.0-universal-darwin → 3.6.1-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f37c1cedd6aa237beef9c2d1141e4db110a0c038c586d9d585fd581fdccfc696
-  data.tar.gz: 2b2e438f434fab6d285975a6fb3068e1dcb83b4d5f73ad3065d640ab0941f36b
+  metadata.gz: 4c93d16c4932f8938250700329e0bd001ab34ab24d4ca940f0261f4658af317b
+  data.tar.gz: a5fe1ade1a832a74905b7d130a5a69b3d9508b9ef95287bff7bc19a54b2e8032
 SHA512:
-  metadata.gz: 33b3630a1457869f62d8ac4bc151f1074f17fba533fca0f1bfb08f29b40f0590df802d83567b7905029f9bc8702db4543f141e6e08f4a528551723eeb654e9d2
-  data.tar.gz: 89c703aa13f32910f5ada00162cc75aaf4e4a4ad5f3d34c829eada22e0787c8301912f08ed25be762041f0232b04b22551823576329436a55738645e18644459
+  metadata.gz: 9777d2c7d8db8eedac93aae4da2ad4e3876af54efad5ee13956ed94f315ad025003afdc7feb8faefd22d4883a92c8376d246f678fb4557860fde8f9892cf1a91
+  data.tar.gz: 9f6a3ae46434f65f89f7e86e99faa3693f252123862343b2f21cee28791db71655f14d0f0b925a3e4a6f32e158e014b4af4bfdf97d75d32e800583704cd9e34a

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/extconf.rb

@@ -2,7 +2,9 @@
 
 require 'mkmf'
 
-$CFLAGS += " -std=c99 -O3 -DNDEBUG"
+unless RUBY_PLATFORM =~ /mswin|mingw/
+  $CFLAGS += " -std=c99 -O3 -DNDEBUG"
+end
 
 
 if RUBY_PLATFORM =~ /linux/

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: universal-darwin
 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