upfluence-thrift 1.0.11 → 2.3.0

data/lib/thrift/types/known/timestamp.rb

@@ -0,0 +1,31 @@
+require 'thrift/types/known/timestamp_types'
+
+module Thrift
+  module Types
+    module Known
+      module Timestamp
+        class << self
+          def from_time(v)
+            Timestamp.from_time(v)
+          end
+
+          def now
+            from_time(Time.now)
+          end
+        end
+
+        class Timestamp
+          class << self
+            def from_time(v)
+              Timestamp.new(seconds: v.to_i, nanos: v.nsec)
+            end
+          end
+
+          def to_time
+            Time.at(seconds, nanos, :nsec)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thrift/types/known/timestamp_constants.rb

@@ -0,0 +1,17 @@
+#
+# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'timestamp_types'
+
+module Thrift
+  module Types
+    module Known
+      module Timestamp
+      end
+    end
+  end
+end

data/lib/thrift/types/known/timestamp_types.rb

@@ -0,0 +1,43 @@
+#
+# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Thrift
+  module Types
+    module Known
+      module Timestamp
+        class Timestamp; end
+
+        class Timestamp
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+
+          NAME = 'Timestamp'.freeze
+          NAMESPACE = 'types.known.timestamp'.freeze
+
+          THRIFT_FIELD_INDEX_SECONDS = 1
+          THRIFT_FIELD_INDEX_NANOS = 2
+
+          FIELDS = {
+            THRIFT_FIELD_INDEX_SECONDS => {type: ::Thrift::Types::I64, name: 'seconds'},
+            THRIFT_FIELD_INDEX_NANOS => {type: ::Thrift::Types::I32, name: 'nanos'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field seconds is unset!') unless @seconds
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nanos is unset!') unless @nanos
+          end
+
+          ::Thrift::Struct.generate_accessors self
+          ::Thrift.register_struct_type self
+        end
+
+      end
+    end
+  end
+end

data/lib/thrift/types/value.rb

@@ -0,0 +1,114 @@
+require 'thrift/types/value_types'
+
+module Thrift
+  module Types
+    module Value
+      class ListValue
+        def to_array
+          values.map(&:to_object)
+        end
+
+        class << self
+          def from_array(v)
+            ListValue.new(values: v.map { |vv| Value.from_object(vv) })
+          end
+        end
+      end
+
+      class MapValue
+        def to_hash
+          entries.reduce({}) do |acc, e|
+            acc.merge(e.key.to_object => e.value.to_object)
+          end
+        end
+
+        class << self
+          def from_hash(v)
+            MapValue.new(
+              entries: v.reduce([]) do |acc, (k, vv)|
+                acc +  [
+                  MapEntry.new(
+                    key:   Value.from_object(k),
+                    value: Value.from_object(vv)
+                  )
+                ]
+              end
+            )
+          end
+        end
+      end
+
+      class StructValue
+        def to_hash
+          fields.reduce({}) do |acc, (k, v)|
+            acc.merge(k => v.to_object)
+          end
+        end
+
+        class << self
+          def from_object(v)
+            StructValue.new(
+              fields: v.instance_variables.reduce({}) do |acc, k|
+                acc.merge(
+                  k.to_s[1..-1] => Value.from_object(v.instance_variable_get(k))
+                )
+              end
+            )
+          end
+        end
+      end
+
+      class << self
+        def from_object(v)
+          Value.from_object(v)
+        end
+      end
+
+      class Value
+        def to_object
+          case get_value.class
+          when NullValue
+             nil
+          when ListValue
+            list_value.to_array
+          when MapValue
+            map_value.to_hash
+          when StructValue
+            struct_value.to_hash
+          else
+            get_value
+          end
+        end
+
+        class << self
+          def from_object(v)
+            case v
+            when NilClass
+              Value.new(null_value: NullValue.new)
+            when Symbol
+              Value.new(string_value: v.to_s)
+            when String
+              if v.encoding.eql?(Encoding::UTF_8) && v.valid_encoding?
+                Value.new(string_value: v)
+              else
+                Value.new(binary_value: v)
+              end
+            when Integer
+              Value.new(integer_value: v)
+            when Float
+              Value.new(double_value: v)
+            when TrueClass, FalseClass
+              Value.new(bool_value: v)
+            when Array
+              Value.new(list_value: ListValue.from_array(v))
+            when Hash
+              Value.new(map_value: MapValue.from_hash(v))
+            else
+              Value.new(struct_value: StructValue.from_object(v))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thrift/types/value_constants.rb

@@ -0,0 +1,15 @@
+#
+# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'value_types'
+
+module Thrift
+  module Types
+    module Value
+    end
+  end
+end

data/lib/thrift/types/value_types.rb

@@ -0,0 +1,213 @@
+#
+# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Thrift
+  module Types
+    module Value
+      class NullValue; end
+
+      class ListValue; end
+
+      class MapEntry; end
+
+      class MapValue; end
+
+      class StructValue; end
+
+      class Value < ::Thrift::Union; end
+
+      class NullValue
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+
+        NAME = 'NullValue'.freeze
+        NAMESPACE = 'types.value'.freeze
+
+
+        FIELDS = {
+
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+        ::Thrift.register_struct_type self
+      end
+
+      class ListValue
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+
+        NAME = 'ListValue'.freeze
+        NAMESPACE = 'types.value'.freeze
+
+        THRIFT_FIELD_INDEX_VALUES = 1
+
+        FIELDS = {
+          THRIFT_FIELD_INDEX_VALUES => {type: ::Thrift::Types::LIST, name: 'values', element: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::Value}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
+        end
+
+        ::Thrift::Struct.generate_accessors self
+        ::Thrift.register_struct_type self
+      end
+
+      class MapEntry
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+
+        NAME = 'MapEntry'.freeze
+        NAMESPACE = 'types.value'.freeze
+
+        THRIFT_FIELD_INDEX_KEY = 1
+        THRIFT_FIELD_INDEX_VALUE = 2
+
+        FIELDS = {
+          THRIFT_FIELD_INDEX_KEY => {type: ::Thrift::Types::STRUCT, name: 'key', class: ::Thrift::Types::Value::Value},
+          THRIFT_FIELD_INDEX_VALUE => {type: ::Thrift::Types::STRUCT, name: 'value', class: ::Thrift::Types::Value::Value}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field value is unset!') unless @value
+        end
+
+        ::Thrift::Struct.generate_accessors self
+        ::Thrift.register_struct_type self
+      end
+
+      class MapValue
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+
+        NAME = 'MapValue'.freeze
+        NAMESPACE = 'types.value'.freeze
+
+        THRIFT_FIELD_INDEX_ENTRIES = 1
+
+        FIELDS = {
+          THRIFT_FIELD_INDEX_ENTRIES => {type: ::Thrift::Types::LIST, name: 'entries', element: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::MapEntry}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field entries is unset!') unless @entries
+        end
+
+        ::Thrift::Struct.generate_accessors self
+        ::Thrift.register_struct_type self
+      end
+
+      class StructValue
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+
+        NAME = 'StructValue'.freeze
+        NAMESPACE = 'types.value'.freeze
+
+        THRIFT_FIELD_INDEX_FIELDS = 1
+
+        FIELDS = {
+          THRIFT_FIELD_INDEX_FIELDS => {type: ::Thrift::Types::MAP, name: 'fields', key: {type: ::Thrift::Types::STRING}, value: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::Value}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fields is unset!') unless @fields
+        end
+
+        ::Thrift::Struct.generate_accessors self
+        ::Thrift.register_struct_type self
+      end
+
+      class Value < ::Thrift::Union
+        include ::Thrift::Struct_Union
+
+        NAME = 'Value'.freeze
+        NAMESPACE = 'types.value'.freeze
+
+        class << self
+          def null_value(val)
+            Value.new(:null_value, val)
+          end
+
+          def string_value(val)
+            Value.new(:string_value, val)
+          end
+
+          def binary_value(val)
+            Value.new(:binary_value, val)
+          end
+
+          def integer_value(val)
+            Value.new(:integer_value, val)
+          end
+
+          def double_value(val)
+            Value.new(:double_value, val)
+          end
+
+          def bool_value(val)
+            Value.new(:bool_value, val)
+          end
+
+          def list_value(val)
+            Value.new(:list_value, val)
+          end
+
+          def map_value(val)
+            Value.new(:map_value, val)
+          end
+
+          def struct_value(val)
+            Value.new(:struct_value, val)
+          end
+        end
+
+        THRIFT_FIELD_INDEX_NULL_VALUE = 1
+        THRIFT_FIELD_INDEX_STRING_VALUE = 2
+        THRIFT_FIELD_INDEX_BINARY_VALUE = 3
+        THRIFT_FIELD_INDEX_INTEGER_VALUE = 4
+        THRIFT_FIELD_INDEX_DOUBLE_VALUE = 5
+        THRIFT_FIELD_INDEX_BOOL_VALUE = 6
+        THRIFT_FIELD_INDEX_LIST_VALUE = 7
+        THRIFT_FIELD_INDEX_MAP_VALUE = 8
+        THRIFT_FIELD_INDEX_STRUCT_VALUE = 9
+
+        FIELDS = {
+          THRIFT_FIELD_INDEX_NULL_VALUE => {type: ::Thrift::Types::STRUCT, name: 'null_value', class: ::Thrift::Types::Value::NullValue},
+          THRIFT_FIELD_INDEX_STRING_VALUE => {type: ::Thrift::Types::STRING, name: 'string_value'},
+          THRIFT_FIELD_INDEX_BINARY_VALUE => {type: ::Thrift::Types::STRING, name: 'binary_value', binary: true},
+          THRIFT_FIELD_INDEX_INTEGER_VALUE => {type: ::Thrift::Types::I64, name: 'integer_value'},
+          THRIFT_FIELD_INDEX_DOUBLE_VALUE => {type: ::Thrift::Types::DOUBLE, name: 'double_value'},
+          THRIFT_FIELD_INDEX_BOOL_VALUE => {type: ::Thrift::Types::BOOL, name: 'bool_value'},
+          THRIFT_FIELD_INDEX_LIST_VALUE => {type: ::Thrift::Types::STRUCT, name: 'list_value', class: ::Thrift::Types::Value::ListValue},
+          THRIFT_FIELD_INDEX_MAP_VALUE => {type: ::Thrift::Types::STRUCT, name: 'map_value', class: ::Thrift::Types::Value::MapValue},
+          THRIFT_FIELD_INDEX_STRUCT_VALUE => {type: ::Thrift::Types::STRUCT, name: 'struct_value', class: ::Thrift::Types::Value::StructValue}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+        end
+
+        ::Thrift::Union.generate_accessors self
+        ::Thrift.register_struct_type self
+      end
+
+    end
+  end
+end

data/spec/binary_protocol_spec_shared.rb

@@ -38,25 +38,25 @@ shared_examples_for 'a binary protocol' do
 
   it "should make strict_write readable" do
     @prot.strict_write.should eql(true)
-  end    
+  end
 
   it "should write the message header" do
     @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
     @trans.read(@trans.available).should == [protocol_class.const_get(:VERSION_1) | Thrift::MessageTypes::CALL, "testMessage".size, "testMessage", 17].pack("NNa11N")
   end
-  
+
   it "should write the message header without version when writes are not strict" do
     @prot = protocol_class.new(@trans, true, false) # no strict write
     @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
     @trans.read(@trans.available).should == "\000\000\000\vtestMessage\001\000\000\000\021"
   end
-  
+
   it "should write the message header with a version when writes are strict" do
     @prot = protocol_class.new(@trans) # strict write
     @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
     @trans.read(@trans.available).should == "\200\001\000\001\000\000\000\vtestMessage\000\000\000\021"
   end
-  
+
 
   # message footer is a noop
 
@@ -64,44 +64,44 @@ shared_examples_for 'a binary protocol' do
     @prot.write_field_begin('foo', Thrift::Types::DOUBLE, 3)
     @trans.read(@trans.available).should == [Thrift::Types::DOUBLE, 3].pack("cn")
   end
-  
+
   # field footer is a noop
-  
+
   it "should write the STOP field" do
     @prot.write_field_stop
     @trans.read(1).should == "\000"
   end
-  
+
   it "should write the map header" do
     @prot.write_map_begin(Thrift::Types::STRING, Thrift::Types::LIST, 17)
     @trans.read(@trans.available).should == [Thrift::Types::STRING, Thrift::Types::LIST, 17].pack("ccN");
   end
-   
+
   # map footer is a noop
-  
+
   it "should write the list header" do
     @prot.write_list_begin(Thrift::Types::I16, 42)
     @trans.read(@trans.available).should == [Thrift::Types::I16, 42].pack("cN")
   end
-  
+
   # list footer is a noop
-  
+
   it "should write the set header" do
     @prot.write_set_begin(Thrift::Types::I16, 42)
     @trans.read(@trans.available).should == [Thrift::Types::I16, 42].pack("cN")
   end
-  
+
   it "should write a bool" do
     @prot.write_bool(true)
     @prot.write_bool(false)
     @trans.read(@trans.available).should == "\001\000"
   end
-  
+
   it "should treat a nil bool as false" do
     @prot.write_bool(nil)
     @trans.read(1).should == "\000"
   end
-  
+
   it "should write a byte" do
     # byte is small enough, let's check -128..127
     (-128..127).each do |i|
@@ -117,11 +117,11 @@ shared_examples_for 'a binary protocol' do
     # and lastly, a Bignum is going to error out
     lambda { @prot.write_byte(2**65) }.should raise_error(RangeError)
   end
-  
+
   it "should error gracefully when trying to write a nil byte" do
     lambda { @prot.write_byte(nil) }.should raise_error
   end
-  
+
   it "should write an i16" do
     # try a random scattering of values
     # include the signed i16 minimum/maximum
@@ -130,17 +130,17 @@ shared_examples_for 'a binary protocol' do
     end
     # and try something out of signed range, it should clip
     @prot.write_i16(2**15 + 5)
-    
+
     @trans.read(@trans.available).should == "\200\000\374\000\000\021\000\000\330\360\006\273\177\377\200\005"
-    
+
     # a Bignum should error
     # lambda { @prot.write_i16(2**65) }.should raise_error(RangeError)
   end
-  
+
   it "should error gracefully when trying to write a nil i16" do
     lambda { @prot.write_i16(nil) }.should raise_error
   end
-  
+
   it "should write an i32" do
     # try a random scattering of values
     # include the signed i32 minimum/maximum
@@ -150,14 +150,14 @@ shared_examples_for 'a binary protocol' do
     # try something out of signed range, it should clip
     @trans.read(@trans.available).should == "\200\000\000\000" + "\377\376\037\r" + "\377\377\366\034" + "\377\377\377\375" + "\000\000\000\000" + "\000#\340\203" + "\000\0000+" + "\177\377\377\377"
     [2 ** 31 + 5, 2 ** 65 + 5].each do |i|
-      lambda { @prot.write_i32(i) }.should raise_error(RangeError)  
+      lambda { @prot.write_i32(i) }.should raise_error(RangeError)
     end
   end
-  
+
   it "should error gracefully when trying to write a nil i32" do
     lambda { @prot.write_i32(nil) }.should raise_error
   end
-  
+
   it "should write an i64" do
     # try a random scattering of values
     # try the signed i64 minimum/maximum
@@ -176,11 +176,11 @@ shared_examples_for 'a binary protocol' do
       "\177\377\377\377\377\377\377\377"].join("")
     lambda { @prot.write_i64(2 ** 65 + 5) }.should raise_error(RangeError)
   end
-  
+
   it "should error gracefully when trying to write a nil i64" do
     lambda { @prot.write_i64(nil) }.should raise_error
   end
-  
+
   it "should write a double" do
     # try a random scattering of values, including min/max
     values = [Float::MIN,-1231.15325, -123123.23, -23.23515123, 0, 12351.1325, 523.23, Float::MAX]
@@ -189,7 +189,7 @@ shared_examples_for 'a binary protocol' do
       @trans.read(@trans.available).should == [f].pack("G")
     end
   end
-  
+
   it "should error gracefully when trying to write a nil double" do
     lambda { @prot.write_double(nil) }.should raise_error
   end
@@ -246,28 +246,28 @@ shared_examples_for 'a binary protocol' do
   it "should error gracefully when trying to write a nil string" do
     lambda { @prot.write_string(nil) }.should raise_error
   end
-  
+
   it "should write the message header without version when writes are not strict" do
     @prot = protocol_class.new(@trans, true, false) # no strict write
     @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
     @trans.read(@trans.available).should == "\000\000\000\vtestMessage\001\000\000\000\021"
   end
-    
+
   it "should write the message header with a version when writes are strict" do
     @prot = protocol_class.new(@trans) # strict write
     @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
     @trans.read(@trans.available).should == "\200\001\000\001\000\000\000\vtestMessage\000\000\000\021"
   end
-  
+
   # message footer is a noop
-  
+
   it "should read a field header" do
     @trans.write([Thrift::Types::STRING, 3].pack("cn"))
     @prot.read_field_begin.should == [nil, Thrift::Types::STRING, 3]
   end
-  
+
   # field footer is a noop
-  
+
   it "should read a stop field" do
     @trans.write([Thrift::Types::STOP].pack("c"));
     @prot.read_field_begin.should == [nil, Thrift::Types::STOP, 0]
@@ -277,36 +277,36 @@ shared_examples_for 'a binary protocol' do
     @trans.write([Thrift::Types::DOUBLE, Thrift::Types::I64, 42].pack("ccN"))
     @prot.read_map_begin.should == [Thrift::Types::DOUBLE, Thrift::Types::I64, 42]
   end
-  
+
   # map footer is a noop
-  
+
   it "should read a list header" do
     @trans.write([Thrift::Types::STRING, 17].pack("cN"))
     @prot.read_list_begin.should == [Thrift::Types::STRING, 17]
   end
-  
+
   # list footer is a noop
-  
+
   it "should read a set header" do
     @trans.write([Thrift::Types::STRING, 17].pack("cN"))
     @prot.read_set_begin.should == [Thrift::Types::STRING, 17]
   end
-  
+
   # set footer is a noop
-  
+
   it "should read a bool" do
     @trans.write("\001\000");
     @prot.read_bool.should == true
     @prot.read_bool.should == false
   end
-  
+
   it "should read a byte" do
     [-128, -57, -3, 0, 17, 24, 127].each do |i|
       @trans.write([i].pack("c"))
       @prot.read_byte.should == i
     end
   end
-  
+
   it "should read an i16" do
     # try a scattering of values, including min/max
     [-2**15, -5237, -353, 0, 1527, 2234, 2**15-1].each do |i|
@@ -314,7 +314,7 @@ shared_examples_for 'a binary protocol' do
       @prot.read_i16.should == i
     end
   end
-  
+
   it "should read an i32" do
     # try a scattering of values, including min/max
     [-2**31, -235125, -6236, 0, 2351, 123123, 2**31-1].each do |i|
@@ -322,7 +322,7 @@ shared_examples_for 'a binary protocol' do
       @prot.read_i32.should == i
     end
   end
-  
+
   it "should read an i64" do
     # try a scattering of values, including min/max
     [-2**63, -123512312, -6346, 0, 32, 2346322323, 2**63-1].each do |i|
@@ -330,7 +330,7 @@ shared_examples_for 'a binary protocol' do
       @prot.read_i64.should == i
     end
   end
-  
+
   it "should read a double" do
     # try a random scattering of values, including min/max
     [Float::MIN, -231231.12351, -323.233513, 0, 123.2351235, 2351235.12351235, Float::MAX].each do |f|
@@ -383,23 +383,20 @@ shared_examples_for 'a binary protocol' do
 
   it "should perform a complete rpc with no args or return" do
     srv_test(
-      proc {|client| client.send_voidMethod()},
-      proc {|client| client.recv_voidMethod.should == nil}
+      proc {|client| client.voidMethod().should == nil },
     )
   end
 
   it "should perform a complete rpc with a primitive return type" do
     srv_test(
-      proc {|client| client.send_primitiveMethod()},
-      proc {|client| client.recv_primitiveMethod.should == 1}
+      proc {|client| client.primitiveMethod.should == 1}
     )
   end
 
   it "should perform a complete rpc with a struct return type" do
     srv_test(
-      proc {|client| client.send_structMethod()},
       proc {|client|
-        result = client.recv_structMethod
+        result = client.structMethod
         result.set_byte_map = nil
         result.map_byte_map = nil
         result.should == Fixtures::COMPACT_PROTOCOL_TEST_STRUCT
@@ -410,14 +407,14 @@ shared_examples_for 'a binary protocol' do
   def get_socket_connection
     server = Thrift::ServerSocket.new("localhost", 9090)
     server.listen
-    
+
     clientside = Thrift::Socket.new("localhost", 9090)
     clientside.open
     serverside = server.accept
     [clientside, serverside, server]
   end
 
-  def srv_test(firstblock, secondblock)
+  def srv_test(block)
     clientside, serverside, server = get_socket_connection
 
     clientproto = protocol_class.new(clientside)
@@ -425,29 +422,29 @@ shared_examples_for 'a binary protocol' do
 
     processor = Srv::Processor.new(SrvHandler.new)
 
-    client = Srv::Client.new(clientproto, clientproto)
+    client = Srv::Client.new(clientproto)
+
+    t = Thread.new { processor.process(serverproto, serverproto) }
 
-    # first block
-    firstblock.call(client)
+    resp = block.call(client)
 
-    processor.process(serverproto, serverproto)
+    t.join
 
-    # second block
-    secondblock.call(client)
+    resp
   ensure
     clientside.close
     serverside.close
     server.close
   end
 
-  class SrvHandler 
+  class SrvHandler
     def voidMethod()
     end
-    
+
     def primitiveMethod
       1
     end
-    
+
     def structMethod
       Fixtures::COMPACT_PROTOCOL_TEST_STRUCT
     end