thrift-client 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02cbfa3837919e23cc7f2d62998025440cde2ab7
-  data.tar.gz: 7fad55e8761f1a9154abe35b005aaad88085ad11
+  metadata.gz: 3ba417e66ac3216b8a6490adb38bf90a85db127b
+  data.tar.gz: a4d4bcf81f1a5541d93b1b719581b12bf0c2021b
 SHA512:
-  metadata.gz: 433bc811fc642c33ffa21244d69e5ef2cf88aea4610efeb21f7b646d0743fbd4f040c1c2d961a1fe6d2345781a841ec036b2173246ac7a272a33e40f3bf6f0cc
-  data.tar.gz: cd261fa3ddeb856f19cddef85a2af7ff7f14d580326fdb6ba13769dc68037cf2de9cd544be15d4cf6d3d5db00907c32944909297db8e0b628b857e901c331bf2
+  metadata.gz: 1df06deed7d3742dc314235bb5ba66202e0056ec52a80c4552b3e7b9c307bdf1039fb60674cf18219e8f7b1d3d95382447aef7b862b32d6023e547134caf7226
+  data.tar.gz: 1c83f131fb7021cd85bee6a948b47e9ee5f33366afc2230a1fb54e4e25006f3aef34d31d9b184477c9367aff8959411bf389bda1da306c15d14825359da8b5ef

data/lib/thrift_client.rb

@@ -1,5 +1,7 @@
 require 'thrift'
 require 'thrift_client/thrift'
+require 'thrift_client/multiplexed_processor'
+require 'thrift_client/multiplexed_client'
 require 'thrift_client/abstract_server'
 require 'thrift_client/single_client_server'
 require 'thrift_client/multi_client_server'

data/lib/thrift_client/multiplexed_client.rb

@@ -0,0 +1,26 @@
+module Thrift
+  module Client
+    alias :old_initialize :initialize
+ 
+    def initialize(service, iprot, oprot=nil)
+      old_initialize(iprot, oprot)
+      @service = service
+    end
+ 
+    def send_message(name, args_class, args = {})
+      @oprot.write_message_begin(@service + ':' + name, MessageTypes::CALL, @seqid)
+      data = args_class.new
+      args.each do |k, v|
+        data.send("#{k.to_s}=", v)
+      end
+      begin
+        data.write(@oprot)
+      rescue StandardError => e
+        @oprot.trans.close
+        raise e
+      end
+      @oprot.write_message_end
+      @oprot.trans.flush
+    end
+  end
+end

data/lib/thrift_client/multiplexed_processor.rb

@@ -0,0 +1,41 @@
+module Thrift
+  class MultiplexedProcessor
+    def initialize
+      @map = Hash.new
+    end
+ 
+    def register(service, processor)
+      processor.instance_variable_set(:@service, service)
+      @map[service] = processor
+    end
+ 
+    def process(iprot, oprot)
+      name, type, seqid  = iprot.read_message_begin
+ 
+      service, method = name.split(':')
+      processor = @map[service]
+      if processor.respond_to?("process_#{method}")
+        processor.send("process_#{method}", seqid, iprot, oprot)
+        true
+      else
+        iprot.skip(Types::STRUCT)
+        iprot.read_message_end
+        x = ApplicationException.new(ApplicationException::UNKNOWN_METHOD, 'Unknown function ' + name)
+        oprot.write_message_begin(name, MessageTypes::EXCEPTION, seqid)
+        x.write(oprot)
+        oprot.write_message_end
+        oprot.trans.flush
+        false
+      end
+    end
+  end
+ 
+  module Processor
+    def write_result(result, oprot, name, seqid)
+      oprot.write_message_begin(@service + ':' + name, MessageTypes::REPLY, seqid)
+      result.write(oprot)
+      oprot.write_message_end
+      oprot.trans.flush
+    end
+  end
+ end

data/lib/thrift_client/thrift.rb

@@ -13,6 +13,20 @@ module Thrift
     end
   end
 
+  module Struct
+    def to_hash
+      hash = {}
+      each_field do |fid, field_info|
+        name = field_info[:name]
+        value = instance_variable_get("@#{name}")
+        unless field_info[:optional] && value.nil?
+          hash.store(name, value)
+        end
+      end
+      return hash
+    end
+  end
+
   class MultiplexedProcessor
     def initialize
       @actual_processors = Hash.new
@@ -69,7 +83,7 @@ module Thrift
 
     def write_message_begin(name, type, seqid)
       case type
-      when ::Thrift::MessageTypes.CALL, ::Thrift::MessageTypes.ONEWAY
+      when MessageTypes::CALL, MessageTypes::ONEWAY
         @protocol.write_message_begin(@service_name + ":" + name, type, seqid)
       else
         @protocol.write_message_begin(name, type, seqid)

data/test/multiplexed_protocol_test.rb

@@ -15,7 +15,7 @@ class ClientTest < Test::Unit::TestCase
     transport = Thrift::Socket.new('127.0.0.1', 9999)
     transport = Thrift::FramedTransport.new(transport)
     protocol = Thrift::BinaryProtocol.new(transport)
-    protocol = Thrift::MultiplexedProtocol.new(protocol,"foo")
+    # protocol = Thrift::MultiplexedProtocol.new(protocol,"foobar")
     @client = Foo::FoobarService::Client.new(protocol)
     transport.open
     puts "setup"
@@ -31,7 +31,14 @@ class ClientTest < Test::Unit::TestCase
     end
 
     bar = @client.getBar
+
     assert_not_nil(bar)
+    # puts bar.to_hash.class
+    # hash_bar = bar.to_hash
+    # puts hash_bar['first']
+    # puts hash_bar['second']
+    # puts hash_bar['third']
+    # puts hash_bar['fourth']
 
     foo = Foo::Foo.new
     foo.first = 1

data/test/multiplexed_server.rb

@@ -44,13 +44,13 @@ module Server
   def self.start_server(host, port, serverClass)
     handler = FooHandler.new
     foo_processor = Foo::FoobarService::Processor.new(handler)
-    puts foo_processor.class.name.split("::")[-2].downcase.gsub("service","")
-    multi_processor = Thrift::MultiplexedProcessor.new
-    multi_processor.register(foo_processor.class.name.split("::")[-2], foo_processor)
+    # puts foo_processor.class.name.split("::")[-2].downcase.gsub("service","")
+    # multi_processor = Thrift::MultiplexedProcessor.new
+    # multi_processor.register(foo_processor.class.name.split("::")[-2].downcase.gsub("service",""), foo_processor)
     transport = ServerSocket.new(host, port)
     # transport = FramedTransport.new(transport)
     transport_factory = FramedTransportFactory.new
-    args = [multi_processor, transport, transport_factory]
+    args = [foo_processor, transport, transport_factory]
     if serverClass == NonblockingServer
       # logger = Logger.new(STDOUT)
       # logger.level = Logger::WARN

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrift-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ted Wang
@@ -30,20 +30,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/thrift_client/abstract_server.rb
 - lib/thrift_client/abstract_thrift_client.rb
+- lib/thrift_client/abstract_server.rb
 - lib/thrift_client/multi_client_server.rb
-- lib/thrift_client/single_client_server.rb
+- lib/thrift_client/multiplexed_client.rb
 - lib/thrift_client/thrift.rb
+- lib/thrift_client/multiplexed_processor.rb
+- lib/thrift_client/single_client_server.rb
 - lib/thrift_client.rb
-- test/client_test.rb
-- test/foobar_constants.rb
 - test/foobar_service.rb
+- test/server.rb
 - test/foobar_types.rb
+- test/foobar_constants.rb
+- test/client_test.rb
 - test/multiplexed_protocol_test.rb
-- test/multiplexed_server.rb
 - test/options_config_test.rb
-- test/server.rb
+- test/multiplexed_server.rb
 homepage: http://www.ximalaya.com
 licenses:
 - MIT2.0
@@ -69,11 +71,11 @@ signing_key:
 specification_version: 4
 summary: A Thrift client wrapper that encapsulates some common behavior.
 test_files:
-- test/client_test.rb
-- test/foobar_constants.rb
 - test/foobar_service.rb
+- test/server.rb
 - test/foobar_types.rb
+- test/foobar_constants.rb
+- test/client_test.rb
 - test/multiplexed_protocol_test.rb
-- test/multiplexed_server.rb
 - test/options_config_test.rb
-- test/server.rb
+- test/multiplexed_server.rb