sparsam 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 463e62afdb83d72613bae91f8bdfa8ee62863674
-  data.tar.gz: 8f53fa9ee9251f405deca43fc23940976e0c610e
+SHA256:
+  metadata.gz: c47d8f62e5244736a0f3e8e0e02f1f0104d3fb41982da0ca598940d2bfb6bc52
+  data.tar.gz: fe43b9eb4b3167adec9d435269a14ab90b08f4518f9c242875555a144fe3a689
 SHA512:
-  metadata.gz: 2fc153a2a4eccfd8c1b9c6ececaa5d5414a4c770544d07e32a3f07e034dde7ee7f5b52966abd50622eb40fea22dd43fb246058e34c47d4cf258ff4b1acf80b7a
-  data.tar.gz: ace526ffb1c1d231458273b9b0a5fb967edcf6b360af9a4e32ff9517359da890793e05afd263a778dedea5fd61a04253ac695c04fdf7e57a684cac4b0ef3f3a7
+  metadata.gz: a62b9bc043e205badb26495651e918b6ff14c6ab3574b2fbf5cbdc00ca61cd1f1bbd7f44ea18ebd40673bde1fffbff57e981cd3db532ffba43451b7e8d71e3b5
+  data.tar.gz: 6d6454f006da2089124019b176d5e916b2a1ff77ff67731601e18cf64275f224afc234b9bd27a5d10ff687992163743bcf804b153cc00526d51155786eb77171

data/ext/ruby_hooks.c

@@ -77,6 +77,7 @@ void Init_sparsam_native() {
   rb_define_method(SparsamSerializer, "initialize", initialize, 2);
   rb_define_method(SparsamSerializer, "serialize", serializer_writeStruct, 2);
   rb_define_method(SparsamSerializer, "deserialize", serializer_readStruct, 1);
+  rb_define_method(SparsamSerializer, "deserializeUnion", serializer_readUnion, 1);
   rb_define_const(Sparsam, "CompactProtocol", INT2FIX(compact));
   rb_define_const(Sparsam, "BinaryProtocol", INT2FIX(binary));
   rb_define_const(Sparsam, "UNION", INT2FIX(t_union));

data/ext/serializer.cpp

@@ -658,6 +658,17 @@ VALUE serializer_readStruct(VALUE self, VALUE klass) {
   catch_thrift_and_reraise();
 }
 
+VALUE serializer_readUnion(VALUE self, VALUE klass) {
+  watch_for_texcept() get_ts();
+  string cname;
+  VALUE ret;
+  ts->tprot->readStructBegin(cname);
+  ret = ts->readUnion(klass);
+  ts->tprot->readStructEnd();
+  return ret;
+  catch_thrift_and_reraise();
+}
+
 #define R_FIX_TO_TTYPE(x) (static_cast<TType>(FIX2INT(x)))
 
 FieldInfoMap *FindOrCreateFieldInfoMap(VALUE klass) {

data/ext/serializer.h

@@ -24,6 +24,7 @@ void serializer_init(void *serializer, int protocol, void *str_arg1,
                      uint32_t len);
 
 VALUE serializer_readStruct(VALUE self, VALUE klass);
+VALUE serializer_readUnion(VALUE self, VALUE klass);
 VALUE serializer_writeStruct(VALUE self, VALUE klass, VALUE data);
 
 VALUE cache_fields(VALUE self, VALUE klass);
@@ -78,10 +79,10 @@ public:
   boost::shared_ptr< ::apache::thrift::transport::TMemoryBuffer > tmb;
 
   VALUE readStruct(VALUE klass);
+  VALUE readUnion(VALUE klass);
   void writeStruct(VALUE klass, VALUE data);
 
 private:
-  VALUE readUnion(VALUE klass);
   VALUE readAny(TType ttype, FieldInfo *field_info);
   void writeAny(TType ttype, FieldInfo *field_info, VALUE data, VALUE outer_struct, VALUE field_sym);
   void skip_n_type(uint32_t n, TType ttype);

data/lib/sparsam/deserializer.rb

@@ -2,7 +2,11 @@ module Sparsam
   module Deserializer
     def self.deserialize(klass, serialized_string, prot = Sparsam::CompactProtocol)
       s = Sparsam::Serializer.new(prot, serialized_string)
-      s.deserialize(klass)
+      if klass <= Sparsam::Union
+        s.deserializeUnion(klass)
+      else
+        s.deserialize(klass)
+      end
     end
   end
 end

data/spec/sparsam_spec.rb

@@ -79,6 +79,14 @@ describe 'Sparsam' do
       ids.size.should == 0
     end
 
+    it "can deserialize unions" do
+      data = UN.new({ :id_i32 => 1000 })
+      result = data.serialize
+      data2 = Sparsam::Deserializer.deserialize(UN, result)
+      Sparsam.validate(UN, data2, Sparsam::RECURSIVE).should == true
+      data2.id_i32.should == 1000
+    end
+
     it "can handle passing in initialization data" do
       init = { "id_i32" => 10, "id_s" => "woohoo blackbird" }
       data = SS.new(init)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparsam
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Airbnb Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thrift
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Apache Thrift