protobuf 3.6.12 → 3.7.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c7ec12754d8e386bf82f3a710819b2f443932e5
-  data.tar.gz: 527a850ab4d8a1f01469adfc60047c5d2d21b536
+  metadata.gz: 49fd33e80978059efd20c7e085db8567e84b3bf4
+  data.tar.gz: c56d562e6ba4814d8b023a9761b14d5eef3d719f
 SHA512:
-  metadata.gz: aa0059ae03b3dfdb3119542ad22afa6cbc0d9132f1d1733853ca97b4a690359ff0f796863770fafab961733807389d251e81a7ae5962c0117087447c2811980b
-  data.tar.gz: 49fa4a8044113cf26b7e9b42c70bd3edbef04699c4e34c1938bbe6b3a6111ad8ad135b1439348ad8405d2af6f100f8d2a0bff9aecf24ed88df037fcaa3046849
+  metadata.gz: 56a1dfac3b2e3db4eb26115ecae1ced9585797651551df00b13eabbb2ecaafa8e61ef7ee3e396f1ea9df1377e1c4180983fe79e698e7bcb402042307fed05dc8
+  data.tar.gz: a4cca36a18e7f24e2ed319323bbf0c41c61730d23555d3b52965b93eaf6baea0336af4beb66fe96422f78204d547684b642b74e4dd725e04e4c48b2825e756c9

data/.rubocop_todo.yml

@@ -16,12 +16,12 @@ Metrics/BlockNesting:
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 12
 
 # Offense count: 493
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 196
+  Max: 199
 
 # Offense count: 44
 # Configuration parameters: CountComments.
@@ -31,11 +31,11 @@ Metrics/MethodLength:
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
-  Max: 6
+  Max: 7
 
 # Offense count: 6
 Metrics/PerceivedComplexity:
-  Max: 11
+  Max: 17
 
 # Offense count: 1
 # Cop supports --auto-correct.

data/CHANGES.md

@@ -1,8 +1,19 @@
 # Stable (3.x)
 
-3.6.9
---------
-- Make protobuf serivce directory pluggable.
+3.7.0 (pre0)
+-----------
+- Add `PB_USE_RAW_RPC_NAMES` option to preserve raw RPC name (since #underscore can be lossy).
+- Add `PB_ENUM_UPCASE` option to generate enum values as upcased.
+- Clean up dynamic code generation in prep for extension namespacing.
+- Namespace extension fields.
+- Field values should be stored via their fully qualified names
+- Refresh google/protobuf/descriptor.{proto,pb.rb}
+- Properly encode and decode negative enum values.
+
+3.6.7
+-----
+- An issue was reported with the encode memoization added in #293 with using any array modification
+method on repeated fields. Remove memoization on encode (#305) until we can find a better solution.
 
 3.5.5
 --------

data/lib/protobuf/descriptors/google/protobuf/descriptor.pb.rb

@@ -15,6 +15,7 @@ module Google
     class FileDescriptorProto < ::Protobuf::Message; end
     class DescriptorProto < ::Protobuf::Message
       class ExtensionRange < ::Protobuf::Message; end
+      class ReservedRange < ::Protobuf::Message; end
 
     end
 
@@ -48,6 +49,7 @@ module Google
 
     end
 
+    class OneofDescriptorProto < ::Protobuf::Message; end
     class EnumDescriptorProto < ::Protobuf::Message; end
     class EnumValueDescriptorProto < ::Protobuf::Message; end
     class ServiceDescriptorProto < ::Protobuf::Message; end
@@ -69,6 +71,12 @@ module Google
         define :STRING_PIECE, 2
       end
 
+      class JSType < ::Protobuf::Enum
+        define :JS_NORMAL, 0
+        define :JS_STRING, 1
+        define :JS_NUMBER, 2
+      end
+
     end
 
     class EnumOptions < ::Protobuf::Message; end
@@ -106,6 +114,7 @@ module Google
       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
@@ -114,13 +123,21 @@ module Google
         optional :int32, :end, 2
       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 FieldDescriptorProto
@@ -131,9 +148,14 @@ module Google
       optional :string, :type_name, 6
       optional :string, :extendee, 2
       optional :string, :default_value, 7
+      optional :int32, :oneof_index, 9
       optional ::Google::Protobuf::FieldOptions, :options, 8
     end
 
+    class OneofDescriptorProto
+      optional :string, :name, 1
+    end
+
     class EnumDescriptorProto
       optional :string, :name, 1
       repeated ::Google::Protobuf::EnumValueDescriptorProto, :value, 2
@@ -157,6 +179,8 @@ module Google
       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
@@ -164,11 +188,17 @@ module Google
       optional :string, :java_outer_classname, 8
       optional :bool, :java_multiple_files, 10, :default => false
       optional :bool, :java_generate_equals_and_hash, 20, :default => false
+      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, :deprecated, 23, :default => false
+      optional :bool, :cc_enable_arenas, 31, :default => false
+      optional :string, :objc_class_prefix, 36
+      optional :string, :csharp_namespace, 37
+      optional :bool, :javanano_use_deprecated_package, 38
       repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
       # Extension Fields
       extensions 1000...536870912
@@ -177,6 +207,8 @@ module Google
     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
@@ -185,9 +217,9 @@ module Google
     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 :string, :experimental_map_key, 9
       optional :bool, :weak, 10, :default => false
       repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
       # Extension Fields
@@ -195,25 +227,29 @@ module Google
     end
 
     class EnumOptions
-      optional :bool, :allow_alias, 2, :default => true
+      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
       repeated ::Google::Protobuf::UninterpretedOption, :uninterpreted_option, 999
       # Extension Fields
       extensions 1000...536870912
@@ -240,6 +276,7 @@ module Google
         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

data/lib/protobuf/field.rb

@@ -41,8 +41,8 @@ module Protobuf
       :bool     => ::Protobuf::Field::BoolField,
     }.freeze
 
-    def self.build(message_class, rule, type, name, tag, options = {})
-      field_class(type).new(message_class, rule, field_type(type), name, tag, options)
+    def self.build(message_class, rule, type, name, tag, simple_name, options = {})
+      field_class(type).new(message_class, rule, field_type(type), name, tag, simple_name, options)
     end
 
     # Returns the field class for primitives,

data/lib/protobuf/field/base_field.rb

@@ -21,7 +21,7 @@ module Protobuf
       ##
       # Attributes
       #
-      attr_reader :message_class, :name, :options, :rule, :tag, :type_class
+      attr_reader :message_class, :name, :fully_qualified_name, :options, :rule, :tag, :type_class
 
       ##
       # Class Methods
@@ -35,16 +35,17 @@ module Protobuf
       # Constructor
       #
 
-      def initialize(message_class, rule, type_class, name, tag, options)
+      def initialize(message_class, rule, type_class, fully_qualified_name, tag, simple_name, options)
         @message_class = message_class
-        @name          = name
+        @name = simple_name || fully_qualified_name
+        @fully_qualified_name = fully_qualified_name
         @rule          = rule
         @tag           = tag
         @type_class    = type_class
         @options       = options
 
         validate_packed_field if packed?
-        define_accessor
+        define_accessor(simple_name, fully_qualified_name) if simple_name
         tag_encoded
       end
 
@@ -69,10 +70,12 @@ module Protobuf
       end
 
       def default_value
-        @default_value ||= case
-                           when optional? then typed_default_value
-                           when repeated? then ::Protobuf::Field::FieldArray.new(self).freeze
-                           when required? then nil
+        @default_value ||= if optional? || required?
+                             typed_default_value
+                           elsif repeated?
+                             ::Protobuf::Field::FieldArray.new(self).freeze
+                           else
+                             fail "Unknown field label -- something went very wrong"
                            end
       end
 
@@ -122,10 +125,10 @@ module Protobuf
 
       # FIXME: need to cleanup (rename) this warthog of a method.
       def set(message_instance, bytes)
-        return message_instance.__send__(setter, decode(bytes)) unless repeated?
-        return message_instance.__send__(getter) << decode(bytes) unless packed?
+        return message_instance[name] = decode(bytes) unless repeated?
+        return message_instance[name] << decode(bytes) unless packed?
 
-        array = message_instance.__send__(getter)
+        array = message_instance[name]
         stream = StringIO.new(bytes)
 
         if wire_type == ::Protobuf::WireType::VARINT
@@ -163,93 +166,33 @@ module Protobuf
         ::Protobuf::WireType::VARINT
       end
 
+      def fully_qualified_name_only!
+        @name = @fully_qualified_name
+      end
+
       private
 
       ##
       # Private Instance Methods
       #
 
-      def define_accessor
-        if repeated?
-          define_array_getter
-          define_array_setter
-        else
-          define_getter
-          define_setter
-        end
-      end
-
-      def define_array_getter
-        field = self
-        method_name = field.getter
-
+      def define_accessor(simple_field_name, fully_qualified_field_name)
         message_class.class_eval do
-          define_method(method_name) do
-            @values[field.name] ||= ::Protobuf::Field::FieldArray.new(field)
+          define_method("#{simple_field_name}!") do
+            @values[fully_qualified_field_name]
           end
         end
 
-        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
-      end
-
-      def define_array_setter
-        field = self
-        method_name = field.setter
-
         message_class.class_eval do
-          define_method(method_name) do |val|
-            if val.is_a?(Array)
-              val = val.dup
-              val.compact!
-            else
-              fail TypeError, <<-TYPE_ERROR
-                Expected repeated value of type '#{field.type_class}'
-                Got '#{val.class}' for repeated protobuf field #{field.name}
-              TYPE_ERROR
-            end
-
-            if val.nil? || (val.respond_to?(:empty?) && val.empty?)
-              @values.delete(field.name)
-            else
-              @values[field.name] ||= ::Protobuf::Field::FieldArray.new(field)
-              @values[field.name].replace(val)
-            end
-          end
+          define_method(simple_field_name) { self[fully_qualified_field_name] }
+          define_method("#{simple_field_name}=") { |v| self[fully_qualified_field_name] = v }
         end
 
-        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
-      end
-
-      def define_getter
-        field = self
-        method_name = field.getter
-
-        message_class.class_eval do
-          define_method(method_name) do
-            @values[field.name] || field.default_value
-          end
-        end
-
-        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
-      end
-
-      def define_setter
-        field = self
-        method_name = field.setter
-
-        message_class.class_eval do
-          define_method(method_name) do |val|
-            if val.nil? || (val.respond_to?(:empty?) && val.empty?)
-              @values.delete(field.name)
-            elsif field.acceptable?(val)
-              @values[field.name] = field.coerce!(val)
-            else
-              fail TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type_class}"
-            end
-          end
-        end
+        return unless deprecated?
 
-        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
+        ::Protobuf.field_deprecator.deprecate_method(message_class, simple_field_name)
+        ::Protobuf.field_deprecator.deprecate_method(message_class, "#{simple_field_name}!")
+        ::Protobuf.field_deprecator.deprecate_method(message_class, "#{simple_field_name}=")
       end
 
       def typed_default_value

data/lib/protobuf/field/bool_field.rb

@@ -45,21 +45,11 @@ module Protobuf
       # Private Instance Methods
       #
 
-      def define_getter
-        field = self
-        method_name = field.getter
-
+      def define_accessor(simple_field_name, _fully_qualified_field_name)
+        super
         message_class.class_eval do
-          define_method(method_name) do
-            @values.fetch(field.name, field.default_value)
-          end
+          alias_method "#{simple_field_name}?", simple_field_name
         end
-
-        message_class.class_eval do
-          alias_method "#{method_name}?", method_name
-        end
-
-        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
       end
 
     end

data/lib/protobuf/field/bytes_field.rb

@@ -33,7 +33,6 @@ module Protobuf
       end
 
       def encode(value)
-        value_to_encode = ""
         if value.is_a?(::Protobuf::Message)
           value_to_encode = value.encode
         else
@@ -50,32 +49,17 @@ module Protobuf
         ::Protobuf::WireType::LENGTH_DELIMITED
       end
 
-      private
-
-      ##
-      # Private Instance Methods
-      #
-
-      def define_setter
-        field = self
-        method_name = field.setter
-
-        message_class.class_eval do
-          define_method(method_name) do |val|
-            case val
-            when String, Symbol
-              @values[field.name] = "#{val}"
-            when NilClass
-              @values.delete(field.name)
-            when ::Protobuf::Message
-              @values[field.name] = val.dup
-            else
-              fail TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type_class}"
-            end
-          end
+      def coerce!(value)
+        case value
+        when String, Symbol
+          "#{value}"
+        when NilClass
+          nil
+        when ::Protobuf::Message
+          value.dup
+        else
+          fail TypeError, "Unacceptable value #{value} for field #{name} of type #{type_class}"
         end
-
-        ::Protobuf.field_deprecator.deprecate_method(message_class, method_name) if field.deprecated?
       end
     end
   end