protobuf 3.10.5 → 3.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e3465827a6baf50d8cb30a689bd13858d7423390f2cb0405929e494578bac2a
-  data.tar.gz: 88b6210d9bbe3323a8b7f81e3c3d6f5d3c6cb404637a31fe04ff57a6bb2a4c2e
+  metadata.gz: f345ac51b45d74ca337c48e64d8ffb42e2447827e9fa5b483a7602ef47cc6743
+  data.tar.gz: d5ac75f75f3e27c75d4ad2066bd5160df7288136fd5c87323a7918034c025adb
 SHA512:
-  metadata.gz: 2d84ed2d0d670143cf9d59e664a7ad3e50ad8e0f1293594f5784f249e63b81e5d9ebfe55d1defbc8b1c058333b6faba72e217929dec752dedf87a58758310941
-  data.tar.gz: 5119bb0a3370b04323883962b6f8bd56c9c319a95155e83793bbc69d7879b1a75923e2e4c3164593adddd0aaceda7e18031a07b9badc0562ded3b698a1f4d481
+  metadata.gz: 62c4eb8312892d27bbb8f0f2917a63fd40519c3d6b3e36eb8825128d086d2913fe73f0d3db6acf035086a4b628ffe7ed3d838718f3301061edbf21f5bca81edb
+  data.tar.gz: 6fa9ec62ef8a47feec93a6b9f6b2c1cad220b1dd2001dd4b96a5ac75c1a3f7b81a2c7ee4342244e61ba649a7d075e572991bb162ff1b85cb6f2d5cf974e63d7c

data/.circleci/config.yml

@@ -42,7 +42,5 @@ workflows:
               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/lib/protobuf/generators/enum_generator.rb

@@ -29,6 +29,7 @@ module Protobuf
 
       def build_value(enum_value_descriptor)
         name = enum_value_descriptor.name
+        name.capitalize! if ENV.key?('PB_CAPITALIZE_ENUMS')
         name.upcase! if ENV.key?('PB_UPCASE_ENUMS')
         number = enum_value_descriptor.number
         "define :#{name}, #{number}"

data/lib/protobuf/generators/field_generator.rb

@@ -140,6 +140,8 @@ module Protobuf
         optionally_upcased_default =
           if ENV.key?('PB_UPCASE_ENUMS')
             verbatim_default_value.upcase
+          elsif ENV.key?('PB_CAPITALIZE_ENUMS')
+            verbatim_default_value.capitalize
           else
             verbatim_default_value
           end

data/lib/protobuf/rpc/error.rb

@@ -13,12 +13,12 @@ module Protobuf
         super message
       end
 
-      def encode
-        to_response.encode
+      def encode(args = {})
+        to_response(args).encode
       end
 
-      def to_response
-        ::Protobuf::Socketrpc::Response.new(:error => message, :error_reason => error_type)
+      def to_response(args = {})
+        ::Protobuf::Socketrpc::Response.new({ :error => message, :error_reason => error_type }.merge(args))
       end
     end
   end

data/lib/protobuf/rpc/middleware/exception_handler.rb

@@ -22,7 +22,7 @@ module Protobuf
           # Rescue exceptions, re-wrap them as generic Protobuf errors,
           # and encode them
           env.response = wrap_exception(exception)
-          env.encoded_response = env.response.encode
+          env.encoded_response = wrap_and_encode_with_server(env.response, env)
           env
         end
 
@@ -34,6 +34,17 @@ module Protobuf
           exception = RpcFailed.new(exception.message) unless exception.is_a?(PbError)
           exception
         end
+
+        # If the response is a PbError, it won't have the server merged into the response proto.
+        # We should add it here since exception handler is always at the bottom of the middleware
+        # stack. Without this, the server hostname in the client rpc log will not be set.
+        def wrap_and_encode_with_server(response, env)
+          if response.is_a?(PbError)
+            response.encode(:server => env.server)
+          else
+            response.encode
+          end
+        end
       end
     end
   end

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.10.5' # rubocop:disable Style/MutableConstant
+  VERSION = '3.10.7' # rubocop:disable Style/MutableConstant
 end

data/spec/lib/protobuf/generators/enum_generator_spec.rb

@@ -71,12 +71,23 @@ end
 
     context 'with PB_UPCASE_ENUMS set' do
       before { allow(ENV).to receive(:key?).with('PB_UPCASE_ENUMS').and_return(true) }
+      before { allow(ENV).to receive(:key?).with('PB_CAPITALIZE_ENUMS').and_return(false) }
       let(:values) { [{ :name => 'boom', :number => 1 }] }
 
       it 'returns a string with the given enum name in ALL CAPS' do
         expect(subject.build_value(enum.value.first)).to eq("define :BOOM, 1")
       end
     end
+
+    context 'with PB_CAPITALIZE_ENUMS set' do
+      before { allow(ENV).to receive(:key?).with('PB_UPCASE_ENUMS').and_return(false) }
+      before { allow(ENV).to receive(:key?).with('PB_CAPITALIZE_ENUMS').and_return(true) }
+      let(:values) { [{ :name => 'boom', :number => 1 }] }
+
+      it 'returns a string with the given enum name in ALL CAPS' do
+        expect(subject.build_value(enum.value.first)).to eq("define :Boom, 1")
+      end
+    end
   end
 
 end

data/spec/lib/protobuf/generators/field_generator_spec.rb

@@ -67,10 +67,21 @@ RSpec.describe ::Protobuf::Generators::FieldGenerator do
         let(:type_name) { '.foo.bar.Baz' }
         let(:default_value) { 'quux' }
         before { allow(ENV).to receive(:key?).with('PB_UPCASE_ENUMS').and_return(true) }
+        before { allow(ENV).to receive(:key?).with('PB_CAPITALIZE_ENUMS').and_return(false) }
 
         specify { expect(subject).to eq "  optional ::Foo::Bar::Baz, :foo_bar, 3, :default => ::Foo::Bar::Baz::QUUX\n" }
       end
 
+      context 'when type is an enum with lowercase default value with PB_CAPITALIZE_ENUMS set' do
+        let(:type_enum) { :TYPE_ENUM }
+        let(:type_name) { '.foo.bar.Baz' }
+        let(:default_value) { 'quux' }
+        before { allow(ENV).to receive(:key?).with('PB_UPCASE_ENUMS').and_return(false) }
+        before { allow(ENV).to receive(:key?).with('PB_CAPITALIZE_ENUMS').and_return(true) }
+
+        specify { expect(subject).to eq "  optional ::Foo::Bar::Baz, :foo_bar, 3, :default => ::Foo::Bar::Baz::Quux\n" }
+      end
+
       context 'when the type is a string' do
         let(:type_enum) { :TYPE_STRING }
         let(:default_value) { "a default \"string\"" }

data/spec/lib/protobuf/rpc/middleware/exception_handler_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Protobuf::Rpc::Middleware::ExceptionHandler do
   let(:app) { proc { |env| env } }
-  let(:env) { Protobuf::Rpc::Env.new }
+  let(:env) { Protobuf::Rpc::Env.new("server" => "cooldude") }
 
   subject { described_class.new(app) }
 
@@ -17,7 +17,7 @@ RSpec.describe Protobuf::Rpc::Middleware::ExceptionHandler do
     end
 
     context "when exceptions occur" do
-      let(:encoded_error) { error.encode }
+      let(:encoded_error) { error.encode(:server => "cooldude") }
       let(:error) { Protobuf::Rpc::MethodNotFound.new('Boom!') }
 
       before { allow(app).to receive(:call).and_raise(error, 'Boom!') }
@@ -42,7 +42,7 @@ RSpec.describe Protobuf::Rpc::Middleware::ExceptionHandler do
       end
 
       context "when exception is not a Protobuf error" do
-        let(:encoded_error) { error.encode }
+        let(:encoded_error) { error.encode(:server => "cooldude") }
         let(:error) { Protobuf::Rpc::RpcFailed.new('Boom!') }
 
         before { allow(app).to receive(:call).and_raise(RuntimeError, 'Boom!') }

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'timecop'
-require 'active_support/core_ext/numeric/time'
+require 'active_support/all'
 
 RSpec.describe ::Protobuf::Rpc::Stat do
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.10.5
+  version: 3.10.7
 platform: ruby
 authors:
 - BJ Neilsen
 - Brandon Dewitt
 - Devin Christensen
 - Adam Hutchison
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -471,7 +471,7 @@ homepage: https://github.com/localshred/protobuf
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -486,8 +486,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
 test_files: