google-protobuf 3.5.1.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37f64f11dfb6486d8451a8b642d32edb08303e90
-  data.tar.gz: bdcf1060e51613646a362b1d58bad14667f750c5
+SHA256:
+  metadata.gz: 28049363eebcb842bbc56cbca6225c1459acc909c4f1f116ef0a267fdfad0ef5
+  data.tar.gz: 86bdaa737c380e1e7f0629b845503519fbc1d9761e8197efef00c16928bf4a1b
 SHA512:
-  metadata.gz: d7d3601d1cc74418451a0ae23660359df2512d2f4243d55959f284878cc941eede85c5e9481bbf3a5f83b72408e2f299585b636f905ea05d9f8f4d002b1c7906
-  data.tar.gz: 46c454c3942c820a5bea31aeefa1d7c70e4814e660791520b3e2dbe9a29a0e9d5a266535601c8a2ffbc9f494086c3d962718e4ea1cf6326d36b0a33f4b0a7673
+  metadata.gz: c1ecf4b286637c8c7212b5e8b8232293aa5094d8d2d6ec919529f0a875cfc36a80bdf36612a74abef2913f1102c31ec261ba3ee87890f3d42899ddeecb0bb9a6
+  data.tar.gz: 91e283f37c9cada200e7d0021ab7cf8721ac7a838d17e8b357e58474b8d5c93e1030078b8885dd2ee4c9cef710d629f699ba356893b7c9a47aceeab10e9ebed4

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/message.c

@@ -540,9 +540,9 @@ VALUE build_class_from_descriptor(Descriptor* desc) {
               get_def_obj(desc->msgdef));
   rb_define_alloc_func(klass, Message_alloc);
   rb_require("google/protobuf/message_exts");
-  rb_include_module(klass, rb_eval_string("Google::Protobuf::MessageExts"));
+  rb_include_module(klass, rb_eval_string("::Google::Protobuf::MessageExts"));
   rb_extend_object(
-      klass, rb_eval_string("Google::Protobuf::MessageExts::ClassMethods"));
+      klass, rb_eval_string("::Google::Protobuf::MessageExts::ClassMethods"));
 
   rb_define_method(klass, "method_missing",
                    Message_method_missing, -1);

data/ext/google/protobuf_c/storage.c

@@ -606,12 +606,20 @@ static void check_repeated_field_type(VALUE val, const upb_fielddef* field) {
     rb_raise(rb_eTypeError, "Repeated field array has wrong element type");
   }
 
-  if (self->field_type == UPB_TYPE_MESSAGE ||
-      self->field_type == UPB_TYPE_ENUM) {
+  if (self->field_type == UPB_TYPE_MESSAGE) { 
     if (self->field_type_class !=
-        get_def_obj(upb_fielddef_subdef(field))) {
+        Descriptor_msgclass(get_def_obj(upb_fielddef_subdef(field)))) {
       rb_raise(rb_eTypeError,
-               "Repeated field array has wrong message/enum class");
+               "Repeated field array has wrong message class");
+    }
+  }
+
+
+  if (self->field_type == UPB_TYPE_ENUM) {
+    if (self->field_type_class !=
+        EnumDescriptor_enummodule(get_def_obj(upb_fielddef_subdef(field)))) {
+      rb_raise(rb_eTypeError,
+               "Repeated field array has wrong enum class");
     }
   }
 }

data/lib/google/protobuf.rb

@@ -60,8 +60,8 @@ module Google
       msg.to_proto
     end
 
-    def self.encode_json(msg)
-      msg.to_json
+    def self.encode_json(msg, options = {})
+      msg.to_json(options)
     end
 
     def self.decode(klass, proto)

data/lib/google/protobuf/message_exts.rb

@@ -40,8 +40,8 @@ module Google
       module ClassMethods
       end
 
-      def to_json
-        self.class.encode_json(self)
+      def to_json(options = {})
+        self.class.encode_json(self, options)
       end
 
       def to_proto

data/lib/google/protobuf/repeated_field.rb

@@ -150,12 +150,12 @@ module Google
       end
 
 
-      %w(delete delete_at delete_if shift slice! unshift).each do |method_name|
+      %w(delete delete_at shift slice! unshift).each do |method_name|
         define_array_wrapper_method(method_name)
       end
 
 
-      %w(collect! compact! fill flatten! insert reverse!
+      %w(collect! compact! delete_if fill flatten! insert reverse!
         rotate! select! shuffle! sort! sort_by! uniq!).each do |method_name|
         define_array_wrapper_with_result_method(method_name)
       end

data/tests/generated_code_test.rb

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 require 'generated_code_pb'
 require 'test_import_pb'
+require 'test_ruby_package_pb'
 require 'test/unit'
 
 class GeneratedCodeTest < Test::Unit::TestCase
@@ -15,5 +16,6 @@ class GeneratedCodeTest < Test::Unit::TestCase
     # aspect of the extension (basic.rb is for that).
     m = A::B::C::TestMessage.new()
     m2 = FooBar::TestImportedMessage.new()
+    m3 = A::B::TestRubyPackageMessage.new()
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.5.1.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Protocol Buffers