protobuf 2.4.2 → 2.4.3.rc1

data/lib/protobuf/message.rb

@@ -129,7 +129,7 @@ module Protobuf
 
     def clear!
       @values.delete_if do |_, value|
-        if value.is_a?(Field::FieldArray)
+        if value.is_a?(::Protobuf::Field::FieldArray)
           value.clear
           false
         else
@@ -225,15 +225,17 @@ module Protobuf
         (self.__send__(key).present? || [true, false].include?(self.__send__(key)))
     end
 
-    def serialize_to(stream)
+    def serialize_to_string
+      stream = ""
+
       each_field_for_serialization do |field, value|
         if field.repeated?
           if field.packed?
             key = (field.tag << 3) | ::Protobuf::WireType::LENGTH_DELIMITED
             packed_value = value.map { |val| field.encode(val) }.join
-            stream.write(::Protobuf::Field::VarintField.encode(key))
-            stream.write(::Protobuf::Field::VarintField.encode(packed_value.size))
-            stream.write(packed_value)
+            stream << ::Protobuf::Field::VarintField.encode(key)
+            stream << ::Protobuf::Field::VarintField.encode(packed_value.size)
+            stream << packed_value
           else
             value.each { |val| write_pair(stream, field, val) }
           end
@@ -241,14 +243,8 @@ module Protobuf
           write_pair(stream, field, value)
         end
       end
-    end
 
-    def serialize_to_string(string = '')
-      io = StringIO.new(string)
-      serialize_to(io)
-      result = io.string
-      result.force_encoding(::Protobuf::Message::STRING_ENCODING) if result.respond_to?(:force_encoding)
-      result
+      return stream
     end
 
     def set_field(tag, bytes)
@@ -329,7 +325,7 @@ module Protobuf
 
       object.__send__(:initialize)
       @values.each do |name, value|
-        if value.is_a?(Field::FieldArray)
+        if value.is_a?(::Protobuf::Field::FieldArray)
           object.__send__(name).replace(value.map {|v| duplicate.call(v)})
         else
           object.__send__("#{name}=", duplicate.call(value))
@@ -352,10 +348,8 @@ module Protobuf
     # Encode key and value, and write to +stream+.
     def write_pair(stream, field, value)
       key = (field.tag << 3) | field.wire_type
-      key_bytes = ::Protobuf::Field::VarintField.encode(key)
-      stream.write(key_bytes)
-      bytes = field.encode(value)
-      stream.write(bytes)
+      stream << ::Protobuf::Field::VarintField.encode(key)
+      stream << field.encode(value)
     end
 
   end

data/lib/protobuf/message/decoder.rb

@@ -43,10 +43,9 @@ module Protobuf
 
     # Read varint integer value from +stream+.
     def read_varint(stream)
-      read_method = stream.respond_to?(:readbyte) ? :readbyte : :readchar
       value = index = 0
       begin
-        byte = stream.__send__(read_method)
+        byte = stream.readbyte
         value |= (byte & 0x7f) << (7 * index)
         index += 1
       end while (byte & 0x80).nonzero?

data/lib/protobuf/rpc/buffer.rb

@@ -44,7 +44,7 @@ module Protobuf
       end
 
       def set_data(data)
-        @data = data.is_a?(::Protobuf::Message) ? data.serialize_to_string : data.to_s
+        @data = data.to_s
         @size = @data.size
       end
 

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

@@ -104,10 +104,10 @@ module Protobuf
         def rpc_request_data
           validate_request_type
 
-          return Protobuf::Socketrpc::Request.new(
+          return ::Protobuf::Socketrpc::Request.new(
             :service_name => @options[:service].name,
             :method_name => @options[:method].to_s,
-            :request_proto => @options[:request].serialize_to_string
+            :request_proto => @options[:request]
           ).serialize_to_string
         rescue => e
           fail(:INVALID_REQUEST_PROTO, "Could not set request proto: #{e.message}")

data/lib/protobuf/rpc/server.rb

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

data/lib/protobuf/rpc/servers/zmq/worker.rb

@@ -49,7 +49,7 @@ module Protobuf
         end
 
         def send_data
-          response_data = @response.is_a?(::Protobuf::Message) ? @response.serialize_to_string : @response.to_s
+          response_data = @response.to_s # to_s is aliases as serialize_to_string in Message
           @stats.response_size = response_data.size
           zmq_error_check(@socket.send_string(response_data))
         end

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.4.2'
+  VERSION = '2.4.3.rc1'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/benchmark/tasks.rb

@@ -140,6 +140,17 @@ namespace :benchmark do
     puts args[:profile_output]
   end
 
+  desc "benchmark Protobuf Message #serialize"
+  task :profile_protobuf_serialize, [:number, :profile_output] do |t, args|
+    args.with_defaults(:number => 1000, :profile_output => "/tmp/profiler_new_#{Time.now.to_i}")
+    create_params = { :name => "The name that we set", :date_created => Time.now.to_i, :status => 2 }
+    ::PerfTools::CpuProfiler.start(args[:profile_output]) do
+      args[:number].to_i.times { Test::Resource.new(create_params).serialize }
+    end
+
+    puts args[:profile_output]
+  end
+
   desc "benchmark EventMachine client with EventMachine server"
   task :em_client_em_server, [:number, :length] do |t, args|
     args.with_defaults(:number => 1000, :length => 100)

data/spec/lib/protobuf/message_spec.rb

@@ -23,23 +23,21 @@ describe Protobuf::Message do
   describe '#encode' do
     context "when there's no value for a required field" do
       let(:message) { ::Test::Resource.new }
-      let(:stream) { StringIO.new }
 
       it "raises a 'message not initialized' error" do
         expect {
-          message.serialize_to(stream)
+          message.serialize_to_string
         }.to raise_error(Protobuf::SerializationError, /required/i)
       end
     end
 
     context "repeated fields" do 
       let(:message) { ::Test::Resource.new(:name => "something") }
-      let(:stream) { StringIO.new }
 
       it "does not raise an error when repeated fields are []" do
         expect {
           message.repeated_enum = []
-          message.serialize_to(stream)
+          message.serialize_to_string
         }.to_not raise_error
       end
     end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.4.2
-  prerelease: 
+  version: 2.4.3.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - BJ Neilsen
@@ -369,7 +369,6 @@ files:
 - lib/protobuf/logger.rb
 - lib/protobuf/message.rb
 - lib/protobuf/message/decoder.rb
-- lib/protobuf/message/extend.rb
 - lib/protobuf/message/message.rb
 - lib/protobuf/rpc/buffer.rb
 - lib/protobuf/rpc/client.rb
@@ -499,16 +498,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3586960575258099872
+      hash: 952004748095048200
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3586960575258099872
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/protobuf/message/extend.rb

@@ -1,8 +0,0 @@
-require 'protobuf/message/message'
-
-module Protobuf
-  class Extend < Message
-    MIN = -1.0/0
-    MAX = 1.0/0
-  end
-end