google-protobuf 3.5.1.2-universal-darwin → 3.6.0-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c9ae50d7a1f4129da9f51559b0317416fbd4de471bdac5052bdbf47849747b0
-  data.tar.gz: 987b8f962083e7af323f7bc063eea30e7d22ac9a273b4b5f0a4bf17622a8fea9
+  metadata.gz: f37c1cedd6aa237beef9c2d1141e4db110a0c038c586d9d585fd581fdccfc696
+  data.tar.gz: 2b2e438f434fab6d285975a6fb3068e1dcb83b4d5f73ad3065d640ab0941f36b
 SHA512:
-  metadata.gz: 18537a6a366676f4c3035c3a5f0cb54afbaa2aae85b9740ea1f8ee622944e6bf991decde3c587ab5230ff335d4fff7c235cd06d5f26c1b8691a9da4a6e3f554b
-  data.tar.gz: 9fb219e7d0133ac719a3b972d178198cb61746e29ceb3c343b33c5973c3bc1e52b11d3625d520c3a6b2cbfa34e97bb1bf605266c7cfa093fa4e57c664dd52606
+  metadata.gz: 33b3630a1457869f62d8ac4bc151f1074f17fba533fca0f1bfb08f29b40f0590df802d83567b7905029f9bc8702db4543f141e6e08f4a528551723eeb654e9d2
+  data.tar.gz: 89c703aa13f32910f5ada00162cc75aaf4e4a4ad5f3d34c829eada22e0787c8301912f08ed25be762041f0232b04b22551823576329436a55738645e18644459

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: universal-darwin
 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
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Protocol Buffers