protobuf-rpc-register 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b31ddac5ac6792779b1751d604cc352991ec3a
-  data.tar.gz: 677da2624d9f0b1546661403ddecea2fdb627785
+  metadata.gz: 69cf91d5d0dc37cfa2e3183ee45aa1d17d739035
+  data.tar.gz: 946260c19e3f8f9bd888ca8e4a0dfad81f8ffb55
 SHA512:
-  metadata.gz: 8d20ce6d1ee41109c8282d36b5d09d651bd4a0273324e83f3929c37a926ebec618681597884c605221fb0a73e47a5dc6e4fdf161c3076e90f218c3ea598c2869
-  data.tar.gz: 8ce2b7712106e944531de36c744cce162b79c7c07d41d32584dd3465f49b8900d62fe3dd5675b3d76470123f0f382942aa4be539d678c3d66db3eaef337c3be0
+  metadata.gz: f3e97a28e601554cf33c86f60c10007ac8735c14d51579f103ecf7967e14cb9af602d8313a3c14df26d4b6131b14b3c93324f449575d99db1f2c24fdefe5d91b
+  data.tar.gz: 237190b219ca4d3a58d48286cb30e7ac8c5895e30e9de31e60ae755fd3b6b5067b5e38778ee03752a1dadebc112f0a61491bd03057f5d88a0132b3267e20577f

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

@@ -2,14 +2,15 @@ module Protobuf
   module Rpc
     module Clients
       class Base
-        attr_accessor :logger
+        attr_accessor :logger, :error_logger
 
         mattr_reader(:mutex) { Mutex.new }
 
-        def initialize(options = {})
+        def initialize(options = {}, stdout: STDOUT, stderr: STDERR)
           @options = options
           @namespace = options[:namespace]
-          @logger ||= Logger.new(STDOUT)
+          @logger ||= Logger.new(stdout)
+          @error_logger ||= Logger.new(stderr)
         end
 
         def send_rpc_request(method, msg)
@@ -24,11 +25,7 @@ module Protobuf
             end
 
             c.on_failure do |error|
-              exception_name = Protobuf::Socketrpc::ErrorReason.name_for_tag(error.code).to_s.downcase
-              exception_class = Protobuf::Rpc.const_get(exception_name.camelize)
-              exception = exception_class.new(error.message)
-              logger.error exception
-              raise exception
+              res = error
             end
           end
 
@@ -36,58 +33,70 @@ module Protobuf
         end
 
         def check_response_error(res, raise_error: true)
-          if res.is_a?(Messages::Error)
-            error_class = self.class.mutex.synchronize do
-              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)
-              m.const_defined?(:Rpc, false) ? m.const_get(:Rpc, false) : m.const_set(:Rpc, Module.new)
-
-              if m.const_defined?(res.error_class, false)
-                m.const_get(res.error_class, false)
-              else
-                module_name = res.error_class.deconstantize
-                class_name = res.error_class.demodulize
-                base_module = m::Rpc
-                module_name.split('::').each do |m|
-                  base_module.const_defined?(m, false) || base_module.const_set(m, Module.new)
-                  base_module = base_module.const_get(m, false)
+          case res
+            when Protobuf::Rpc::Messages::Error
+              error_class = self.class.mutex.synchronize { define_error_class(res) }
+              error = error_class.new(res.error_message)
+              error.set_backtrace(res.error_backtrace)
+              raise_error(error, raise_error)
+            when Protobuf::Error
+              error_reason = Protobuf::Socketrpc::ErrorReason.name_for_tag(res.code).to_s.downcase
+              error_class = Protobuf::Rpc.const_get(error_reason.camelize)
+              error = error_class.new(res.message)
+              raise_error(error, raise_error)
+            else
+              res
+          end
+        end
+
+        private
+
+        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)
+          m.const_defined?(:Rpc, false) ? m.const_get(:Rpc, false) : m.const_set(:Rpc, Module.new)
+
+          if m.const_defined?(res.error_class, false)
+            m.const_get(res.error_class, false)
+          else
+            module_name = res.error_class.deconstantize
+            class_name = res.error_class.demodulize
+            base_module = m::Rpc
+            module_name.split('::').each do |m|
+              base_module.const_defined?(m, false) || base_module.const_set(m, Module.new)
+              base_module = base_module.const_get(m, false)
+            end
+            error_superclass = res.error_class.safe_constantize || begin
+              require res.error_class.split('::')[0].underscore
+              res.error_class.constantize
+            rescue LoadError
+              raise NameError.new("uninitialized constant #{res.error_class}", res.error_class)
+            end
+            if base_module.const_defined?(class_name, false)
+              base_module.const_get(class_name, false)
+            else
+              base_module.const_set(class_name, Class.new(error_superclass) do
+                def initialize(message = nil)
+                  @message = message
                 end
-                error_superclass = res.error_class.safe_constantize || begin
-                  require res.error_class.split('::')[0].underscore
-                  res.error_class.constantize
-                rescue LoadError
-                  raise NameError.new("uninitialized constant #{res.error_class}", res.error_class)
+
+                def inspect
+                  "#{self.class}: #{@message}"
                 end
-                if base_module.const_defined?(class_name, false)
-                  base_module.const_get(class_name, false)
-                else
-                  base_module.const_set(class_name, Class.new(error_superclass) do
-                    def initialize(message = nil)
-                      @message = message
-                    end
-
-                    def inspect
-                      "#{self.class}: #{@message}"
-                    end
-
-                    def message
-                      @message
-                    end
-                  end)
+
+                def message
+                  @message
                 end
-              end
+              end)
             end
-
-            error = error_class.new(res.error_message)
-            error.set_backtrace(res.error_backtrace)
-            logger.error error
-            raise error if raise_error
-            error
-          else
-            res
           end
         end
 
+        def raise_error(error, raise_error = false)
+          raise_error ? raise(error) : error_logger.error(error)
+          error
+        end
+
         def self.implement_rpc(rpc_method)
           define_method(rpc_method) do |*args|
             msg = if args.first.is_a?(Protobuf::Message)

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

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

data/lib/protobuf/rpc/serializer.rb

@@ -1,7 +1,7 @@
 module Protobuf
   module Rpc
     class Serializer
-      def self.dump(msg, serializer = nil)
+      def self.dump(msg, serializer:)
         return msg if msg.is_a?(Messages::RpcCompressedMessage)
         dumped_message = Messages::RpcCompressedMessage.new(compressed: false)
 
@@ -28,18 +28,8 @@ module Protobuf
                 yaml(dumped_message, msg)
               when :MARSHAL
                 marshal(dumped_message, msg)
-              when :RAW
-                raw(dumped_message, msg)
               else
-                if defined?(MessagePack) && msg.respond_to?(:to_msgpack)
-                  msgpack(dumped_message, msg)
-                elsif defined?(Oj)
-                  oj(dumped_message, msg)
-                elsif defined?(MultiJson)
-                  multi_json(dumped_message, msg)
-                else
-                  yaml(dumped_message, msg)
-                end
+                raw(dumped_message, msg)
             end
         end
 

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

@@ -6,11 +6,11 @@ module Protobuf
     module Services
       class Base < ::Protobuf::Rpc::Service
 
-        def compress_with(msg)
+        def compress_with(msg, serializer: :MSGPACK)
           if msg.is_a?(StandardError)
             msg = Messages::Error.new(error_class: msg.class.name, error_message: msg.message, error_backtrace: msg.backtrace)
           end
-          respond_with Serializer.dump(msg)
+          respond_with Serializer.dump(msg, serializer: serializer)
         end
 
         def self.inherited(subclass)

data/protobuf-rpc-register.gemspec

@@ -39,5 +39,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'protobuf', '~> 3.5'
   spec.add_runtime_dependency 'active_interaction', '~> 3.0'
-  spec.add_runtime_dependency 'activesupport', '~> 4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-rpc-register
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - scorix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: Register for rpc services using protobuf rpc.
 email:
 - scorix@gmail.com