google-protobuf 3.17.3 → 3.21.9
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of google-protobuf might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/ext/google/protobuf_c/convert.c +128 -116
- data/ext/google/protobuf_c/convert.h +12 -9
- data/ext/google/protobuf_c/defs.c +217 -1521
- data/ext/google/protobuf_c/defs.h +19 -19
- data/ext/google/protobuf_c/extconf.rb +11 -4
- data/ext/google/protobuf_c/map.c +112 -101
- data/ext/google/protobuf_c/map.h +7 -8
- data/ext/google/protobuf_c/message.c +386 -306
- data/ext/google/protobuf_c/message.h +22 -19
- data/ext/google/protobuf_c/protobuf.c +68 -58
- data/ext/google/protobuf_c/protobuf.h +13 -10
- data/ext/google/protobuf_c/repeated_field.c +83 -85
- data/ext/google/protobuf_c/repeated_field.h +6 -6
- data/ext/google/protobuf_c/ruby-upb.c +5330 -3073
- data/ext/google/protobuf_c/ruby-upb.h +3104 -1903
- data/ext/google/protobuf_c/third_party/utf8_range/LICENSE +21 -0
- data/ext/google/protobuf_c/third_party/utf8_range/naive.c +92 -0
- data/ext/google/protobuf_c/third_party/utf8_range/range2-neon.c +157 -0
- data/ext/google/protobuf_c/third_party/utf8_range/range2-sse.c +170 -0
- data/ext/google/protobuf_c/third_party/utf8_range/utf8_range.h +9 -0
- data/ext/google/protobuf_c/wrap_memcpy.c +4 -3
- data/lib/google/protobuf/api_pb.rb +1 -0
- data/lib/google/protobuf/descriptor_dsl.rb +465 -0
- data/lib/google/protobuf/descriptor_pb.rb +269 -0
- data/lib/google/protobuf/message_exts.rb +2 -2
- data/lib/google/protobuf/repeated_field.rb +15 -2
- data/lib/google/protobuf/type_pb.rb +1 -0
- data/lib/google/protobuf/well_known_types.rb +12 -2
- data/lib/google/protobuf.rb +5 -73
- data/tests/basic.rb +138 -10
- data/tests/stress.rb +1 -1
- metadata +15 -29
- data/ext/google/protobuf_c/third_party/wyhash/wyhash.h +0 -145
@@ -0,0 +1,269 @@
|
|
1
|
+
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
2
|
+
# source: google/protobuf/descriptor.proto
|
3
|
+
|
4
|
+
require 'google/protobuf'
|
5
|
+
|
6
|
+
descriptor_data = File.binread(__FILE__).split("\n__END__\n", 2)[1]
|
7
|
+
Google::Protobuf::DescriptorPool.generated_pool.add_serialized_file(descriptor_data)
|
8
|
+
|
9
|
+
module Google
|
10
|
+
module Protobuf
|
11
|
+
FileDescriptorSet = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileDescriptorSet").msgclass
|
12
|
+
FileDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileDescriptorProto").msgclass
|
13
|
+
DescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DescriptorProto").msgclass
|
14
|
+
DescriptorProto::ExtensionRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DescriptorProto.ExtensionRange").msgclass
|
15
|
+
DescriptorProto::ReservedRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DescriptorProto.ReservedRange").msgclass
|
16
|
+
ExtensionRangeOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.ExtensionRangeOptions").msgclass
|
17
|
+
FieldDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldDescriptorProto").msgclass
|
18
|
+
FieldDescriptorProto::Type = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldDescriptorProto.Type").enummodule
|
19
|
+
FieldDescriptorProto::Label = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldDescriptorProto.Label").enummodule
|
20
|
+
OneofDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.OneofDescriptorProto").msgclass
|
21
|
+
EnumDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumDescriptorProto").msgclass
|
22
|
+
EnumDescriptorProto::EnumReservedRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumDescriptorProto.EnumReservedRange").msgclass
|
23
|
+
EnumValueDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumValueDescriptorProto").msgclass
|
24
|
+
ServiceDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.ServiceDescriptorProto").msgclass
|
25
|
+
MethodDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MethodDescriptorProto").msgclass
|
26
|
+
FileOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileOptions").msgclass
|
27
|
+
FileOptions::OptimizeMode = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileOptions.OptimizeMode").enummodule
|
28
|
+
MessageOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MessageOptions").msgclass
|
29
|
+
FieldOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldOptions").msgclass
|
30
|
+
FieldOptions::CType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldOptions.CType").enummodule
|
31
|
+
FieldOptions::JSType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldOptions.JSType").enummodule
|
32
|
+
OneofOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.OneofOptions").msgclass
|
33
|
+
EnumOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumOptions").msgclass
|
34
|
+
EnumValueOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumValueOptions").msgclass
|
35
|
+
ServiceOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.ServiceOptions").msgclass
|
36
|
+
MethodOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MethodOptions").msgclass
|
37
|
+
MethodOptions::IdempotencyLevel = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MethodOptions.IdempotencyLevel").enummodule
|
38
|
+
UninterpretedOption = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UninterpretedOption").msgclass
|
39
|
+
UninterpretedOption::NamePart = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UninterpretedOption.NamePart").msgclass
|
40
|
+
SourceCodeInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.SourceCodeInfo").msgclass
|
41
|
+
SourceCodeInfo::Location = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.SourceCodeInfo.Location").msgclass
|
42
|
+
GeneratedCodeInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.GeneratedCodeInfo").msgclass
|
43
|
+
GeneratedCodeInfo::Annotation = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.GeneratedCodeInfo.Annotation").msgclass
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
__END__
|
48
|
+
|
49
|
+
google/protobuf/descriptor.protogoogle.protobuf"G
|
50
|
+
FileDescriptorSet2
|
51
|
+
file (2$.google.protobuf.FileDescriptorProto"�
|
52
|
+
FileDescriptorProto
|
53
|
+
name (
|
54
|
+
package (
|
55
|
+
|
56
|
+
dependency (
|
57
|
+
public_dependency
|
58
|
+
(
|
59
|
+
weak_dependency (6
|
60
|
+
message_type (2 .google.protobuf.DescriptorProto7
|
61
|
+
enum_type (2$.google.protobuf.EnumDescriptorProto8
|
62
|
+
service (2'.google.protobuf.ServiceDescriptorProto8
|
63
|
+
extension (2%.google.protobuf.FieldDescriptorProto-
|
64
|
+
options (2.google.protobuf.FileOptions9
|
65
|
+
source_code_info (2.google.protobuf.SourceCodeInfo
|
66
|
+
syntax ( "�
|
67
|
+
DescriptorProto
|
68
|
+
name ( 4
|
69
|
+
field (2%.google.protobuf.FieldDescriptorProto8
|
70
|
+
extension (2%.google.protobuf.FieldDescriptorProto5
|
71
|
+
nested_type (2 .google.protobuf.DescriptorProto7
|
72
|
+
enum_type (2$.google.protobuf.EnumDescriptorProtoH
|
73
|
+
extension_range (2/.google.protobuf.DescriptorProto.ExtensionRange9
|
74
|
+
|
75
|
+
oneof_decl (2%.google.protobuf.OneofDescriptorProto0
|
76
|
+
options (2.google.protobuf.MessageOptionsF
|
77
|
+
reserved_range (2..google.protobuf.DescriptorProto.ReservedRange
|
78
|
+
|
79
|
+
( e
|
80
|
+
ExtensionRange
|
81
|
+
start (
|
82
|
+
end (7
|
83
|
+
options (2&.google.protobuf.ExtensionRangeOptions+
|
84
|
+
|
85
|
+
start (
|
86
|
+
end ("g
|
87
|
+
ExtensionRangeOptionsC
|
88
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption* �����"�
|
89
|
+
FieldDescriptorProto
|
90
|
+
name (
|
91
|
+
number (:
|
92
|
+
label (2+.google.protobuf.FieldDescriptorProto.Label8
|
93
|
+
type (2*.google.protobuf.FieldDescriptorProto.Type
|
94
|
+
type_name (
|
95
|
+
extendee (
|
96
|
+
|
97
|
+
oneof_index (
|
98
|
+
json_name
|
99
|
+
( .
|
100
|
+
options (2.google.protobuf.FieldOptions
|
101
|
+
proto3_optional ("�
|
102
|
+
Type
|
103
|
+
TYPE_DOUBLE
|
104
|
+
|
105
|
+
TYPE_FLOAT
|
106
|
+
|
107
|
+
TYPE_INT64
|
108
|
+
TYPE_UINT64
|
109
|
+
|
110
|
+
TYPE_INT32
|
111
|
+
TYPE_FIXED64
|
112
|
+
TYPE_FIXED32
|
113
|
+
TYPE_BOOL
|
114
|
+
TYPE_STRING
|
115
|
+
|
116
|
+
TYPE_GROUP
|
117
|
+
|
118
|
+
TYPE_MESSAGE
|
119
|
+
|
120
|
+
TYPE_BYTES
|
121
|
+
TYPE_UINT32
|
122
|
+
TYPE_ENUM
|
123
|
+
|
124
|
+
|
125
|
+
TYPE_SINT32
|
126
|
+
TYPE_SINT64"C
|
127
|
+
Label
|
128
|
+
LABEL_OPTIONAL
|
129
|
+
LABEL_REQUIRED
|
130
|
+
LABEL_REPEATED"T
|
131
|
+
OneofDescriptorProto
|
132
|
+
name ( .
|
133
|
+
options (2.google.protobuf.OneofOptions"�
|
134
|
+
EnumDescriptorProto
|
135
|
+
name ( 8
|
136
|
+
value (2).google.protobuf.EnumValueDescriptorProto-
|
137
|
+
options (2.google.protobuf.EnumOptionsN
|
138
|
+
reserved_range (26.google.protobuf.EnumDescriptorProto.EnumReservedRange
|
139
|
+
|
140
|
+
EnumReservedRange
|
141
|
+
start (
|
142
|
+
end ("l
|
143
|
+
EnumValueDescriptorProto
|
144
|
+
name (
|
145
|
+
number (2
|
146
|
+
options (2!.google.protobuf.EnumValueOptions"�
|
147
|
+
ServiceDescriptorProto
|
148
|
+
name ( 6
|
149
|
+
method (2&.google.protobuf.MethodDescriptorProto0
|
150
|
+
options (2.google.protobuf.ServiceOptions"�
|
151
|
+
MethodDescriptorProto
|
152
|
+
name (
|
153
|
+
|
154
|
+
input_type (
|
155
|
+
output_type ( /
|
156
|
+
options (2.google.protobuf.MethodOptions
|
157
|
+
client_streaming (:false
|
158
|
+
server_streaming (:false"�
|
159
|
+
FileOptions
|
160
|
+
java_package (
|
161
|
+
java_outer_classname ( "
|
162
|
+
java_multiple_files
|
163
|
+
(:false)
|
164
|
+
java_generate_equals_and_hash (B%
|
165
|
+
java_string_check_utf8 (:falseF
|
166
|
+
optimize_for (2).google.protobuf.FileOptions.OptimizeMode:SPEED
|
167
|
+
|
168
|
+
go_package ( "
|
169
|
+
cc_generic_services (:false$
|
170
|
+
java_generic_services (:false"
|
171
|
+
py_generic_services (:false#
|
172
|
+
php_generic_services* (:false
|
173
|
+
|
174
|
+
deprecated (:false
|
175
|
+
cc_enable_arenas (:true
|
176
|
+
objc_class_prefix$ (
|
177
|
+
csharp_namespace% (
|
178
|
+
swift_prefix' (
|
179
|
+
php_class_prefix( (
|
180
|
+
|
181
|
+
php_metadata_namespace, (
|
182
|
+
ruby_package- ( C
|
183
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption":
|
184
|
+
OptimizeMode
|
185
|
+
SPEED
|
186
|
+
CODE_SIZE
|
187
|
+
LITE_RUNTIME* �����J&'"�
|
188
|
+
MessageOptions&
|
189
|
+
message_set_wire_format (:false.
|
190
|
+
no_standard_descriptor_accessor (:false
|
191
|
+
|
192
|
+
deprecated (:false
|
193
|
+
map_entry (C
|
194
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption* �����JJJJ J
|
195
|
+
"�
|
196
|
+
FieldOptions:
|
197
|
+
ctype (2#.google.protobuf.FieldOptions.CType:STRING
|
198
|
+
packed (?
|
199
|
+
jstype (2$.google.protobuf.FieldOptions.JSType: JS_NORMAL
|
200
|
+
lazy (:false
|
201
|
+
unverified_lazy (:false
|
202
|
+
|
203
|
+
deprecated (:false
|
204
|
+
weak
|
205
|
+
(:falseC
|
206
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption"/
|
207
|
+
CType
|
208
|
+
|
209
|
+
STRING
|
210
|
+
CORD
|
211
|
+
STRING_PIECE"5
|
212
|
+
JSType
|
213
|
+
JS_NORMAL
|
214
|
+
JS_STRING
|
215
|
+
JS_NUMBER* �����J"^
|
216
|
+
OneofOptionsC
|
217
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption* �����"�
|
218
|
+
EnumOptions
|
219
|
+
allow_alias (
|
220
|
+
|
221
|
+
deprecated (:falseC
|
222
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption* �����J"}
|
223
|
+
EnumValueOptions
|
224
|
+
|
225
|
+
deprecated (:falseC
|
226
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption* �����"{
|
227
|
+
ServiceOptions
|
228
|
+
|
229
|
+
deprecated! (:falseC
|
230
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption* �����"�
|
231
|
+
|
232
|
+
|
233
|
+
deprecated! (:false_
|
234
|
+
idempotency_level" (2/.google.protobuf.MethodOptions.IdempotencyLevel:IDEMPOTENCY_UNKNOWNC
|
235
|
+
uninterpreted_option� (2$.google.protobuf.UninterpretedOption"P
|
236
|
+
IdempotencyLevel
|
237
|
+
IDEMPOTENCY_UNKNOWN
|
238
|
+
NO_SIDE_EFFECTS
|
239
|
+
|
240
|
+
IDEMPOTENT* �����"�
|
241
|
+
UninterpretedOption;
|
242
|
+
name (2-.google.protobuf.UninterpretedOption.NamePart
|
243
|
+
identifier_value (
|
244
|
+
positive_int_value (
|
245
|
+
negative_int_value (
|
246
|
+
double_value (
|
247
|
+
string_value (
|
248
|
+
aggregate_value ( 3
|
249
|
+
NamePart
|
250
|
+
name_part (
|
251
|
+
is_extension ("�
|
252
|
+
SourceCodeInfo:
|
253
|
+
location (2(.google.protobuf.SourceCodeInfo.Location�
|
254
|
+
Location
|
255
|
+
path (B
|
256
|
+
span (B
|
257
|
+
leading_comments (
|
258
|
+
trailing_comments ( !
|
259
|
+
leading_detached_comments ( "�
|
260
|
+
GeneratedCodeInfoA
|
261
|
+
|
262
|
+
annotation (2-.google.protobuf.GeneratedCodeInfo.AnnotationO
|
263
|
+
|
264
|
+
Annotation
|
265
|
+
path (B
|
266
|
+
source_file (
|
267
|
+
begin (
|
268
|
+
end (B~
|
269
|
+
com.google.protobufBDescriptorProtosHZ-google.golang.org/protobuf/types/descriptorpb��GPB�Google.Protobuf.Reflection
|
@@ -79,12 +79,25 @@ module Google
|
|
79
79
|
|
80
80
|
|
81
81
|
def first(n=nil)
|
82
|
-
n
|
82
|
+
if n.nil?
|
83
|
+
return self[0]
|
84
|
+
elsif n < 0
|
85
|
+
raise ArgumentError, "negative array size"
|
86
|
+
else
|
87
|
+
return self[0...n]
|
88
|
+
end
|
83
89
|
end
|
84
90
|
|
85
91
|
|
86
92
|
def last(n=nil)
|
87
|
-
n
|
93
|
+
if n.nil?
|
94
|
+
return self[-1]
|
95
|
+
elsif n < 0
|
96
|
+
raise ArgumentError, "negative array size"
|
97
|
+
else
|
98
|
+
start = [self.size-n, 0].max
|
99
|
+
return self[start...self.size]
|
100
|
+
end
|
88
101
|
end
|
89
102
|
|
90
103
|
|
@@ -5,6 +5,7 @@ require 'google/protobuf'
|
|
5
5
|
|
6
6
|
require 'google/protobuf/any_pb'
|
7
7
|
require 'google/protobuf/source_context_pb'
|
8
|
+
|
8
9
|
Google::Protobuf::DescriptorPool.generated_pool.build do
|
9
10
|
add_file("google/protobuf/type.proto", :syntax => :proto3) do
|
10
11
|
add_message "google.protobuf.Type" do
|
@@ -82,9 +82,14 @@ module Google
|
|
82
82
|
end
|
83
83
|
end
|
84
84
|
|
85
|
+
def self.from_time(time)
|
86
|
+
new.from_time(time)
|
87
|
+
end
|
88
|
+
|
85
89
|
def from_time(time)
|
86
90
|
self.seconds = time.to_i
|
87
91
|
self.nanos = time.nsec
|
92
|
+
self
|
88
93
|
end
|
89
94
|
|
90
95
|
def to_i
|
@@ -132,10 +137,14 @@ module Google
|
|
132
137
|
end
|
133
138
|
end
|
134
139
|
|
140
|
+
def self.from_ruby(value)
|
141
|
+
self.new.from_ruby(value)
|
142
|
+
end
|
143
|
+
|
135
144
|
def from_ruby(value)
|
136
145
|
case value
|
137
146
|
when NilClass
|
138
|
-
self.null_value =
|
147
|
+
self.null_value = :NULL_VALUE
|
139
148
|
when Numeric
|
140
149
|
self.number_value = value
|
141
150
|
when String
|
@@ -155,6 +164,8 @@ module Google
|
|
155
164
|
else
|
156
165
|
raise UnexpectedStructType
|
157
166
|
end
|
167
|
+
|
168
|
+
self
|
158
169
|
end
|
159
170
|
end
|
160
171
|
|
@@ -225,6 +236,5 @@ module Google
|
|
225
236
|
ret
|
226
237
|
end
|
227
238
|
end
|
228
|
-
|
229
239
|
end
|
230
240
|
end
|
data/lib/google/protobuf.rb
CHANGED
@@ -51,92 +51,24 @@ else
|
|
51
51
|
require 'google/protobuf_c'
|
52
52
|
end
|
53
53
|
|
54
|
-
module Google
|
55
|
-
module Protobuf
|
56
|
-
module Internal
|
57
|
-
def self.infer_package(names)
|
58
|
-
# Package is longest common prefix ending in '.', if any.
|
59
|
-
if not names.empty?
|
60
|
-
min, max = names.minmax
|
61
|
-
last_common_dot = nil
|
62
|
-
min.size.times { |i|
|
63
|
-
if min[i] != max[i] then break end
|
64
|
-
if min[i] == ?. then last_common_dot = i end
|
65
|
-
}
|
66
|
-
if last_common_dot
|
67
|
-
return min.slice(0, last_common_dot)
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
nil
|
72
|
-
end
|
73
|
-
|
74
|
-
class NestingBuilder
|
75
|
-
def initialize(msg_names, enum_names)
|
76
|
-
@to_pos = {nil=>nil}
|
77
|
-
@msg_children = Hash.new { |hash, key| hash[key] = [] }
|
78
|
-
@enum_children = Hash.new { |hash, key| hash[key] = [] }
|
79
|
-
|
80
|
-
msg_names.each_with_index { |name, idx| @to_pos[name] = idx }
|
81
|
-
enum_names.each_with_index { |name, idx| @to_pos[name] = idx }
|
82
|
-
|
83
|
-
msg_names.each { |name| @msg_children[parent(name)] << name }
|
84
|
-
enum_names.each { |name| @enum_children[parent(name)] << name }
|
85
|
-
end
|
86
|
-
|
87
|
-
def build(package)
|
88
|
-
return build_msg(package)
|
89
|
-
end
|
90
|
-
|
91
|
-
private
|
92
|
-
def build_msg(msg)
|
93
|
-
return {
|
94
|
-
:pos => @to_pos[msg],
|
95
|
-
:msgs => @msg_children[msg].map { |child| build_msg(child) },
|
96
|
-
:enums => @enum_children[msg].map { |child| @to_pos[child] },
|
97
|
-
}
|
98
|
-
end
|
99
|
-
|
100
|
-
private
|
101
|
-
def parent(name)
|
102
|
-
idx = name.rindex(?.)
|
103
|
-
if idx
|
104
|
-
return name.slice(0, idx)
|
105
|
-
else
|
106
|
-
return nil
|
107
|
-
end
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
def self.fixup_descriptor(package, msg_names, enum_names)
|
112
|
-
if package.nil?
|
113
|
-
package = self.infer_package(msg_names + enum_names)
|
114
|
-
end
|
115
|
-
|
116
|
-
nesting = NestingBuilder.new(msg_names, enum_names).build(package)
|
117
|
-
|
118
|
-
return package, nesting
|
119
|
-
end
|
120
|
-
end
|
121
|
-
end
|
122
|
-
end
|
123
54
|
end
|
124
55
|
|
56
|
+
require 'google/protobuf/descriptor_dsl'
|
125
57
|
require 'google/protobuf/repeated_field'
|
126
58
|
|
127
59
|
module Google
|
128
60
|
module Protobuf
|
129
61
|
|
130
|
-
def self.encode(msg)
|
131
|
-
msg.to_proto
|
62
|
+
def self.encode(msg, options = {})
|
63
|
+
msg.to_proto(options)
|
132
64
|
end
|
133
65
|
|
134
66
|
def self.encode_json(msg, options = {})
|
135
67
|
msg.to_json(options)
|
136
68
|
end
|
137
69
|
|
138
|
-
def self.decode(klass, proto)
|
139
|
-
klass.decode(proto)
|
70
|
+
def self.decode(klass, proto, options = {})
|
71
|
+
klass.decode(proto, options)
|
140
72
|
end
|
141
73
|
|
142
74
|
def self.decode_json(klass, json, options = {})
|
data/tests/basic.rb
CHANGED
@@ -66,10 +66,50 @@ module BasicTest
|
|
66
66
|
def test_issue_8559_crash
|
67
67
|
msg = TestMessage.new
|
68
68
|
msg.repeated_int32 = ::Google::Protobuf::RepeatedField.new(:int32, [1, 2, 3])
|
69
|
-
|
69
|
+
|
70
|
+
# https://github.com/jruby/jruby/issues/6818 was fixed in JRuby 9.3.0.0
|
71
|
+
if cruby_or_jruby_9_3_or_higher?
|
72
|
+
GC.start(full_mark: true, immediate_sweep: true)
|
73
|
+
end
|
70
74
|
TestMessage.encode(msg)
|
71
75
|
end
|
72
76
|
|
77
|
+
def test_issue_9440
|
78
|
+
msg = HelloRequest.new
|
79
|
+
msg.id = 8
|
80
|
+
assert_equal 8, msg.id
|
81
|
+
msg.version = '1'
|
82
|
+
assert_equal 8, msg.id
|
83
|
+
end
|
84
|
+
|
85
|
+
def test_issue_9507
|
86
|
+
pool = Google::Protobuf::DescriptorPool.new
|
87
|
+
pool.build do
|
88
|
+
add_message "NpeMessage" do
|
89
|
+
optional :type, :enum, 1, "TestEnum"
|
90
|
+
optional :other, :string, 2
|
91
|
+
end
|
92
|
+
add_enum "TestEnum" do
|
93
|
+
value :Something, 0
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
msgclass = pool.lookup("NpeMessage").msgclass
|
98
|
+
|
99
|
+
m = msgclass.new(
|
100
|
+
other: "foo" # must be set, but can be blank
|
101
|
+
)
|
102
|
+
|
103
|
+
begin
|
104
|
+
encoded = msgclass.encode(m)
|
105
|
+
rescue java.lang.NullPointerException
|
106
|
+
flunk "NPE rescued"
|
107
|
+
end
|
108
|
+
decoded = msgclass.decode(encoded)
|
109
|
+
decoded.inspect
|
110
|
+
decoded.to_proto
|
111
|
+
end
|
112
|
+
|
73
113
|
def test_has_field
|
74
114
|
m = TestSingularFields.new
|
75
115
|
assert !m.has_singular_msg?
|
@@ -136,7 +176,7 @@ module BasicTest
|
|
136
176
|
m = TestSingularFields.new
|
137
177
|
|
138
178
|
m.singular_int32 = -42
|
139
|
-
assert_equal -42, m.singular_int32
|
179
|
+
assert_equal( -42, m.singular_int32 )
|
140
180
|
m.clear_singular_int32
|
141
181
|
assert_equal 0, m.singular_int32
|
142
182
|
|
@@ -168,6 +208,17 @@ module BasicTest
|
|
168
208
|
assert_equal nil, m.singular_msg
|
169
209
|
end
|
170
210
|
|
211
|
+
def test_import_proto2
|
212
|
+
m = TestMessage.new
|
213
|
+
assert !m.has_optional_proto2_submessage?
|
214
|
+
m.optional_proto2_submessage = ::FooBar::Proto2::TestImportedMessage.new
|
215
|
+
assert m.has_optional_proto2_submessage?
|
216
|
+
assert TestMessage.descriptor.lookup('optional_proto2_submessage').has?(m)
|
217
|
+
|
218
|
+
m.clear_optional_proto2_submessage
|
219
|
+
assert !m.has_optional_proto2_submessage?
|
220
|
+
end
|
221
|
+
|
171
222
|
def test_clear_repeated_fields
|
172
223
|
m = TestMessage.new
|
173
224
|
|
@@ -487,6 +538,7 @@ module BasicTest
|
|
487
538
|
:optional_int64=>0,
|
488
539
|
:optional_msg=>nil,
|
489
540
|
:optional_msg2=>nil,
|
541
|
+
:optional_proto2_submessage=>nil,
|
490
542
|
:optional_string=>"foo",
|
491
543
|
:optional_uint32=>0,
|
492
544
|
:optional_uint64=>0,
|
@@ -519,8 +571,6 @@ module BasicTest
|
|
519
571
|
|
520
572
|
|
521
573
|
def test_json_maps
|
522
|
-
# TODO: Fix JSON in JRuby version.
|
523
|
-
return if RUBY_PLATFORM == "java"
|
524
574
|
m = MapMessage.new(:map_string_int32 => {"a" => 1})
|
525
575
|
expected = {mapStringInt32: {a: 1}, mapStringMsg: {}, mapStringEnum: {}}
|
526
576
|
expected_preserve = {map_string_int32: {a: 1}, map_string_msg: {}, map_string_enum: {}}
|
@@ -534,8 +584,6 @@ module BasicTest
|
|
534
584
|
end
|
535
585
|
|
536
586
|
def test_json_maps_emit_defaults_submsg
|
537
|
-
# TODO: Fix JSON in JRuby version.
|
538
|
-
return if RUBY_PLATFORM == "java"
|
539
587
|
m = MapMessage.new(:map_string_msg => {"a" => TestMessage2.new(foo: 0)})
|
540
588
|
expected = {mapStringInt32: {}, mapStringMsg: {a: {foo: 0}}, mapStringEnum: {}}
|
541
589
|
|
@@ -545,8 +593,6 @@ module BasicTest
|
|
545
593
|
end
|
546
594
|
|
547
595
|
def test_json_emit_defaults_submsg
|
548
|
-
# TODO: Fix JSON in JRuby version.
|
549
|
-
return if RUBY_PLATFORM == "java"
|
550
596
|
m = TestSingularFields.new(singular_msg: proto_module::TestMessage2.new)
|
551
597
|
|
552
598
|
expected = {
|
@@ -569,8 +615,6 @@ module BasicTest
|
|
569
615
|
end
|
570
616
|
|
571
617
|
def test_respond_to
|
572
|
-
# This test fails with JRuby 1.7.23, likely because of an old JRuby bug.
|
573
|
-
return if RUBY_PLATFORM == "java"
|
574
618
|
msg = MapMessage.new
|
575
619
|
assert msg.respond_to?(:map_string_int32)
|
576
620
|
assert !msg.respond_to?(:bacon)
|
@@ -607,5 +651,89 @@ module BasicTest
|
|
607
651
|
assert_raise(FrozenErrorType) { m.map_string_int32.delete('a') }
|
608
652
|
assert_raise(FrozenErrorType) { m.map_string_int32.clear }
|
609
653
|
end
|
654
|
+
|
655
|
+
def test_map_length
|
656
|
+
m = proto_module::MapMessage.new
|
657
|
+
assert_equal 0, m.map_string_int32.length
|
658
|
+
assert_equal 0, m.map_string_msg.length
|
659
|
+
assert_equal 0, m.map_string_int32.size
|
660
|
+
assert_equal 0, m.map_string_msg.size
|
661
|
+
|
662
|
+
m.map_string_int32['a'] = 1
|
663
|
+
m.map_string_int32['b'] = 2
|
664
|
+
m.map_string_msg['a'] = proto_module::TestMessage2.new
|
665
|
+
assert_equal 2, m.map_string_int32.length
|
666
|
+
assert_equal 1, m.map_string_msg.length
|
667
|
+
assert_equal 2, m.map_string_int32.size
|
668
|
+
assert_equal 1, m.map_string_msg.size
|
669
|
+
end
|
670
|
+
|
671
|
+
def test_string_with_singleton_class_enabled
|
672
|
+
str = 'foobar'
|
673
|
+
# NOTE: Accessing a singleton class of an object changes its low level class representation
|
674
|
+
# as far as the C API's CLASS_OF() method concerned, exposing the issue
|
675
|
+
str.singleton_class
|
676
|
+
m = proto_module::TestMessage.new(
|
677
|
+
optional_string: str,
|
678
|
+
optional_bytes: str
|
679
|
+
)
|
680
|
+
|
681
|
+
assert_equal str, m.optional_string
|
682
|
+
assert_equal str, m.optional_bytes
|
683
|
+
end
|
684
|
+
|
685
|
+
def test_utf8
|
686
|
+
m = proto_module::TestMessage.new(
|
687
|
+
optional_string: "µpb",
|
688
|
+
)
|
689
|
+
m2 = proto_module::TestMessage.decode(proto_module::TestMessage.encode(m))
|
690
|
+
assert_equal m2, m
|
691
|
+
end
|
692
|
+
|
693
|
+
def test_map_fields_respond_to? # regression test for issue 9202
|
694
|
+
msg = proto_module::MapMessage.new
|
695
|
+
assert msg.respond_to?(:map_string_int32=)
|
696
|
+
msg.map_string_int32 = Google::Protobuf::Map.new(:string, :int32)
|
697
|
+
assert msg.respond_to?(:map_string_int32)
|
698
|
+
assert_equal( Google::Protobuf::Map.new(:string, :int32), msg.map_string_int32 )
|
699
|
+
assert msg.respond_to?(:clear_map_string_int32)
|
700
|
+
msg.clear_map_string_int32
|
701
|
+
|
702
|
+
assert !msg.respond_to?(:has_map_string_int32?)
|
703
|
+
assert_raise NoMethodError do
|
704
|
+
msg.has_map_string_int32?
|
705
|
+
end
|
706
|
+
assert !msg.respond_to?(:map_string_int32_as_value)
|
707
|
+
assert_raise NoMethodError do
|
708
|
+
msg.map_string_int32_as_value
|
709
|
+
end
|
710
|
+
assert !msg.respond_to?(:map_string_int32_as_value=)
|
711
|
+
assert_raise NoMethodError do
|
712
|
+
msg.map_string_int32_as_value = :boom
|
713
|
+
end
|
714
|
+
end
|
715
|
+
end
|
716
|
+
|
717
|
+
def test_oneof_fields_respond_to? # regression test for issue 9202
|
718
|
+
msg = proto_module::OneofMessage.new
|
719
|
+
# `has_` prefix + "?" suffix actions should only work for oneofs fields.
|
720
|
+
assert msg.has_my_oneof?
|
721
|
+
assert msg.respond_to? :has_my_oneof?
|
722
|
+
assert !msg.respond_to?( :has_a? )
|
723
|
+
assert_raise NoMethodError do
|
724
|
+
msg.has_a?
|
725
|
+
end
|
726
|
+
assert !msg.respond_to?( :has_b? )
|
727
|
+
assert_raise NoMethodError do
|
728
|
+
msg.has_b?
|
729
|
+
end
|
730
|
+
assert !msg.respond_to?( :has_c? )
|
731
|
+
assert_raise NoMethodError do
|
732
|
+
msg.has_c?
|
733
|
+
end
|
734
|
+
assert !msg.respond_to?( :has_d? )
|
735
|
+
assert_raise NoMethodError do
|
736
|
+
msg.has_d?
|
737
|
+
end
|
610
738
|
end
|
611
739
|
end
|