protobuf-rpc-register 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70c633bbbfe53a84ac4c05ce177c5a65a7dc9ffa
-  data.tar.gz: 1469f09c7cdcdfa3d9c889de677bc3fc56289ef6
+  metadata.gz: db71b6ff98bdd94c7a855de0374b81b0d7fd8a58
+  data.tar.gz: 9a60f0893f84f3f9bc748e99d1db6c8e7aad4b97
 SHA512:
-  metadata.gz: 1d318ea876594e2fb6182cce82573acdf7a60458f77de202635bf3247ec5c9e4b93c07b2a145dafd7ecba76f9937645b28f5466f635375665a5b8199a5e3bbfe
-  data.tar.gz: a7cd3b378daf65dc5a24dc738afd9758c5ceebdf732839ea3fbb182a11c53b2e6942f0f22a214cedf0881a86081b1d4ff62ab69a490779011add73ee0053920e
+  metadata.gz: b05063712e2f79ac0af00e3d270b9d691d44e7c1987575cbf19a06aa6a42f1dea863ca82c0282b2193306d689eda819f0e14eb31dc0e196a4c4b23228a13b8d8
+  data.tar.gz: c17fe1a97f2ac8662a27ffaa546998e8f77af06d66f186935453bd92bee878cccbbf6aae7232b218896837ab8c5ffe4257e6c64da1ff227f9ba08d4497384f19

data/lib/protobuf/rpc/clients/base.rb

@@ -3,22 +3,23 @@ module Protobuf
     module Clients
       class Base
         attr_accessor :logger, :error_logger
+        attr_accessor :host, :port, :timeout
 
         mattr_reader(:mutex) { Mutex.new }
 
         def initialize(host: nil, port: nil, timeout: 1, stdout: STDOUT, stderr: STDERR, namespace: nil)
+          @host = host
+          @port = port
+          @timeout = timeout
           @namespace = namespace
           @logger ||= Logger.new(stdout)
           @error_logger ||= Logger.new(stderr)
         end
 
-        def send_rpc_request(method, msg)
+        def send_rpc_request(method, msg, serializer: serializer)
           res = nil
 
-          names = self.class.name.split('::')
-          svc_class = [names[0..-3], 'Services', names[-1]].flatten.join('::')
-
-          Object.const_get(svc_class).client(host: host, port: port, timeout: timeout).send(method, Serializer.dump(msg)) do |c|
+          internal_client.send(method, Serializer.dump(msg, serializer: serializer)) do |c|
             c.on_success do |rpc_compressed_message|
               res = Protobuf::Rpc::Serializer.load(rpc_compressed_message)
             end
@@ -50,6 +51,14 @@ module Protobuf
 
         private
 
+        def internal_client
+          @internal_client ||= begin
+            names = self.class.name.split('::')
+            svc_class = [names[0..-3], 'Services', names[-1]].flatten.join('::')
+            Object.const_get(svc_class).client(host: host, port: port, timeout: timeout)
+          end
+        end
+
         def define_error_class(res)
           module_name = (@namespace || 'Protobuf').camelize
           m = Object.const_defined?(module_name, false) ? Object.const_get(module_name, false) : Object.const_set(module_name, Module.new)
@@ -100,13 +109,17 @@ module Protobuf
           define_method(rpc_method) do |*args|
             msg = if args.first.is_a?(Protobuf::Message)
                     args.shift
+                  elsif args.first.respond_to?(:to_hash)
+                    Messages::RpcCompressedMessage.new(response_body: ActiveSupport::Gzip.compress(args.first.to_hash.to_json),
+                                                       serializer: :JSON,
+                                                       compressed: true)
                   else
                     names = self.class.name.split('::')
                     msg_class = Object.const_get([names[0..-3], 'Messages', names[-1]].flatten.join('::'))
                     msg_class.new(*args)
                   end
 
-            send_rpc_request(rpc_method, msg)
+            send_rpc_request(rpc_method, msg, serializer: :JSON)
           end
         end
       end

data/lib/protobuf/rpc/register/version.rb

@@ -1,7 +1,7 @@
 module Protobuf
   module Rpc
     module Register
-      VERSION = "0.4.1".freeze
+      VERSION = "0.4.2".freeze
     end
   end
 end

data/lib/protobuf/rpc/serializer.rb

@@ -80,6 +80,7 @@ module Protobuf
         end
 
         def msgpack(dumped_message, msg)
+          require 'msgpack' unless msg.respond_to?(:to_msgpack)
           dumped_message.response_body = msg.to_msgpack
           dumped_message.serializer = :MSGPACK
         end
@@ -91,11 +92,13 @@ module Protobuf
         end
 
         def oj(dumped_message, msg)
+          require 'oj' unless defined?(:Oj)
           dumped_message.response_body = Oj.dump(msg)
           dumped_message.serializer = :JSON
         end
 
         def multi_json(dumped_message, msg)
+          require 'multi_json' unless defined?(:MultiJson)
           dumped_message.response_body = MultiJson.dump(msg)
           dumped_message.serializer = :JSON
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-rpc-register
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - scorix