Merge pull request #391 from ruby-protobuf/bdewitt/remove_helpers

Bdewitt/remove helpers

Author: abrandoned

.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
   DisplayCopNames: true
   Exclude:
     - 'spec/support/protos/*.pb.rb'
+    - 'varint_prof.rb'
 
 Lint/EndAlignment:
   AlignWith: keyword

.travis.yml

@@ -11,19 +11,18 @@ before_install:
   - java -Xmx1g -version
   - javac -J-Xmx1g -version
   - export JRUBY_OPTS=-J-Xmx1g
-  # Required for rainbow installation issue, https://github.com/sickill/rainbow/issues/44
-  - gem update --system
   - gem update bundler
 language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
-  - 2.2.2
   - 2.3
   - 2.4
-  - jruby-9.1.7.0
+  - 2.5
+  - jruby-9.1.17.0
+  - jruby-9.2.5.0
   - rbx-2
 env:
   - PROTOBUF_VERSION=2.6.1

lib/protobuf.rb

@@ -9,6 +9,20 @@
 require 'active_support/inflector'
 require 'active_support/json'
 require 'active_support/notifications'
+# Under MRI, this optimizes proto decoding by around 15% in tests.
+# When unavailable, we fall to pure Ruby.
+# rubocop:disable Lint/HandleExceptions
+begin
+  require 'varint/varint'
+rescue LoadError
+end
+# rubocop:enable Lint/HandleExceptions
+# rubocop:disable Lint/HandleExceptions
+begin
+  require 'protobuf_java_helpers'
+rescue LoadError
+end
+# rubocop:enable Lint/HandleExceptions
 
 # All top-level run time code requires, ordered by necessity
 require 'protobuf/wire_type'

lib/protobuf/code_generator.rb

@@ -50,6 +50,35 @@ def response_bytes
     end
 
     Protobuf::Field::BaseField.module_eval do
+      def define_set_method!
+      end
+
+      def set_without_options(message_instance, bytes)
+        return message_instance[name] = decode(bytes) unless repeated?
+
+        if map?
+          hash = message_instance[name]
+          entry = decode(bytes)
+          # decoded value could be nil for an
+          # enum value that is not recognized
+          hash[entry.key] = entry.value unless entry.value.nil?
+          return hash[entry.key]
+        end
+
+        return message_instance[name] << decode(bytes) unless packed?
+
+        array = message_instance[name]
+        stream = StringIO.new(bytes)
+
+        if wire_type == ::Protobuf::WireType::VARINT
+          array << decode(Varint.decode(stream)) until stream.eof?
+        elsif wire_type == ::Protobuf::WireType::FIXED64
+          array << decode(stream.read(8)) until stream.eof?
+        elsif wire_type == ::Protobuf::WireType::FIXED32
+          array << decode(stream.read(4)) until stream.eof?
+        end
+      end
+
       # Sets a MessageField that is known to be an option.
       # We must allow fields to be set one at a time, as option syntax allows us to
       # set each field within the option using a separate "option" line.
@@ -72,6 +101,7 @@ def set_with_options(message_instance, bytes)
 
         set_without_options(message_instance, bytes)
       end
+      alias_method :set, :set_with_options
 
       def option_set(message_field, subfield, subvalue)
         return unless yield
@@ -85,9 +115,6 @@ def option_set(message_field, subfield, subvalue)
           message_field[subfield.tag] = subvalue
         end
       end
-
-      alias_method :set_without_options, :set
-      alias_method :set, :set_with_options
     end
   end
 end

lib/protobuf/encoder.rb

@@ -2,18 +2,7 @@ module Protobuf
   class Encoder
     def self.encode(message, stream)
       message.each_field_for_serialization do |field, value|
-        if field.repeated?
-          if field.packed?
-            packed_value = value.map { |val| field.encode(val) }.join
-            stream << "#{field.tag_encoded}#{::Protobuf::Field::VarintField.encode(packed_value.size)}#{packed_value}"
-          else
-            value.each do |val|
-              field.encode_to_stream(val, stream)
-            end
-          end
-        else
-          field.encode_to_stream(value, stream)
-        end
+        field.encode_to_stream(value, stream)
       end
 
       stream

lib/protobuf/enum.rb

@@ -58,6 +58,7 @@ def self.define(name, tag)
       # to be incorrect; reset them
       @mapped_enums = @values = nil
       const_set(name, enum)
+      mapped_enums
     end
 
     # Internal: A mapping of enum number -> enums defined
@@ -132,6 +133,10 @@ def self.enum_for_tag(tag)
       tag && (mapped_enums[tag.to_i] || []).first
     end
 
+    def self.enum_for_tag_integer(tag)
+      (@mapped_enums[tag] || []).first
+    end
+
     # Public: Get an Enum by a variety of type-checking mechanisms.
     #
     # candidate - An Enum, Numeric, String, or Symbol object.
@@ -153,7 +158,7 @@ def self.enum_for_tag(tag)
     # Returns an Enum object or nil.
     #
     def self.fetch(candidate)
-      return enum_for_tag(candidate) if candidate.is_a?(::Integer)
+      return enum_for_tag_integer(candidate) if candidate.is_a?(::Integer)
 
       case candidate
       when self
@@ -308,10 +313,6 @@ def inspect
       "\#<Protobuf::Enum(#{parent_class})::#{name}=#{tag}>"
     end
 
-    def to_i
-      tag
-    end
-
     def to_int
       tag.to_int
     end
@@ -352,12 +353,13 @@ def try(*args, &block)
       end
     end
 
-    ::Protobuf.deprecator.define_deprecated_methods(self, :value => :to_i)
-
     ##
     # Instance Aliases
     #
-    alias :to_hash_value to_i
-    alias :to_json_hash_value to_i
+    alias :to_i tag
+    alias :to_hash_value tag
+    alias :to_json_hash_value tag
+
+    ::Protobuf.deprecator.define_deprecated_methods(self, :value => :to_i)
   end
 end