protobuf 3.10.1 → 3.10.5

data/proto/rpc.proto

@@ -22,6 +22,8 @@
 //
 // Protobufs needed for socket rpcs.
 
+syntax = "proto2";
+
 package protobuf.socketrpc;
 
 message Request

data/spec/functional/code_generator_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe 'code generation' do
     end
 
     expected_output =
-      ::Google::Protobuf::Compiler::CodeGeneratorResponse.encode(:file => expected_file_descriptors)
+      ::Google::Protobuf::Compiler::CodeGeneratorResponse.encode(:file => expected_file_descriptors, :supported_features => 1)
 
     code_generator = ::Protobuf::CodeGenerator.new(bytes)
     code_generator.eval_unknown_extensions!
@@ -37,7 +37,7 @@ RSpec.describe 'code generation' do
         :name => file_name, :content => file_content)
 
     expected_response =
-      ::Google::Protobuf::Compiler::CodeGeneratorResponse.encode(:file => [expected_file_output])
+      ::Google::Protobuf::Compiler::CodeGeneratorResponse.encode(:file => [expected_file_output], :supported_features => 1)
 
     code_generator = ::Protobuf::CodeGenerator.new(request.encode)
     code_generator.eval_unknown_extensions!

data/spec/lib/protobuf/cli_spec.rb

@@ -275,6 +275,41 @@ RSpec.describe ::Protobuf::CLI do
         end
       end
 
+      context 'after server bind' do
+        let(:sock_runner) { double("FakeRunner", :run => nil) }
+
+        before { allow(sock_runner).to receive(:run).and_yield }
+
+        it 'publishes when using the lib/protobuf callback' do
+          message_after_bind = false
+          ::Protobuf.after_server_bind do
+            message_after_bind = true
+          end
+          described_class.start(args)
+          expect(message_after_bind).to eq(true)
+        end
+      end
+
+      context 'before server bind' do
+        it 'publishes a message before the runner runs' do
+          message_before_bind = false
+          ::ActiveSupport::Notifications.subscribe('before_server_bind') do
+            message_before_bind = true
+          end
+          described_class.start(args)
+          expect(message_before_bind).to eq(true)
+        end
+
+        it 'publishes when using the lib/protobuf callback' do
+          message_before_bind = false
+          ::Protobuf.before_server_bind do
+            message_before_bind = true
+          end
+          described_class.start(args)
+          expect(message_before_bind).to eq(true)
+        end
+      end
+
     end
 
   end

data/spec/lib/protobuf/code_generator_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe ::Protobuf::CodeGenerator do
     end
 
     let(:expected_response_bytes) do
-      COMPILER::CodeGeneratorResponse.encode(:file => [output_file1, output_file2])
+      COMPILER::CodeGeneratorResponse.encode(:file => [output_file1, output_file2], :supported_features => 1)
     end
 
     before do

data/spec/support/google/protobuf/descriptor.pb.rb

@@ -0,0 +1,360 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+module Google
+  module Protobuf
+    ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
+
+    ##
+    # Message Classes
+    #
+    class FileDescriptorSet < ::Protobuf::Message; end
+    class FileDescriptorProto < ::Protobuf::Message; end
+    class DescriptorProto < ::Protobuf::Message
+      class ExtensionRange < ::Protobuf::Message; end
+      class ReservedRange < ::Protobuf::Message; end
+
+    end
+
+    class ExtensionRangeOptions < ::Protobuf::Message; end
+    class FieldDescriptorProto < ::Protobuf::Message
+      class Type < ::Protobuf::Enum
+        define :TYPE_DOUBLE, 1
+        define :TYPE_FLOAT, 2
+        define :TYPE_INT64, 3
+        define :TYPE_UINT64, 4
+        define :TYPE_INT32, 5
+        define :TYPE_FIXED64, 6
+        define :TYPE_FIXED32, 7
+        define :TYPE_BOOL, 8
+        define :TYPE_STRING, 9
+        define :TYPE_GROUP, 10
+        define :TYPE_MESSAGE, 11
+        define :TYPE_BYTES, 12
+        define :TYPE_UINT32, 13
+        define :TYPE_ENUM, 14
+        define :TYPE_SFIXED32, 15
+        define :TYPE_SFIXED64, 16
+        define :TYPE_SINT32, 17
+        define :TYPE_SINT64, 18
+      end
+
+      class Label < ::Protobuf::Enum
+        define :LABEL_OPTIONAL, 1
+        define :LABEL_REQUIRED, 2
+        define :LABEL_REPEATED, 3
+      end
+
+    end
+
+    class OneofDescriptorProto < ::Protobuf::Message; end
+    class EnumDescriptorProto < ::Protobuf::Message
+      class EnumReservedRange < ::Protobuf::Message; end
+
+    end
+
+    class EnumValueDescriptorProto < ::Protobuf::Message; end
+    class ServiceDescriptorProto < ::Protobuf::Message; end
+    class MethodDescriptorProto < ::Protobuf::Message; end
+    class FileOptions < ::Protobuf::Message
+      class OptimizeMode < ::Protobuf::Enum
+        define :SPEED, 1
+        define :CODE_SIZE, 2
+        define :LITE_RUNTIME, 3
+      end
+
+    end
+
+    class MessageOptions < ::Protobuf::Message; end
+    class FieldOptions < ::Protobuf::Message
+      class CType < ::Protobuf::Enum
+        define :STRING, 0
+        define :CORD, 1
+        define :STRING_PIECE, 2
+      end
+
+      class JSType < ::Protobuf::Enum
+        define :JS_NORMAL, 0
+        define :JS_STRING, 1
+        define :JS_NUMBER, 2
+      end
+
+    end
+
+    class OneofOptions < ::Protobuf::Message; end
+    class EnumOptions < ::Protobuf::Message; end
+    class EnumValueOptions < ::Protobuf::Message; end
+    class ServiceOptions < ::Protobuf::Message; end
+    class MethodOptions < ::Protobuf::Message
+      class IdempotencyLevel < ::Protobuf::Enum
+        define :IDEMPOTENCY_UNKNOWN, 0
+        define :NO_SIDE_EFFECTS, 1
+        define :IDEMPOTENT, 2
+      end
+
+    end
+
+    class UninterpretedOption < ::Protobuf::Message
+      class NamePart < ::Protobuf::Message; end
+
+    end
+
+    class SourceCodeInfo < ::Protobuf::Message
+      class Location < ::Protobuf::Message; end
+
+    end
+
+    class GeneratedCodeInfo < ::Protobuf::Message
+      class Annotation < ::Protobuf::Message; end
+
+    end
+
+
+
+    ##
+    # File Options
+    #
+    set_option :java_package, "com.google.protobuf"
+    set_option :java_outer_classname, "DescriptorProtos"
+    set_option :optimize_for, ::Google::Protobuf::FileOptions::OptimizeMode::SPEED
+    set_option :go_package, "google.golang.org/protobuf/types/descriptorpb"
+    set_option :cc_enable_arenas, true
+    set_option :objc_class_prefix, "GPB"
+    set_option :csharp_namespace, "Google.Protobuf.Reflection"
+
+
+    ##
+    # Message Fields
+    #
+    class FileDescriptorSet
+      repeated ::Google::Protobuf::FileDescriptorProto, :file, 1
+    end
+
+    class FileDescriptorProto
+      optional :string, :name, 1
+      optional :string, :package, 2
+      repeated :string, :dependency, 3
+      repeated :int32, :public_dependency, 10
+      repeated :int32, :weak_dependency, 11
+      repeated ::Google::Protobuf::DescriptorProto, :message_type, 4
+      repeated ::Google::Protobuf::EnumDescriptorProto, :enum_type, 5
+      repeated ::Google::Protobuf::ServiceDescriptorProto, :service, 6
+      repeated ::Google::Protobuf::FieldDescriptorProto, :extension, 7
+      optional ::Google::Protobuf::FileOptions, :options, 8
+      optional ::Google::Protobuf::SourceCodeInfo, :source_code_info, 9
+      optional :string, :syntax, 12
+    end
+
+    class DescriptorProto
+      class ExtensionRange
+        optional :int32, :start, 1
+        optional :int32, :end, 2
+        optional ::Google::Protobuf::ExtensionRangeOptions, :options, 3
+      end
+
+      class ReservedRange
+        optional :int32, :start, 1
+        optional :int32, :end, 2
+      end
+
+      optional :string, :name, 1
+      repeated ::Google::Protobuf::FieldDescriptorProto, :field, 2
+      repeated ::Google::Protobuf::FieldDescriptorProto, :extension, 6
+      repeated ::Google::Protobuf::DescriptorProto, :nested_type, 3
+      repeated ::Google::Protobuf::EnumDescriptorProto, :enum_type, 4
+      repeated ::Google::Protobuf::DescriptorProto::ExtensionRange, :extension_range, 5
+      repeated ::Google::Protobuf::OneofDescriptorProto, :oneof_decl, 8
+      optional ::Google::Protobuf::MessageOptions, :options, 7
+      repeated ::Google::Protobuf::DescriptorProto::ReservedRange, :reserved_range, 9
+      repeated :string, :reserved_name, 10
+    end
+
+    class ExtensionRangeOptions
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class FieldDescriptorProto
+      optional :string, :name, 1
+      optional :int32, :number, 3
+      optional ::Google::Protobuf::FieldDescriptorProto::Label, :label, 4
+      optional ::Google::Protobuf::FieldDescriptorProto::Type, :type, 5
+      optional :string, :type_name, 6
+      optional :string, :extendee, 2
+      optional :string, :default_value, 7
+      optional :int32, :oneof_index, 9
+      optional :string, :json_name, 10
+      optional ::Google::Protobuf::FieldOptions, :options, 8
+      optional :bool, :proto3_optional, 17
+    end
+
+    class OneofDescriptorProto
+      optional :string, :name, 1
+      optional ::Google::Protobuf::OneofOptions, :options, 2
+    end
+
+    class EnumDescriptorProto
+      class EnumReservedRange
+        optional :int32, :start, 1
+        optional :int32, :end, 2
+      end
+
+      optional :string, :name, 1
+      repeated ::Google::Protobuf::EnumValueDescriptorProto, :value, 2
+      optional ::Google::Protobuf::EnumOptions, :options, 3
+      repeated ::Google::Protobuf::EnumDescriptorProto::EnumReservedRange, :reserved_range, 4
+      repeated :string, :reserved_name, 5
+    end
+
+    class EnumValueDescriptorProto
+      optional :string, :name, 1
+      optional :int32, :number, 2
+      optional ::Google::Protobuf::EnumValueOptions, :options, 3
+    end
+
+    class ServiceDescriptorProto
+      optional :string, :name, 1
+      repeated ::Google::Protobuf::MethodDescriptorProto, :method, 2
+      optional ::Google::Protobuf::ServiceOptions, :options, 3
+    end
+
+    class MethodDescriptorProto
+      optional :string, :name, 1
+      optional :string, :input_type, 2
+      optional :string, :output_type, 3
+      optional ::Google::Protobuf::MethodOptions, :options, 4
+      optional :bool, :client_streaming, 5, :default => false
+      optional :bool, :server_streaming, 6, :default => false
+    end
+
+    class FileOptions
+      optional :string, :java_package, 1
+      optional :string, :java_outer_classname, 8
+      optional :bool, :java_multiple_files, 10, :default => false
+      optional :bool, :java_generate_equals_and_hash, 20, :deprecated => true
+      optional :bool, :java_string_check_utf8, 27, :default => false
+      optional ::Google::Protobuf::FileOptions::OptimizeMode, :optimize_for, 9, :default => ::Google::Protobuf::FileOptions::OptimizeMode::SPEED
+      optional :string, :go_package, 11
+      optional :bool, :cc_generic_services, 16, :default => false
+      optional :bool, :java_generic_services, 17, :default => false
+      optional :bool, :py_generic_services, 18, :default => false
+      optional :bool, :php_generic_services, 42, :default => false
+      optional :bool, :deprecated, 23, :default => false
+      optional :bool, :cc_enable_arenas, 31, :default => true
+      optional :string, :objc_class_prefix, 36
+      optional :string, :csharp_namespace, 37
+      optional :string, :swift_prefix, 39
+      optional :string, :php_class_prefix, 40
+      optional :string, :php_namespace, 41
+      optional :string, :php_metadata_namespace, 44
+      optional :string, :ruby_package, 45
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class MessageOptions
+      optional :bool, :message_set_wire_format, 1, :default => false
+      optional :bool, :no_standard_descriptor_accessor, 2, :default => false
+      optional :bool, :deprecated, 3, :default => false
+      optional :bool, :map_entry, 7
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class FieldOptions
+      optional ::Google::Protobuf::FieldOptions::CType, :ctype, 1, :default => ::Google::Protobuf::FieldOptions::CType::STRING
+      optional :bool, :packed, 2
+      optional ::Google::Protobuf::FieldOptions::JSType, :jstype, 6, :default => ::Google::Protobuf::FieldOptions::JSType::JS_NORMAL
+      optional :bool, :lazy, 5, :default => false
+      optional :bool, :deprecated, 3, :default => false
+      optional :bool, :weak, 10, :default => false
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class OneofOptions
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class EnumOptions
+      optional :bool, :allow_alias, 2
+      optional :bool, :deprecated, 3, :default => false
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class EnumValueOptions
+      optional :bool, :deprecated, 1, :default => false
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class ServiceOptions
+      optional :bool, :deprecated, 33, :default => false
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class MethodOptions
+      optional :bool, :deprecated, 33, :default => false
+      optional ::Google::Protobuf::MethodOptions::IdempotencyLevel, :idempotency_level, 34, :default => ::Google::Protobuf::MethodOptions::IdempotencyLevel::IDEMPOTENCY_UNKNOWN
+      repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
+      # Extension Fields
+      extensions 1000...536870912
+    end
+
+    class UninterpretedOption
+      class NamePart
+        required :string, :name_part, 1
+        required :bool, :is_extension, 2
+      end
+
+      repeated ::Google::Protobuf::UninterpretedOption::NamePart, :name, 2
+      optional :string, :identifier_value, 3
+      optional :uint64, :positive_int_value, 4
+      optional :int64, :negative_int_value, 5
+      optional :double, :double_value, 6
+      optional :bytes, :string_value, 7
+      optional :string, :aggregate_value, 8
+    end
+
+    class SourceCodeInfo
+      class Location
+        repeated :int32, :path, 1, :packed => true
+        repeated :int32, :span, 2, :packed => true
+        optional :string, :leading_comments, 3
+        optional :string, :trailing_comments, 4
+        repeated :string, :leading_detached_comments, 6
+      end
+
+      repeated ::Google::Protobuf::SourceCodeInfo::Location, :location, 1
+    end
+
+    class GeneratedCodeInfo
+      class Annotation
+        repeated :int32, :path, 1, :packed => true
+        optional :string, :source_file, 2
+        optional :int32, :begin, 3
+        optional :int32, :end, 4
+      end
+
+      repeated ::Google::Protobuf::GeneratedCodeInfo::Annotation, :annotation, 1
+    end
+
+  end
+
+end
+

data/spec/support/protos/map-test.pb.rb

@@ -12,8 +12,8 @@ module Foo
   # Enum Classes
   #
   class Frobnitz < ::Protobuf::Enum
-    define :FROB, 1
-    define :NITZ, 2
+    define :FROB, 0
+    define :NITZ, 1
   end