protobuf 3.3.6 → 3.4.0

data/lib/protobuf/field/bool_field.rb

@@ -12,7 +12,6 @@ module Protobuf
         false
       end
 
-
       ##
       # Public Instance Methods
       # #
@@ -39,15 +38,16 @@ module Protobuf
         super
 
         field = self
+        method_name = "#{field.getter}?"
+
         message_class.class_eval do
-          define_method("#{field.getter}?") do
-            field.warn_if_deprecated
+          define_method(method_name) do
             @values.fetch(field.name, field.default_value)
           end
+          ::Protobuf.deprecator.deprecate_methods(method_name)
         end
       end
 
     end
   end
 end
-

data/lib/protobuf/field/bytes_field.rb

@@ -53,10 +53,11 @@ module Protobuf
 
       def define_setter
         field = self
+        method_name = field.setter
+
         message_class.class_eval do
-          define_method(field.setter) do |val|
+          define_method(method_name) do |val|
             begin
-              field.warn_if_deprecated
               val = "#{val}" if val.is_a?(Symbol)
 
               if val.nil?
@@ -64,7 +65,7 @@ module Protobuf
               elsif field.acceptable?(val)
                 @values[field.name] = val.dup
               else
-                raise TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type_class}"
+                fail TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type_class}"
               end
             rescue NoMethodError => ex
               logger.error { ex.message }
@@ -72,10 +73,10 @@ module Protobuf
               raise TypeError, "Got NoMethodError attempting to set #{val} for field #{field.name} of type #{field.type_class}: #{ex.message}"
             end
           end
+          ::Protobuf.deprecator.deprecate_methods(method_name)
         end
       end
 
     end
   end
 end
-

data/lib/protobuf/field/double_field.rb

@@ -23,4 +23,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/enum_field.rb

@@ -9,7 +9,7 @@ module Protobuf
       #
 
       def self.default
-        raise NoMethodError, "#{self}.#{__method__} must be called on an instance"
+        fail NoMethodError, "#{self}.#{__method__} must be called on an instance"
       end
 
       ##
@@ -17,7 +17,7 @@ module Protobuf
       #
 
       def acceptable?(val)
-        ! type_class.fetch(val).nil?
+        !type_class.fetch(val).nil?
       end
 
       def encode(value)
@@ -25,9 +25,7 @@ module Protobuf
       end
 
       def decode(value)
-        if acceptable?(value)
-          value
-        end
+        value if acceptable?(value)
       end
 
       def enum?
@@ -49,7 +47,7 @@ module Protobuf
               @values.delete(field.name)
             else
               value = field.type_class.fetch(value)
-              raise TypeError, "Invalid Enum value: #{orig_value.inspect} for #{field.name}" unless value
+              fail TypeError, "Invalid Enum value: #{orig_value.inspect} for #{field.name}" unless value
 
               @values[field.name] = value
             end
@@ -68,4 +66,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/field_array.rb

@@ -41,7 +41,7 @@ module Protobuf
       # Return a hash-representation of the given values for this field type.
       # The value in this case would be an array.
       def to_hash_value
-        self.map do |value|
+        map do |value|
           value.respond_to?(:to_hash_value) ? value.to_hash_value : value
         end
       end
@@ -62,7 +62,7 @@ module Protobuf
 
       def normalize(value)
         value = value.to_proto if value.respond_to?(:to_proto)
-        raise TypeError, "Unacceptable value #{value} for field #{field.name} of type #{field.type_class}" unless field.acceptable?(value)
+        fail TypeError, "Unacceptable value #{value} for field #{field.name} of type #{field.type_class}" unless field.acceptable?(value)
 
         if field.is_a?(::Protobuf::Field::EnumField)
           field.type_class.fetch(value)
@@ -74,7 +74,7 @@ module Protobuf
       end
 
       def raise_type_error(val)
-        raise TypeError, <<-TYPE_ERROR
+        fail TypeError, <<-TYPE_ERROR
           Expected repeated value of type '#{field.type_class}'
           Got '#{val.class}' for repeated protobuf field #{field.name}
         TYPE_ERROR
@@ -83,4 +83,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/fixed32_field.rb

@@ -17,7 +17,7 @@ module Protobuf
       end
 
       def wire_type
-       ::Protobuf::WireType::FIXED32
+        ::Protobuf::WireType::FIXED32
       end
 
     end

data/lib/protobuf/field/fixed64_field.rb

@@ -26,4 +26,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/float_field.rb

@@ -39,4 +39,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/int32_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/int64_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/integer_field.rb

@@ -21,4 +21,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/message_field.rb

@@ -10,7 +10,7 @@ module Protobuf
 
       def acceptable?(val)
         unless val.instance_of?(type_class) || val.respond_to?(:to_hash)
-          raise TypeError, "Expected value of type '#{type_class}' for field #{name}, but got '#{val.class}'"
+          fail TypeError, "Expected value of type '#{type_class}' for field #{name}, but got '#{val.class}'"
         end
 
         true
@@ -54,7 +54,7 @@ module Protobuf
             when val.respond_to?(:to_hash) then
               @values[field.name] = field.type_class.new(val.to_hash)
             else
-              raise TypeError, "Expected value of type '#{field.type_class}' for field #{field.name}, but got '#{val.class}'"
+              fail TypeError, "Expected value of type '#{field.type_class}' for field #{field.name}, but got '#{val.class}'"
             end
           end
         end
@@ -63,4 +63,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/sfixed32_field.rb

@@ -25,4 +25,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/sfixed64_field.rb

@@ -26,4 +26,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/signed_integer_field.rb

@@ -27,4 +27,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/sint32_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/sint64_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/string_field.rb

@@ -32,4 +32,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/uint32_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/uint64_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/varint_field.rb

@@ -65,4 +65,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/generators/base.rb

@@ -62,10 +62,9 @@ module Protobuf
       end
 
       def type_namespace
-        @type_namespace ||= @namespace + [ descriptor.name ]
+        @type_namespace ||= @namespace + [descriptor.name]
       end
 
     end
   end
 end
-

data/lib/protobuf/generators/enum_generator.rb

@@ -33,10 +33,9 @@ module Protobuf
       def build_value(enum_value_descriptor)
         name = enum_value_descriptor.name
         number = enum_value_descriptor.number
-        return "define :#{name}, #{number}"
+        "define :#{name}, #{number}"
       end
 
     end
   end
 end
-

data/lib/protobuf/generators/extension_generator.rb

@@ -16,7 +16,7 @@ module Protobuf
           print_class(@message_type, :message) do
             group = GroupGenerator.new(current_indent)
             group.add_extension_fields(@field_descriptors)
-            group.order = [ :extension_field ]
+            group.order = [:extension_field]
             print group.to_s
           end
         end
@@ -25,4 +25,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/generators/field_generator.rb

@@ -54,7 +54,7 @@ module Protobuf
 
       def compile
         run_once(:compile) do
-          field_definition = [ "#{label} #{type_name}", name, number, applicable_options ]
+          field_definition = ["#{label} #{type_name}", name, number, applicable_options]
           puts field_definition.flatten.compact.join(', ')
         end
       end
@@ -91,10 +91,10 @@ module Protobuf
         @type_name ||= begin
                          case descriptor.type.name
                          when :TYPE_MESSAGE, :TYPE_ENUM, :TYPE_GROUP then
-                           type_name = modulize(descriptor.type_name)
+                           modulize(descriptor.type_name)
                          else
                            type_name = descriptor.type.name.to_s.downcase.sub(/type_/, '')
-                           type_name = ":#{type_name}"
+                           ":#{type_name}"
                          end
                        end
       end
@@ -119,7 +119,7 @@ module Protobuf
       end
 
       def string_default_value
-        %Q{"#{verbatim_default_value.gsub(/'/, '\\\\\'')}"}
+        %("#{verbatim_default_value.gsub(/'/, '\\\\\'')}")
       end
 
       def verbatim_default_value
@@ -129,4 +129,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/generators/file_generator.rb

@@ -22,8 +22,7 @@ module Protobuf
 
       def compile
         run_once(:compile) do
-          map_extensions(descriptor, [ descriptor.package ])
-          extract_dangling_extensions
+          map_extensions(descriptor, [descriptor.package])
 
           print_file_comment
           print_generic_requires
@@ -31,10 +30,10 @@ module Protobuf
 
           print_package do
             group = GroupGenerator.new(current_indent)
-            group.add_enums(descriptor.enum_type, :namespace => [ descriptor.package ])
+            group.add_enums(descriptor.enum_type, :namespace => [descriptor.package])
             group.add_message_declarations(descriptor.message_type)
-            group.add_messages(descriptor.message_type, :extension_fields => @extension_fields, :namespace => [ descriptor.package ])
-            group.add_extended_messages(@unknown_extensions)
+            group.add_messages(descriptor.message_type, :extension_fields => @extension_fields, :namespace => [descriptor.package])
+            group.add_extended_messages(unknown_extensions)
             group.add_services(descriptor.service)
 
             group.add_header(:enum, 'Enum Classes')
@@ -48,9 +47,9 @@ module Protobuf
         end
       end
 
-      def extract_dangling_extensions
-        @unknown_extensions = @extension_fields.select do |k, v|
-          ! @known_messages.include?(k)
+      def unknown_extensions
+        @unknown_extensions ||= @extension_fields.reject do |k, _|
+          @known_messages.include?(k)
         end
       end
 
@@ -79,20 +78,18 @@ module Protobuf
           @extension_fields[field_descriptor.extendee] << field_descriptor
         end
 
-        if descriptor.respond_to_has_and_present?(:message_type)
-          descriptor.message_type.each do |message_descriptor|
-            map_extensions(message_descriptor, (namespaces + [ message_descriptor.name ]))
-          end
-        end
+        [:message_type, :nested_type].each do |type|
+          next unless descriptor.respond_to_has_and_present?(type)
 
-        if descriptor.respond_to_has_and_present?(:nested_type)
-          descriptor.nested_type.each do |nested_descriptor|
-            map_extensions(nested_descriptor, (namespaces + [ nested_descriptor.name ]))
+          descriptor.public_send(type).each do |type_descriptor|
+            map_extensions(type_descriptor, (namespaces + [type_descriptor.name]))
           end
         end
       end
 
       def print_file_comment
+        puts "# encoding: utf-8"
+        puts
         puts "##"
         puts "# This file is auto-generated. DO NOT EDIT!"
         puts "#"
@@ -105,23 +102,22 @@ module Protobuf
       end
 
       def print_import_requires
-        if descriptor.dependency.count > 0
-          header "Imports"
+        return if descriptor.dependency.empty?
 
-          descriptor.dependency.each do |dependency|
-            print_require(convert_filename(dependency))
-          end
+        header "Imports"
 
-          puts
+        descriptor.dependency.each do |dependency|
+          print_require(convert_filename(dependency))
         end
+
+        puts
       end
 
       def print_package(&block)
-        final = lambda { block.call }
         namespaces = descriptor.package.split('.')
-        namespaces.reverse.inject(final) { |previous, namespace|
-          lambda { print_module(namespace, &previous) }
-        }.call
+        namespaces.reverse.reduce(block) do |previous, namespace|
+          -> { print_module(namespace, &previous) }
+        end.call
       end
 
       private
@@ -137,4 +133,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/generators/group_generator.rb

@@ -18,7 +18,7 @@ module Protobuf
         @comments = {}
         @handlers = {}
         @indent_level = indent_level
-        @order = [ :enum, :message_declaration, :message, :extended_message, :service ]
+        @order = [:enum, :message_declaration, :message, :extended_message, :service]
         init_printer(indent_level)
       end
 
@@ -80,25 +80,25 @@ module Protobuf
       def compile
         @order.each do |type|
           items = @groups[type]
-          if items.count > 0
-            item_handler = @handlers[type]
+          next if items.empty?
 
-            item_header = @headers[type]
-            header(item_header) if item_header
+          item_handler = @handlers[type]
 
-            item_comment = @comments[type]
-            comment(item_comment) if item_comment
+          item_header = @headers[type]
+          header(item_header) if item_header
 
-            items.each do |item|
-              if item_handler
-                puts item_handler.call(item)
-              else
-                print item.to_s
-              end
-            end
+          item_comment = @comments[type]
+          comment(item_comment) if item_comment
 
-            puts if type == :message_declaration
+          items.each do |item|
+            if item_handler
+              puts item_handler.call(item)
+            else
+              print item.to_s
+            end
           end
+
+          puts if type == :message_declaration
         end
       end
 
@@ -110,4 +110,3 @@ module Protobuf
     end
   end
 end
-