diff options
author | Josh Haberman <jhaberman@gmail.com> | 2017-03-14 14:27:16 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2017-03-14 14:27:16 -0700 |
commit | 9c6b8cb9bfc7c31ec99566772246c9bc4317c57b (patch) | |
tree | e9820cf16923e653ee38442218d8aac82d63ec62 /ruby/ext/google/protobuf_c/map.c | |
parent | 43f2db776c265a9b22500e7a67af583b2b4ce85f (diff) | |
download | protobuf-9c6b8cb9bfc7c31ec99566772246c9bc4317c57b.tar.gz protobuf-9c6b8cb9bfc7c31ec99566772246c9bc4317c57b.tar.bz2 protobuf-9c6b8cb9bfc7c31ec99566772246c9bc4317c57b.zip |
Ruby: fixed Message#to_h for map fields.
Diffstat (limited to 'ruby/ext/google/protobuf_c/map.c')
-rw-r--r-- | ruby/ext/google/protobuf_c/map.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/ruby/ext/google/protobuf_c/map.c b/ruby/ext/google/protobuf_c/map.c index 12f1f9dd..4be54c39 100644 --- a/ruby/ext/google/protobuf_c/map.c +++ b/ruby/ext/google/protobuf_c/map.c @@ -654,6 +654,35 @@ VALUE Map_hash(VALUE _self) { /* * call-seq: + * Map.to_h => {} + * + * Returns a Ruby Hash object containing all the values within the map + */ +VALUE Map_to_h(VALUE _self) { + Map* self = ruby_to_Map(_self); + VALUE hash = rb_hash_new(); + upb_strtable_iter it; + for (upb_strtable_begin(&it, &self->table); + !upb_strtable_done(&it); + upb_strtable_next(&it)) { + VALUE key = table_key_to_ruby( + self, upb_strtable_iter_key(&it), upb_strtable_iter_keylength(&it)); + upb_value v = upb_strtable_iter_value(&it); + void* mem = value_memory(&v); + VALUE value = native_slot_get(self->value_type, + self->value_type_class, + mem); + + if (self->value_type == UPB_TYPE_MESSAGE) { + value = Message_to_h(value); + } + rb_hash_aset(hash, key, value); + } + return hash; +} + +/* + * call-seq: * Map.inspect => string * * Returns a string representing this map's elements. It will be formatted as @@ -804,6 +833,8 @@ void Map_register(VALUE module) { rb_define_method(klass, "dup", Map_dup, 0); rb_define_method(klass, "==", Map_eq, 1); rb_define_method(klass, "hash", Map_hash, 0); + rb_define_method(klass, "to_hash", Map_to_h, 0); + rb_define_method(klass, "to_h", Map_to_h, 0); rb_define_method(klass, "inspect", Map_inspect, 0); rb_define_method(klass, "merge", Map_merge, 1); rb_include_module(klass, rb_mEnumerable); |