protobuf 2.6.2-java → 2.6.3-java

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,4 @@
1
+ require 'protobuf'
1
2
  require 'protobuf/wire_type'
2
3
  require 'protobuf/field/field_array'
3
4
 
@@ -172,8 +173,8 @@ module Protobuf
172
173
  val.compact!
173
174
  else
174
175
  error_text = <<-TYPE_ERROR
175
- Expected value of type '#{field.type}'
176
- Got '#{val.class}' for protobuf field #{field.name}
176
+ Expected repeated value of type '#{field.type}'
177
+ Got '#{val.class}' for repeated protobuf field #{field.name}
177
178
  TYPE_ERROR
178
179
 
179
180
  raise TypeError, error_text
@@ -210,7 +211,7 @@ module Protobuf
210
211
  elsif field.acceptable?(val)
211
212
  @values[field.name] = val
212
213
  else
213
- raise TypeError, "unacceptable value #{val} for type #{field.type}"
214
+ raise TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type}"
214
215
  end
215
216
  end
216
217
  end
@@ -18,7 +18,7 @@ module Protobuf
18
18
  end
19
19
 
20
20
  def decode(bytes)
21
- bytes.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
21
+ bytes.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
22
22
  bytes
23
23
  end
24
24
 
@@ -34,10 +34,12 @@ module Protobuf
34
34
  elsif field.acceptable?(val)
35
35
  @values[field.name] = val.dup
36
36
  else
37
- raise TypeError, "unacceptable value #{val} for type #{field.type}"
37
+ raise TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type}"
38
38
  end
39
39
  rescue NoMethodError => ex
40
- raise TypeError, "unacceptable value #{val} for type #{field.type} field #{field.name}"
40
+ ::Protobuf::Logger.error { ex.message }
41
+ ::Protobuf::Logger.error { ex.backtrace.join("\n") }
42
+ raise TypeError, "Got NoMethodError attempting to set #{val} for field #{field.name} of type #{field.type}: #{ex.message}"
41
43
  end
42
44
  end
43
45
  end
@@ -45,7 +47,7 @@ module Protobuf
45
47
 
46
48
  def encode(value)
47
49
  value = value.serialize_to_string if value.is_a?(::Protobuf::Message)
48
- value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
50
+ value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
49
51
 
50
52
  string_size = ::Protobuf::Field::VarintField.encode(value.size)
51
53
  string_size << value
@@ -6,11 +6,11 @@ module Protobuf
6
6
  def acceptable?(val)
7
7
  case val
8
8
  when Symbol then
9
- raise TypeError unless @type.const_defined?(val)
9
+ raise TypeError, "Enum #{val} is not known for type #{@type}" unless @type.const_defined?(val)
10
10
  when EnumValue then
11
- raise TypeError if val.parent_class != @type
11
+ raise TypeError, "Enum #{val} is not owned by #{@type}" if val.parent_class != @type
12
12
  else
13
- raise TypeError unless @type.valid_tag?(val)
13
+ raise TypeError, "Tag #{val} is not valid for Enum #{@type}" unless @type.valid_tag?(val)
14
14
  end
15
15
  true
16
16
  end
@@ -42,7 +42,7 @@ module Protobuf
42
42
  @values.delete(field.name)
43
43
  else
44
44
  value = field.type.fetch(value)
45
- raise TypeError, "Invalid ENUM value: #{orig_value.inspect} for #{field.name}" unless value
45
+ raise TypeError, "Invalid Enum value: #{orig_value.inspect} for #{field.name}" unless value
46
46
 
47
47
  @values[field.name] = value
48
48
  end
@@ -52,7 +52,7 @@ module Protobuf
52
52
  #
53
53
  def normalize(value)
54
54
  value = value.to_proto if value.respond_to?(:to_proto)
55
- raise TypeError unless @field.acceptable?(value)
55
+ raise TypeError, "Unacceptable value #{value} for field #{@field.name} of type #{@field.type}" unless @field.acceptable?(value)
56
56
 
57
57
  if @field.is_a?(::Protobuf::Field::EnumField)
58
58
  @field.type.fetch(value)
@@ -65,8 +65,8 @@ module Protobuf
65
65
 
66
66
  def raise_type_error(val)
67
67
  error_text = <<-TYPE_ERROR
68
- Expected value of type '#{@field.type}'
69
- Got '#{val.class}' for protobuf field #{@field.name}
68
+ Expected repeated value of type '#{@field.type}'
69
+ Got '#{val.class}' for repeated protobuf field #{@field.name}
70
70
  TYPE_ERROR
71
71
 
72
72
  raise TypeError, error_text
@@ -3,7 +3,7 @@ require 'protobuf/field/base_field'
3
3
  module Protobuf
4
4
  module Field
5
5
  class MessageField < BaseField
6
- RAISE_TYPE = lambda { |field, val| raise TypeError, "Expected value of type '#{field.type}', but got '#{val.class}'" }
6
+ RAISE_TYPE = lambda { |field, val| raise TypeError, "Expected value of type '#{field.type}' for field #{field.name}, but got '#{val.class}'" }
7
7
 
8
8
  ##
9
9
  # Public Instance Methods
@@ -18,7 +18,7 @@ module Protobuf
18
18
  message.parse_from_string(bytes)
19
19
  message
20
20
  end
21
-
21
+
22
22
  def encode(value)
23
23
  bytes = value.serialize_to_string
24
24
  result = ::Protobuf::Field::VarintField.encode(bytes.size)
@@ -39,7 +39,7 @@ module Protobuf
39
39
  field = self
40
40
  @message_class.class_eval do
41
41
  define_method("#{field.name}=") do |val|
42
- case
42
+ case
43
43
  when val.nil? then
44
44
  @values.delete(field.name)
45
45
  when val.is_a?(field.type) then
@@ -1,3 +1,5 @@
1
+ require 'protobuf'
2
+
1
3
  module Protobuf
2
4
  module Rpc
3
5
  class Connector
@@ -1,3 +1,5 @@
1
+ require 'protobuf'
2
+
1
3
  module Protobuf
2
4
  module Rpc
3
5
  module Connectors
@@ -1,3 +1,4 @@
1
+ require 'protobuf'
1
2
  require 'protobuf/logger'
2
3
  require 'protobuf/rpc/rpc.pb'
3
4
  require 'protobuf/rpc/buffer'
@@ -1,4 +1,4 @@
1
1
  module Protobuf
2
- VERSION = '2.6.2'
2
+ VERSION = '2.6.3'
3
3
  PROTOC_VERSION = '2.4.1'
4
4
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: protobuf
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 2.6.2
5
+ version: 2.6.3
6
6
  platform: java
7
7
  authors:
8
8
  - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-01-10 00:00:00.000000000Z
13
+ date: 2013-01-15 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport