protobuf 2.4.4-java → 2.4.5-java

data/lib/protobuf/field/field_array.rb

@@ -51,6 +51,7 @@ module Protobuf
       # Private Instance Methods
       #
       def normalize(value)
+        value = value.to_proto if value.respond_to?(:to_proto)
         raise TypeError unless @field.acceptable?(value)
 
         if @field.is_a?(::Protobuf::Field::EnumField)

data/lib/protobuf/field/message_field.rb

@@ -44,6 +44,8 @@ module Protobuf
               @values.delete(field.name)
             when val.is_a?(field.type) then
               @values[field.name] = val
+            when val.respond_to?(:to_proto) then
+              @values[field.name] = val.to_proto
             when val.respond_to?(:to_hash) then
               @values[field.name] = field.type.new(val.to_hash)
             else

data/lib/protobuf/rpc/service.rb

@@ -11,8 +11,8 @@ module Protobuf
     RpcMethod = Struct.new("RpcMethod", :method, :request_type, :response_type)
 
     class Service
-      include Protobuf::Rpc::ServiceFilters
-      include Protobuf::Logger::LogMethods
+      include ::Protobuf::Rpc::ServiceFilters
+      include ::Protobuf::Logger::LogMethods
 
 
       attr_reader :response, :rpc
@@ -98,7 +98,6 @@ module Protobuf
         rpcs.key?(name)
       end
 
-
       ##
       # Instance Methods
       #

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.4.4'
+  VERSION = '2.4.5'
   PROTOC_VERSION = '2.4.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.4.4
+  version: 2.4.5
 platform: java
 authors: 
   - BJ Neilsen