+75
-1
lines changedFilter options
+75
-1
lines changed Original file line number Diff line number Diff line change
@@ -1089,7 +1089,17 @@ private Object convert(
1089 1089
}
1090 1090
break;
1091 1091
case MESSAGE:
1092 -
val = ((RubyMessage) value).build(context, depth + 1, recursionLimit);
1092 +
RubyMessage msg;
1093 +
if (value instanceof RubyHash) {
1094 +
RubyClass typeClass =
1095 +
(RubyClass)
1096 +
((RubyDescriptor) getDescriptorForField(context, fieldDescriptor))
1097 +
.msgclass(context);
1098 +
msg = (RubyMessage) typeClass.newInstance(context, value);
1099 +
} else {
1100 +
msg = (RubyMessage) value;
1101 +
}
1102 +
val = msg.build(context, depth + 1, recursionLimit);
1093 1103
break;
1094 1104
case ENUM:
1095 1105
EnumDescriptor enumDescriptor = fieldDescriptor.getEnumType();
@@ -19,6 +19,10 @@ internal_ruby_proto_library(
19 19
rb_test(
20 20
name = "implementation",
21 21
srcs = ["implementation.rb"],
22 +
args = [
23 +
"-Iruby/lib:ruby",
24 +
"ruby/tests/implementation.rb",
25 +
],
22 26
deps = [
23 27
"//ruby:protobuf",
24 28
"@protobuf_bundle",
@@ -28,6 +32,10 @@ rb_test(
28 32
rb_test(
29 33
name = "basic",
30 34
srcs = ["basic.rb"],
35 +
args = [
36 +
"-Iruby/lib:ruby",
37 +
"ruby/tests/basic.rb",
38 +
],
31 39
deps = [
32 40
":common_tests",
33 41
":test_ruby_protos",
@@ -39,6 +47,10 @@ rb_test(
39 47
rb_test(
40 48
name = "basic_proto2",
41 49
srcs = ["basic_proto2.rb"],
50 +
args = [
51 +
"-Iruby/lib:ruby",
52 +
"ruby/tests/basic_proto2.rb",
53 +
],
42 54
deps = [
43 55
":common_tests",
44 56
":test_ruby_protos",
@@ -50,6 +62,10 @@ rb_test(
50 62
rb_test(
51 63
name = "encode_decode_test",
52 64
srcs = ["encode_decode_test.rb"],
65 +
args = [
66 +
"-Iruby/lib:ruby",
67 +
"ruby/tests/encode_decode_test.rb",
68 +
],
53 69
deps = [
54 70
":test_ruby_protos",
55 71
"//ruby:protobuf",
@@ -60,6 +76,10 @@ rb_test(
60 76
rb_test(
61 77
name = "gc_test",
62 78
srcs = ["gc_test.rb"],
79 +
args = [
80 +
"-Iruby/lib:ruby",
81 +
"ruby/tests/gc_test.rb",
82 +
],
63 83
deps = [
64 84
":test_ruby_protos",
65 85
"//ruby:protobuf",
@@ -70,6 +90,10 @@ rb_test(
70 90
rb_test(
71 91
name = "generated_code_test",
72 92
srcs = ["generated_code_test.rb"],
93 +
args = [
94 +
"-Iruby/lib:ruby",
95 +
"ruby/tests/generated_code_test.rb",
96 +
],
73 97
deps = [
74 98
":test_ruby_protos",
75 99
"//ruby:protobuf",
@@ -80,6 +104,10 @@ rb_test(
80 104
rb_test(
81 105
name = "multi_level_nesting_test",
82 106
srcs = ["multi_level_nesting_test.rb"],
107 +
args = [
108 +
"-Iruby/lib:ruby",
109 +
"ruby/tests/multi_level_nesting_test.rb",
110 +
],
83 111
deps = [
84 112
":test_ruby_protos",
85 113
"//ruby:protobuf",
@@ -90,6 +118,10 @@ rb_test(
90 118
rb_test(
91 119
name = "object_cache_test",
92 120
srcs = ["object_cache_test.rb"],
121 +
args = [
122 +
"-Iruby/lib:ruby",
123 +
"ruby/tests/object_cache_test.rb",
124 +
],
93 125
deps = [
94 126
":test_ruby_protos",
95 127
"//ruby:protobuf",
@@ -100,6 +132,10 @@ rb_test(
100 132
rb_test(
101 133
name = "repeated_field_test",
102 134
srcs = ["repeated_field_test.rb"],
135 +
args = [
136 +
"-Iruby/lib:ruby:ruby/tests",
137 +
"ruby/tests/repeated_field_test.rb",
138 +
],
103 139
deps = [
104 140
":test_ruby_protos",
105 141
"//ruby:protobuf",
@@ -110,6 +146,10 @@ rb_test(
110 146
rb_test(
111 147
name = "ruby_version",
112 148
srcs = ["ruby_version.rb"],
149 +
args = [
150 +
"-Iruby/lib:ruby",
151 +
"ruby/tests/ruby_version.rb",
152 +
],
113 153
deps = [
114 154
":test_ruby_protos",
115 155
"//ruby:protobuf",
@@ -120,6 +160,10 @@ rb_test(
120 160
rb_test(
121 161
name = "stress",
122 162
srcs = ["stress.rb"],
163 +
args = [
164 +
"-Iruby/lib:ruby:ruby/tests",
165 +
"ruby/tests/stress.rb",
166 +
],
123 167
deps = [
124 168
":test_ruby_protos",
125 169
"//ruby:protobuf",
@@ -130,6 +174,10 @@ rb_test(
130 174
rb_test(
131 175
name = "type_errors",
132 176
srcs = ["type_errors.rb"],
177 +
args = [
178 +
"-Iruby/lib:ruby",
179 +
"ruby/tests/type_errors.rb",
180 +
],
133 181
deps = [
134 182
":test_ruby_protos",
135 183
"//ruby:protobuf",
@@ -140,6 +188,10 @@ rb_test(
140 188
rb_test(
141 189
name = "utf8",
142 190
srcs = ["utf8.rb"],
191 +
args = [
192 +
"-Iruby/lib:ruby:ruby/tests",
193 +
"ruby/tests/utf8.rb",
194 +
],
143 195
deps = [
144 196
":test_ruby_protos",
145 197
"//ruby:protobuf",
@@ -150,6 +202,10 @@ rb_test(
150 202
rb_test(
151 203
name = "well_known_types_test",
152 204
srcs = ["well_known_types_test.rb"],
205 +
args = [
206 +
"-Iruby/lib:ruby",
207 +
"ruby/tests/well_known_types_test.rb",
208 +
],
153 209
deps = [
154 210
":test_ruby_protos",
155 211
"//ruby:protobuf",
@@ -160,6 +216,10 @@ rb_test(
160 216
rb_test(
161 217
name = "service_test",
162 218
srcs = ["service_test.rb"],
219 +
args = [
220 +
"-Iruby/lib:ruby:ruby/tests",
221 +
"ruby/tests/service_test.rb",
222 +
],
163 223
deps = [
164 224
":test_ruby_protos",
165 225
"//ruby:protobuf",
@@ -170,6 +230,10 @@ rb_test(
170 230
rb_test(
171 231
name = "memory_test",
172 232
srcs = ["memory_test.rb"],
233 +
args = [
234 +
"-Iruby/lib:ruby",
235 +
"ruby/tests/memory_test.rb",
236 +
],
173 237
deps = [
174 238
":test_ruby_protos",
175 239
"//ruby:protobuf",
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4