protein 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c6dfac5e16391f182c40d822c356770a07e2a1a
-  data.tar.gz: fb8dda9c4fa2ad86351bab6478b9315edc6a0522
+  metadata.gz: '08b4bbb0ee5a01175aafd5859b0bc26135434114'
+  data.tar.gz: de4ab2913d794eb14b1779315e009e82eb4d6f7e
 SHA512:
-  metadata.gz: e590ba3aa43770856f8e42b8713b02c0d6b2fb4fddd7bc49aeed7470b6465a511a84b740c3c2811d41fd981216f05d71f838bbfcc3b3ea6a742ee02f106d66c5
-  data.tar.gz: de08e7f29a2bda074a13e99b06b3eabc9f18081ffe5ed63065c5f13e8116bd8968b7a8cfc11ed4b5b5edd4e9706cb8f1ca51604c2ebd7d5c08f8d71b954ee6c4
+  metadata.gz: 7f7f1b3d4996505ff18d68ae2aa8b634da35988a5fb8e8e0be898f1bbf0a7e20c29771774d5962833693a31275f5112a80df61772b9af10db39ba1329ecf5c50
+  data.tar.gz: 6d80c80bc0e95c9976e7c38288a628f14cb2cc5413307254cfff870e06013d8d809068b25d1d790f2e46a39be39c9894bf757bcd8b35ed94f77005fb712c6c66

data/lib/protein.rb

@@ -2,6 +2,7 @@ require "protein/errors"
 require "protein/proto_compiler"
 require "protein/get_const"
 
+require "protein/config"
 require "protein/router"
 require "protein/client"
 require "protein/server"
@@ -12,6 +13,35 @@ require "protein/pointer"
 require "protein/service_error"
 require "protein/service"
 
-require "protein/transport"
 require "protein/http_adapter"
 require "protein/amqp_adapter"
+require "protein/transport"
+
+require "google/protobuf"
+begin
+  require "bunny"
+rescue LoadError
+end
+
+module Protein
+class << self
+  def configure(&block)
+    new_config = Config.new
+    block.call(new_config)
+    @config = new_config
+    @config
+  end
+
+  def config
+    @config ||= Config.new
+  end
+
+  def logger
+    @logger ||= begin
+      Logger.new($stdout).tap do |log|
+        log.progname = 'protein'
+      end
+    end
+  end
+end
+end

data/lib/protein/amqp_adapter.rb

@@ -1,4 +1,5 @@
 require "bunny"
+require "securerandom"
 require "thread"
 
 module Protein
@@ -74,7 +75,7 @@ class AMQPAdapter
       @q = @ch.queue(queue)
       @x = @ch.default_exchange
 
-      Rails.logger.info "Connected to #{url}, serving RPC calls from #{queue}"
+      Protein.logger.info "Connected to #{url}, serving RPC calls from #{queue}"
 
       loop do
         begin
@@ -95,10 +96,16 @@ class AMQPAdapter
 
             @ch.ack(delivery_info.delivery_tag)
 
-            raise(@error) if @error
+            if @error
+              error_logger = Protein.config.error_logger
+              error_logger.call(@error) if error_logger
+
+              raise(@error)
+            end
           end
         rescue StandardError => e
-          Rails.logger.info "RPC server error: #{e.inspect}, restarting the server in 5s..."
+          Protein.logger.error "RPC server error: #{e.inspect}, restarting the server in 5s..."
+
           sleep 5
         end
       end

data/lib/protein/config.rb

@@ -0,0 +1,5 @@
+module Protein
+  class Config
+    attr_accessor :error_logger
+  end
+end

data/lib/protein/get_const.rb

@@ -3,7 +3,7 @@ class GetConst
   class << self
     def call(input)
       if input.is_a?(String)
-        input.constantize
+        Object.const_get(input)
       elsif input != nil
         input
       else

data/lib/protein/payload.rb

@@ -1,5 +1,6 @@
 require "net/http"
 require "json"
+require "base64"
 
 module Protein
 module Payload

data/lib/protein/processor.rb

@@ -15,13 +15,13 @@ class Processor
     private
 
     def process_and_log_call(service_name, service_class, request_buf)
-      Rails.logger.info "Processing RPC call: #{service_name}"
+      Protein.logger.info "Processing RPC call: #{service_name}"
 
       start_time = Time.now
       response_buf, errors = process_call(service_class, request_buf)
       duration_ms = ((Time.now - start_time) * 1000).round
 
-      Rails.logger.info "#{response_buf ? 'Resolved' : 'Rejected'} in #{duration_ms}ms"
+      Protein.logger.info "#{response_buf ? 'Resolved' : 'Rejected'} in #{duration_ms}ms"
 
       Payload::Response.encode(response_buf, errors) if service_class.response?
     end
@@ -44,13 +44,13 @@ class Processor
     end
 
     def process_and_log_push(service_name, service_class, request_buf)
-      Rails.logger.info "Processing RPC push: #{service_name}"
+      Protein.logger.info "Processing RPC push: #{service_name}"
 
       start_time = Time.now
       process_push(service_class, request_buf)
       duration_ms = ((Time.now - start_time) * 1000).round
 
-      Rails.logger.info "Processed in #{duration_ms}ms"
+      Protein.logger.info "Processed in #{duration_ms}ms"
 
       nil
     end

data/lib/protein/proto_compiler.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Protein
 class ProtoCompiler
   class << self

data/lib/protein/server.rb

@@ -34,7 +34,7 @@ class Server
 
       if worker_count.is_a?(Integer) && worker_count > 1
         Parallel.each(1..worker_count, in_processes: worker_count) do |worker|
-          Rails.logger.info "Starting server #{worker}/#{worker_count} with PID #{Process.pid}"
+          Protein.logger.info "Starting server #{worker}/#{worker_count} with PID #{Process.pid}"
           transport_class.serve(router)
         end
       else

data/lib/protein/service.rb

@@ -11,7 +11,8 @@ class Service
 
     def proto(proto_module = nil)
       @proto_module = proto_module
-      @service_name ||= proto_module.to_s.split("::").last.underscore
+      @service_name ||= proto_module.to_s.split("::").last.
+        scan(/[A-Z][^A-Z]*/).map(&:downcase).join("_")
       @request_class ||= "#{proto_module}::Request"
       @response_class ||= "#{proto_module}::Response"
     end
@@ -30,7 +31,7 @@ class Service
 
     def response?
       response_class != false &&
-        (!response_class.is_a?(String) || !response_class.safe_constantize.nil?)
+        (!response_class.is_a?(String) || !(Object.const_get(response_class) rescue nil).nil?)
     rescue NameError
       false
     end
@@ -45,12 +46,19 @@ class Service
   end
 
   attr_reader :request, :response, :errors
-  delegate :response?, :response_class, to: :class
 
   def initialize(request)
     @request = request
   end
 
+  def response?
+    self.class.response?
+  end
+
+  def response_class
+    self.class.response_class
+  end
+
   def process
     @success = nil
     @response = response_class.new if response?

data/lib/protein/version.rb

@@ -1,3 +1,3 @@
 module Protein
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,19 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: protein
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Karol Słuszniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: google-protobuf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -21,6 +64,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -35,6 +81,7 @@ files:
 - lib/protein.rb
 - lib/protein/amqp_adapter.rb
 - lib/protein/client.rb
+- lib/protein/config.rb
 - lib/protein/errors.rb
 - lib/protein/get_const.rb
 - lib/protein/http_adapter.rb
@@ -68,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Multi-platform remote procedure call (RPC) system based on Protocol Buffers