protobuf 3.10.0.pre0 → 3.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f251d88d7525ca68f3757e5d15b3bf553f23e16c22b67f0cb501b4b7c57f9cf
-  data.tar.gz: 78bba5d0b84d72805c158498b0c707975b2b81c4e1a2f3537ba5eeca9c5f3b67
+  metadata.gz: a36764aa2113c15a2dbc5e12f1bdfd04a69af8d19dd3e34d761ceaf1f875d81b
+  data.tar.gz: 1b790a1156812f2ca1f904ff70344d4bde7f15eea73384cc2b6f23d459ddf7e2
 SHA512:
-  metadata.gz: 98f9d860e46359e348313e2c6e1093c39911b40ff7227d3b2e953e3fa574234f8c518427f9e26797ca50de2d7d5599a8ba78232826288f2255600bc27ad58ad9
-  data.tar.gz: 80643f875d7736c5883ce43b1903a61e08c78d9d11459621ca94f502f4f2e84748f85fbb6df2604886de0a708d11c0e6b7e80df9e03aa3bac7f65075cd795c2c
+  metadata.gz: 989876600d8b6c89657e8224850eb64cfa0f0537c37843716d9df4742fde61feef6e4c278d8665ccf70be0cbe5d5006a61a2a8b36c718331bd25b3446d4125cf
+  data.tar.gz: 9975ca67caf38e5a0098d78e28b928353aa2b5d776d431102d7884e2002c8f88a97f2e5d5398b540dcf6205b6a4057be3c8dadfab6dbad73b05ab2368d9a589b

data/.circleci/config.yml

@@ -0,0 +1,48 @@
+version: 2.1
+
+jobs:
+  # skipping build step because Gemfile.lock is not included in the source
+  # this makes the bundler caching step a noop
+  test:
+    parameters:
+      ruby-image:
+        type: string
+    docker:
+      - image: << parameters.ruby-image >>
+    steps:
+      - run:
+          name: Install protobuf compiler
+          command: |
+            archive=protoc-3.16.0-linux-x86_64
+            curl -O -L https://github.com/protocolbuffers/protobuf/releases/download/v3.16.0/$archive.zip
+            sudo unzip -d '/usr/local' $archive.zip 'bin/*' 'include/*'
+            sudo chown -R $(whoami) /usr/local/bin/protoc /usr/local/include/google
+            rm -rf $archive.zip
+      - run:
+          command: protoc --version
+      - run:
+          command: sudo apt-get update
+      - run:
+          message: Install ZeroMQ
+          command: sudo apt-get -y install libzmq3-dev
+      - checkout
+      - run:
+          command: gem install bundler
+      - run:
+          command: bundle install
+      - run:
+          command: bundle exec rake
+
+workflows:
+  build_and_test:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              ruby-image:
+                - circleci/jruby:9.2.6.0-jdk
+                - circleci/jruby:9.1.17.0-jdk
+                - circleci/jruby:9.2-jdk8
+                - circleci/ruby:2.4
+                - circleci/ruby:2.5
+                - circleci/ruby:2.7

data/CHANGES.md

@@ -1,5 +1,15 @@
 # Stable (3.8.x)
 
+
+3.10.0
+------
+- Add headers to request proto
+- Add support for compiling v3 protos with optional fields as v2 optional fields
+
+3.9.0
+-----
+- Performance improvements
+
 3.8.0
 -----
 - Map types now supported (#367)

data/Rakefile

@@ -22,10 +22,12 @@ namespace :compile do
   task :spec do
     proto_path = ::File.expand_path('../spec/support/', __FILE__)
     proto_files = Dir[File.join(proto_path, '**', '*.proto')]
-    cmd = %(protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{proto_path} -I #{proto_path} #{proto_files.join(' ')})
 
-    puts cmd
-    system(cmd)
+    proto_files.each do |proto_file|
+      cmd = %(protoc --plugin=protoc-gen-ruby-protobuf=./bin/protoc-gen-ruby --ruby-protobuf_out=#{proto_path} -I #{proto_path} #{proto_file})
+      puts cmd
+      system(cmd) || fail("Failed to compile spec proto: #{proto_file}")
+    end
   end
 
   desc 'Compile rpc protos in protos/ directory'
@@ -35,10 +37,10 @@ namespace :compile do
     output_dir = ::File.expand_path('../tmp/rpc', __FILE__)
     ::FileUtils.mkdir_p(output_dir)
 
-    cmd = %(protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{output_dir} -I #{proto_path} #{proto_files.join(' ')})
+    cmd = %(protoc --plugin=protoc-gen-ruby-protobuf=./bin/protoc-gen-ruby --ruby-protobuf_out=#{output_dir} -I #{proto_path} #{proto_files.join(' ')})
 
     puts cmd
-    system(cmd)
+    system(cmd) || fail("Failed to compile rpc protos!")
 
     files = {
       'tmp/rpc/dynamic_discovery.pb.rb'               => 'lib/protobuf/rpc',

data/lib/protobuf.rb

@@ -54,6 +54,18 @@ module Protobuf
     attr_writer :client_host
   end
 
+  def self.after_server_bind(&block)
+    ::ActiveSupport::Notifications.subscribe('after_server_bind') do |*args|
+      block.call(*args)
+    end
+  end
+
+  def self.before_server_bind(&block)
+    ::ActiveSupport::Notifications.subscribe('before_server_bind') do |*args|
+      block.call(*args)
+    end
+  end
+
   def self.client_host
     @client_host ||= Socket.gethostname
   end

data/lib/protobuf/cli.rb

@@ -240,6 +240,8 @@ module Protobuf
       def start_server
         debug_say('Running server')
 
+        ::ActiveSupport::Notifications.instrument("before_server_bind")
+
         runner.run do
           logger.info do
             "pid #{::Process.pid} -- #{mode} RPC Server listening at #{options.host}:#{options.port}"

data/lib/protobuf/code_generator.rb

@@ -46,7 +46,16 @@ module Protobuf
         generate_file(file_descriptor)
       end
 
-      ::Google::Protobuf::Compiler::CodeGeneratorResponse.encode(:file => generated_files)
+      ::Google::Protobuf::Compiler::CodeGeneratorResponse.encode(
+        :file => generated_files,
+        :supported_features => supported_features,
+      )
+    end
+
+    def supported_features
+      # The only available feature is proto3 with optional fields.
+      # This is backwards compatible with proto2 optional fields.
+      ::Google::Protobuf::Compiler::CodeGeneratorResponse::Feature::FEATURE_PROTO3_OPTIONAL.to_i
     end
 
     Protobuf::Field::BaseField.module_eval do

data/lib/protobuf/descriptors/google/protobuf/compiler/plugin.pb.rb

@@ -21,6 +21,11 @@ module Google
       #
       class CodeGeneratorRequest < ::Protobuf::Message; end
       class CodeGeneratorResponse < ::Protobuf::Message
+        class Feature < ::Protobuf::Enum
+          define :FEATURE_NONE, 0
+          define :FEATURE_PROTO3_OPTIONAL, 1
+        end
+
         class File < ::Protobuf::Message; end
 
       end
@@ -51,6 +56,7 @@ module Google
         end
 
         optional :string, :error, 1
+        optional :uint64, :supported_features, 2
         repeated ::Google::Protobuf::Compiler::CodeGeneratorResponse::File, :file, 15
       end
 

data/lib/protobuf/rpc/connectors/base.rb

@@ -63,8 +63,9 @@ module Protobuf
         # @param [String] message The error message
         def failure(code, message)
           @error = ClientError.new
-          @error.code = ::Protobuf::Socketrpc::ErrorReason.fetch(code)
+          @stats.status = @error.code = ::Protobuf::Socketrpc::ErrorReason.fetch(code)
           @error.message = message
+
           logger.debug { sign_message("Server failed request (invoking on_failure): #{@error.inspect}") }
 
           @failure_cb.call(@error) unless @failure_cb.nil?
@@ -139,12 +140,7 @@ module Protobuf
 
         def request_bytes
           validate_request_type!
-          fields = { :service_name => @options[:service].name,
-                     :method_name => @options[:method].to_s,
-                     :request_proto => @options[:request],
-                     :caller => request_caller }
-
-          return ::Protobuf::Socketrpc::Request.encode(fields)
+          return ::Protobuf::Socketrpc::Request.encode(request_fields)
         rescue => e
           failure(:INVALID_REQUEST_PROTO, "Could not set request proto: #{e.message}")
         end
@@ -153,6 +149,13 @@ module Protobuf
           @options[:client_host] || ::Protobuf.client_host
         end
 
+        def request_fields
+          { :service_name => @options[:service].name,
+            :method_name => @options[:method].to_s,
+            :request_proto => @options[:request],
+            :caller => request_caller }
+        end
+
         def send_request
           fail 'If you inherit a Connector from Base you must implement send_request'
         end

data/lib/protobuf/rpc/stat.rb

@@ -1,16 +1,30 @@
 require 'date'
 require 'time'
 require 'protobuf/logging'
+require 'protobuf/rpc/rpc.pb'
 
 module Protobuf
   module Rpc
     class Stat
       attr_accessor :mode, :start_time, :end_time, :request_size, :dispatcher
-      attr_accessor :response_size, :client, :service, :method_name
+      attr_accessor :response_size, :client, :service, :method_name, :status
       attr_reader   :server
 
       MODES = [:SERVER, :CLIENT].freeze
 
+      ERROR_TRANSLATIONS = {
+        ::Protobuf::Socketrpc::ErrorReason::BAD_REQUEST_DATA => "BAD_REQUEST_DATA",
+        ::Protobuf::Socketrpc::ErrorReason::BAD_REQUEST_PROTO => "BAD_REQUEST_PROTO",
+        ::Protobuf::Socketrpc::ErrorReason::SERVICE_NOT_FOUND => "SERVICE_NOT_FOUND",
+        ::Protobuf::Socketrpc::ErrorReason::METHOD_NOT_FOUND => "METHOD_NOT_FOUND",
+        ::Protobuf::Socketrpc::ErrorReason::RPC_ERROR => "RPC_ERROR",
+        ::Protobuf::Socketrpc::ErrorReason::RPC_FAILED => "RPC_FAILED",
+        ::Protobuf::Socketrpc::ErrorReason::INVALID_REQUEST_PROTO => "INVALID_REQUEST_PROTO",
+        ::Protobuf::Socketrpc::ErrorReason::BAD_RESPONSE_PROTO => "BAD_RESPONSE_PROTO",
+        ::Protobuf::Socketrpc::ErrorReason::UNKNOWN_HOST => "UNKNOWN_HOST",
+        ::Protobuf::Socketrpc::ErrorReason::IO_ERROR => "IO_ERROR",
+      }.freeze
+
       def initialize(mode = :SERVER)
         @mode = mode
         @request_size = 0
@@ -78,6 +92,12 @@ module Protobuf
         @mode == :CLIENT
       end
 
+      def status_string
+        return "OK" if status.nil?
+
+        ERROR_TRANSLATIONS.fetch(status, "UNKNOWN_ERROR")
+      end
+
       def to_s
         [
           server? ? "[SRV]" : "[CLT]",
@@ -86,6 +106,7 @@ module Protobuf
           rpc,
           sizes,
           elapsed_time,
+          status_string,
           @end_time.try(:iso8601),
         ].compact.join(' - ')
       end
@@ -93,7 +114,6 @@ module Protobuf
       def trace_id
         ::Thread.current.object_id.to_s(16)
       end
-
     end
   end
 end

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.10.0.pre0' # rubocop:disable Style/MutableConstant
+  VERSION = '3.10.4' # rubocop:disable Style/MutableConstant
 end

data/proto/dynamic_discovery.proto

@@ -22,6 +22,8 @@
 //
 // Protobufs needed for dynamic discovery zmq server and client.
 
+syntax = "proto2";
+
 package protobuf.rpc.dynamicDiscovery;
 
 enum BeaconType {

data/proto/google/protobuf/compiler/plugin.proto

@@ -44,6 +44,8 @@
 // plugin should be named "protoc-gen-$NAME", and will then be used when the
 // flag "--${NAME}_out" is passed to protoc.
 
+syntax = "proto2";
+
 package google.protobuf.compiler;
 option java_package = "com.google.protobuf.compiler";
 option java_outer_classname = "PluginProtos";
@@ -86,6 +88,16 @@ message CodeGeneratorResponse {
   // exiting with a non-zero status code.
   optional string error = 1;
 
+  // A bitmask of supported features that the code generator supports.
+  // This is a bitwise "or" of values from the Feature enum.
+  optional uint64 supported_features = 2;
+
+  // Sync with code_generator.h.
+  enum Feature {
+    FEATURE_NONE = 0;
+    FEATURE_PROTO3_OPTIONAL = 1;
+  }
+
   // Represents a single generated file.
   message File {
     // The file name, relative to the output directory.  The name must not

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/lib/protobuf/rpc/connectors/base_spec.rb

@@ -187,14 +187,14 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
   shared_examples "a ConnectorDisposition" do |meth, cb, *args|
 
     it "calls #complete before exit" do
-      subject.stats = double("Object", :stop => true)
+      subject.stats = ::Protobuf::Rpc::Stat.new(:stop => true)
 
       expect(subject).to receive(:complete)
       subject.method(meth).call(*args)
     end
 
     it "calls the #{cb} callback when provided" do
-      stats = double("Object")
+      stats = ::Protobuf::Rpc::Stat.new
       allow(stats).to receive(:stop).and_return(true)
       subject.stats = stats
       some_cb = double("Object")
@@ -205,7 +205,7 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
     end
 
     it "calls the complete callback when provided" do
-      stats = double("Object")
+      stats = ::Protobuf::Rpc::Stat.new
       allow(stats).to receive(:stop).and_return(true)
       subject.stats = stats
       comp_cb = double("Object")
@@ -217,8 +217,8 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
 
   end
 
-  it_behaves_like("a ConnectorDisposition", :failure, "failure_cb", "code", "message")
-  it_behaves_like("a ConnectorDisposition", :failure, "complete_cb", "code", "message")
+  it_behaves_like("a ConnectorDisposition", :failure, "failure_cb", :RPC_ERROR, "message")
+  it_behaves_like("a ConnectorDisposition", :failure, "complete_cb", :RPC_ERROR, "message")
   it_behaves_like("a ConnectorDisposition", :succeed, "complete_cb", "response")
   it_behaves_like("a ConnectorDisposition", :succeed, "success_cb", "response")
   it_behaves_like("a ConnectorDisposition", :complete, "complete_cb")

data/spec/lib/protobuf/rpc/stat_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe ::Protobuf::Rpc::Stat do
 
         ::Timecop.freeze(1.62.seconds.from_now) do
           stats.stop
-          expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/1302B - 1.62s - #{::Time.now.iso8601}"
+          expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/1302B - 1.62s - OK - #{::Time.now.iso8601}"
         end
       end
     end
@@ -44,7 +44,7 @@ RSpec.describe ::Protobuf::Rpc::Stat do
         stats.client = 'myserver1'
         stats.dispatcher = double('dispatcher', :service => BarService.new(:find_bars))
         stats.request_size = 43
-        expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/-"
+        expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/- - OK"
       end
     end
   end
@@ -61,12 +61,31 @@ RSpec.describe ::Protobuf::Rpc::Stat do
 
         ::Timecop.freeze(0.832.seconds.from_now) do
           stats.stop
-          expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/12345B - 0.832s - #{::Time.now.iso8601}"
+          expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/12345B - 0.832s - OK - #{::Time.now.iso8601}"
         end
 
       end
     end
 
+    describe 'error log' do
+      it 'resolves error to a string' do
+        ::Timecop.freeze(10.minutes.ago) do
+          stats = ::Protobuf::Rpc::Stat.new(:CLIENT)
+          stats.server = ['30000', 'myserver1.myhost.com']
+          stats.service = 'Foo::BarService'
+          stats.status = ::Protobuf::Socketrpc::ErrorReason::RPC_ERROR
+          stats.method_name = 'find_bars'
+          stats.request_size = 37
+          stats.response_size = 12345
+
+          ::Timecop.freeze(0.832.seconds.from_now) do
+            stats.stop
+            expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/12345B - 0.832s - RPC_ERROR - #{::Time.now.iso8601}"
+          end
+        end
+      end
+    end
+
     context 'when request is still running' do
       it 'omits response size, duration, and timestamp' do
         stats = ::Protobuf::Rpc::Stat.new(:CLIENT)
@@ -74,7 +93,7 @@ RSpec.describe ::Protobuf::Rpc::Stat do
         stats.service = 'Foo::BarService'
         stats.method_name = 'find_bars'
         stats.request_size = 37
-        expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/-"
+        expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/- - OK"
       end
     end
   end

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
 
 

data/spec/support/protos/map-test.proto

@@ -1,13 +1,13 @@
 // Use protoc v3.0.0 to compile this file into map-test.bin:
-//   protoc --descriptor_set_out=map-test.bin map-test.proto 
+//   protoc --descriptor_set_out=map-test.bin map-test.proto
 
 syntax = "proto2";
 
 package foo;
 
 enum Frobnitz {
-  FROB = 1;
-  NITZ = 2;
+  FROB = 0;
+  NITZ = 1;
 }
 
 message Baz {

data/spec/support/protos/optional_v3_fields.pb.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+
+##
+# Message Classes
+#
+class SomethingWithOptionalFields < ::Protobuf::Message; end
+
+
+##
+# Message Fields
+#
+class SomethingWithOptionalFields
+  optional :string, :i_am_optional, 1
+  optional :string, :i_am_not_optional, 2
+end
+

data/spec/support/protos/optional_v3_fields.proto

@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+message SomethingWithOptionalFields {
+  optional string i_am_optional = 1;
+  string i_am_not_optional      = 2;
+}

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.10.0.pre0
+  version: 3.10.4
 platform: ruby
 authors:
 - BJ Neilsen
 - Brandon Dewitt
 - Devin Christensen
 - Adam Hutchison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -263,10 +263,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES.md
 - CONTRIBUTING.md
@@ -276,7 +276,6 @@ files:
 - Rakefile
 - bin/protoc-gen-ruby
 - bin/rpc_server
-- install-protobuf.sh
 - lib/protobuf.rb
 - lib/protobuf/cli.rb
 - lib/protobuf/code_generator.rb
@@ -438,6 +437,7 @@ files:
 - spec/lib/protobuf_spec.rb
 - spec/spec_helper.rb
 - spec/support/all.rb
+- spec/support/google/protobuf/descriptor.pb.rb
 - spec/support/packed_field.rb
 - spec/support/protos/all_types.data.bin
 - spec/support/protos/all_types.data.txt
@@ -459,6 +459,8 @@ files:
 - spec/support/protos/map-test.proto
 - spec/support/protos/multi_field_extensions.pb.rb
 - spec/support/protos/multi_field_extensions.proto
+- spec/support/protos/optional_v3_fields.pb.rb
+- spec/support/protos/optional_v3_fields.proto
 - spec/support/protos/resource.pb.rb
 - spec/support/protos/resource.proto
 - spec/support/resource_service.rb
@@ -469,7 +471,7 @@ homepage: https://github.com/localshred/protobuf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -480,13 +482,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
 test_files:
@@ -552,6 +553,7 @@ test_files:
 - spec/lib/protobuf_spec.rb
 - spec/spec_helper.rb
 - spec/support/all.rb
+- spec/support/google/protobuf/descriptor.pb.rb
 - spec/support/packed_field.rb
 - spec/support/protos/all_types.data.bin
 - spec/support/protos/all_types.data.txt
@@ -573,6 +575,8 @@ test_files:
 - spec/support/protos/map-test.proto
 - spec/support/protos/multi_field_extensions.pb.rb
 - spec/support/protos/multi_field_extensions.proto
+- spec/support/protos/optional_v3_fields.pb.rb
+- spec/support/protos/optional_v3_fields.proto
 - spec/support/protos/resource.pb.rb
 - spec/support/protos/resource.proto
 - spec/support/resource_service.rb

data/.travis.yml

@@ -1,40 +0,0 @@
-before_install:
-  - wget https://github.com/zeromq/libzmq/releases/download/v4.2.1/zeromq-4.2.1.tar.gz
-  - tar xvf zeromq-4.2.1.tar.gz
-  - cd zeromq-4.2.1
-  - ./configure
-  - make -j4
-  - sudo make install
-  # Retrun to project directory
-  - cd ..
-  - sudo -E ./install-protobuf.sh
-  - java -Xmx1g -version
-  - javac -J-Xmx1g -version
-  - export JRUBY_OPTS=-J-Xmx1g
-  - gem update bundler
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - jruby-9.1.17.0
-  - jruby-9.2.5.0
-  - rbx-2
-env:
-  - PROTOBUF_VERSION=2.6.1
-  - PROTOBUF_VERSION=3.0.0-alpha-2
-matrix:
-  allow_failures:
-    - rvm: rbx-2
-    - env: PROTOBUF_VERSION=3.0.0-alpha-2
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/51a956bcd2b1854d6756
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false

data/install-protobuf.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env sh
-
-set -ex
-
-gdie() {
-    echo "$@" >&2
-    exit 1
-}
-
-test -n "$PROTOBUF_VERSION" || die "PROTOBUF_VERSION env var is undefined"
-
-case "$PROTOBUF_VERSION" in
-2*)
-    basename=protobuf-$PROTOBUF_VERSION
-    ;;
-3*)
-    basename=protobuf-cpp-$PROTOBUF_VERSION
-    ;;
-*)
-    die "unknown protobuf version: $PROTOBUF_VERSION"
-    ;;
-esac
-
-curl -sL https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/$basename.tar.gz | tar zx
-
-cd protobuf-$PROTOBUF_VERSION
-
-./configure --prefix=/usr && make -j2 && make install