upfluence-thrift 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb809da1e96c898170195f412187cefc6ed4839c
-  data.tar.gz: 3da420b756cbc7ed4c746947f4334587babd442c
+  metadata.gz: 0585c5dcf84ea7d019dfe7391d031ad89b8f51ed
+  data.tar.gz: 3569d6e14d9d6e2eac720b4569398c9e7b9ae537
 SHA512:
-  metadata.gz: 10e05d83d2047f12596a6f7ccce37bebf0b2a4e1b88f36e429f8edb7bd6b1620043a5da02d643343d8f62eab88020ddbf3b6eee9843802482276560b3636b046
-  data.tar.gz: 9fc8ce7980ee08ec603e5995c0d30ddc3398e6c40dc6f164750077f50af344f8ebc7a6c50aa1fe7d0716400049e592f67c9803998ab86b06d08bb915df870d7b
+  metadata.gz: 0c580dc31d5b3c8f31befb3baef6e3bc4e285698de536c35714f3a5c21d7f0b13bf42976f85945f0bd792381f6626ef2830d8c24fac9b5eeee1d509e14918704
+  data.tar.gz: f4a193a77d42cd34efc2366dda0a70c1da5fb4d24433fe70fc0f38c39ef4679e432a99fbc6319dd609bd1228cd48554061975d68f1c4ffaba391817a4d1ce8ee

data/lib/thrift/client.rb

@@ -26,11 +26,13 @@ module Thrift
     end
 
     def send_message(name, args_class, args = {})
+      @seqid += 1
       @oprot.write_message_begin(name, MessageTypes::CALL, @seqid)
       send_message_args(args_class, args)
     end
 
     def send_oneway_message(name, args_class, args = {})
+      @seqid += 1
       @oprot.write_message_begin(name, MessageTypes::ONEWAY, @seqid)
       send_message_args(args_class, args)
     end
@@ -50,9 +52,25 @@ module Thrift
       @oprot.trans.flush
     end
 
-    def receive_message(result_klass)
-      fname, mtype, rseqid = @iprot.read_message_begin
+    def receive_message(result_klass, name=nil)
+      fname, mtype, seqid = @iprot.read_message_begin
       handle_exception(mtype)
+
+      raise ApplicationException.new(
+        ApplicationException::BAD_SEQUENCE_ID,
+        'out of seq'
+      ) if seqid != @seqid
+
+      raise ApplicationException.new(
+        ApplicationException::INVALID_MESSAGE_TYPE,
+        'invalid message type'
+      ) if mtype != MessageTypes::REPLY
+
+      raise ApplicationException.new(
+        ApplicationException::WRONG_METHOD_NAME,
+        'wrong method name'
+      ) if !name.nil? && name != fname
+
       result = result_klass.new
       result.read(@iprot)
       @iprot.read_message_end
@@ -60,12 +78,12 @@ module Thrift
     end
 
     def handle_exception(mtype)
-      if mtype == MessageTypes::EXCEPTION
-        x = ApplicationException.new
-        x.read(@iprot)
-        @iprot.read_message_end
-        raise x
-      end
+      return if mtype != MessageTypes::EXCEPTION
+
+      x = ApplicationException.new
+      x.read(@iprot)
+      @iprot.read_message_end
+      raise x
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-thrift
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec