protobuf 2.6.2-java → 2.6.3-java

data/lib/protobuf/field/base_field.rb

@@ -1,3 +1,4 @@
+require 'protobuf'
 require 'protobuf/wire_type'
 require 'protobuf/field/field_array'
 
@@ -172,8 +173,8 @@ module Protobuf
               val.compact!
             else
               error_text = <<-TYPE_ERROR
-                Expected value of type '#{field.type}'
-                Got '#{val.class}' for protobuf field #{field.name}
+                Expected repeated value of type '#{field.type}'
+                Got '#{val.class}' for repeated protobuf field #{field.name}
               TYPE_ERROR
 
               raise TypeError, error_text
@@ -210,7 +211,7 @@ module Protobuf
             elsif field.acceptable?(val)
               @values[field.name] = val
             else
-              raise TypeError, "unacceptable value #{val} for type #{field.type}"
+              raise TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type}"
             end
           end
         end

data/lib/protobuf/field/bytes_field.rb

@@ -18,7 +18,7 @@ module Protobuf
       end
 
       def decode(bytes)
-        bytes.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING) 
+        bytes.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
         bytes
       end
 
@@ -34,10 +34,12 @@ module Protobuf
               elsif field.acceptable?(val)
                 @values[field.name] = val.dup
               else
-                raise TypeError, "unacceptable value #{val} for type #{field.type}"
+                raise TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type}"
               end
             rescue NoMethodError => ex
-              raise TypeError, "unacceptable value #{val} for type #{field.type} field #{field.name}"
+              ::Protobuf::Logger.error { ex.message }
+              ::Protobuf::Logger.error { ex.backtrace.join("\n") }
+              raise TypeError, "Got NoMethodError attempting to set #{val} for field #{field.name} of type #{field.type}: #{ex.message}"
             end
           end
         end
@@ -45,7 +47,7 @@ module Protobuf
 
       def encode(value)
         value = value.serialize_to_string if value.is_a?(::Protobuf::Message)
-        value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING) 
+        value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
 
         string_size = ::Protobuf::Field::VarintField.encode(value.size)
         string_size << value

data/lib/protobuf/field/enum_field.rb

@@ -6,11 +6,11 @@ module Protobuf
       def acceptable?(val)
         case val
         when Symbol then
-          raise TypeError unless @type.const_defined?(val)
+          raise TypeError, "Enum #{val} is not known for type #{@type}" unless @type.const_defined?(val)
         when EnumValue then
-          raise TypeError if val.parent_class != @type
+          raise TypeError, "Enum #{val} is not owned by #{@type}" if val.parent_class != @type
         else
-          raise TypeError unless @type.valid_tag?(val)
+          raise TypeError, "Tag #{val} is not valid for Enum #{@type}" unless @type.valid_tag?(val)
         end
         true
       end
@@ -42,7 +42,7 @@ module Protobuf
               @values.delete(field.name)
             else
               value = field.type.fetch(value)
-              raise TypeError, "Invalid ENUM value: #{orig_value.inspect} for #{field.name}" unless value
+              raise TypeError, "Invalid Enum value: #{orig_value.inspect} for #{field.name}" unless value
 
               @values[field.name] = value
             end

data/lib/protobuf/field/field_array.rb

@@ -52,7 +52,7 @@ module Protobuf
       #
       def normalize(value)
         value = value.to_proto if value.respond_to?(:to_proto)
-        raise TypeError unless @field.acceptable?(value)
+        raise TypeError, "Unacceptable value #{value} for field #{@field.name} of type #{@field.type}" unless @field.acceptable?(value)
 
         if @field.is_a?(::Protobuf::Field::EnumField)
           @field.type.fetch(value)
@@ -65,8 +65,8 @@ module Protobuf
 
       def raise_type_error(val)
         error_text = <<-TYPE_ERROR
-          Expected value of type '#{@field.type}'
-          Got '#{val.class}' for protobuf field #{@field.name}
+          Expected repeated value of type '#{@field.type}'
+          Got '#{val.class}' for repeated protobuf field #{@field.name}
         TYPE_ERROR
 
         raise TypeError, error_text

data/lib/protobuf/field/message_field.rb

@@ -3,7 +3,7 @@ require 'protobuf/field/base_field'
 module Protobuf
   module Field
     class MessageField < BaseField
-      RAISE_TYPE = lambda { |field, val| raise TypeError, "Expected value of type '#{field.type}', but got '#{val.class}'" }
+      RAISE_TYPE = lambda { |field, val| raise TypeError, "Expected value of type '#{field.type}' for field #{field.name}, but got '#{val.class}'" }
 
       ##
       # Public Instance Methods
@@ -18,7 +18,7 @@ module Protobuf
         message.parse_from_string(bytes)
         message
       end
-      
+
       def encode(value)
         bytes = value.serialize_to_string
         result = ::Protobuf::Field::VarintField.encode(bytes.size)
@@ -39,7 +39,7 @@ module Protobuf
         field = self
         @message_class.class_eval do
           define_method("#{field.name}=") do |val|
-            case 
+            case
             when val.nil? then
               @values.delete(field.name)
             when val.is_a?(field.type) then

data/lib/protobuf/rpc/connector.rb

@@ -1,3 +1,5 @@
+require 'protobuf'
+
 module Protobuf
   module Rpc
     class Connector

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

@@ -1,3 +1,5 @@
+require 'protobuf'
+
 module Protobuf
   module Rpc
     module Connectors

data/lib/protobuf/rpc/server.rb

@@ -1,3 +1,4 @@
+require 'protobuf'
 require 'protobuf/logger'
 require 'protobuf/rpc/rpc.pb'
 require 'protobuf/rpc/buffer'

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.6.2'
+  VERSION = '2.6.3'
   PROTOC_VERSION = '2.4.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.6.2
+  version: 2.6.3
 platform: java
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000Z
+date: 2013-01-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport