upfluence-utils 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d310a8621edea92a80becf4c98aff88eb475b0400433c0106f22e955ee2ff450
-  data.tar.gz: a54d85a72eff261b5d5365de804272fcd2a79a36e910bdb63256f0c882312f86
+  metadata.gz: c3bc57cd1a39618d9375c1e012443d9f5b700ab0f5ae821ccd634bc4d09a8c3f
+  data.tar.gz: ef52fa325dd39b37d053349e0adabea839cff25ad4cf1a3f24e56f8af79e3ca7
 SHA512:
-  metadata.gz: 0be0be14842252b5653b6e9f4026d60999a3814a940f80b09c2b4fe264fc484422252ce94a132409d40bd6c0df83c670536b3cf3bf5ad8759f8a4391be8a68f9
-  data.tar.gz: '087d9a21f297581df4b94134aa6bb964a5827bbd3abe71d95af2ce34f67aeee29d75366e768e5d667222aca2badb01f20f9d11a7a14b33fe9a4ef3e672ee1a9c'
+  metadata.gz: 3148ad418210609e1fadd1303f0a37b6e27865e67b85102d4828891359fcaeb23b2481d0ad1cc6aa4c0a7967ead1c6aec77b56a6f42dc1b66bc5466a0a0bbc9d
+  data.tar.gz: 3da77ccc075193d01908f5070026ab5b6408b06267bb72c3554704d1f5559316d6b2316f432e6e54de928a155d66227ccca4aaf8b28ddd75ca49e7998b5c3342

data/lib/upfluence/http/endpoint/api_endpoint.rb

@@ -1,12 +1,15 @@
 require 'sinatra'
 require 'active_record'
 require 'active_support/hash_with_indifferent_access'
+require 'upfluence/http/endpoint/validation_error'
 
 module Upfluence
   module HTTP
     module Endpoint
       class BadRequest < StandardError; end
       class APIEndpoint < Sinatra::Base
+        VALIDATION_ERROR_KLASS = ValidationError
+
         disable :show_exceptions
         disable :logging
         disable :dump_errors
@@ -44,7 +47,7 @@ module Upfluence
           def respond_with(resource, *args)
             if resource.respond_to?(:errors) && resource.errors.any?
               status = 422
-              result = Base::Exceptions::ValidationError.from_model(
+              result = VALIDATION_ERROR_KLASS.from_model(
                 resource
               ).to_json
             else

data/lib/upfluence/http/server.rb

@@ -14,7 +14,6 @@ require 'upfluence/http/middleware/application_headers'
 require 'upfluence/http/middleware/handle_exception'
 require 'upfluence/http/middleware/prometheus'
 require 'upfluence/http/middleware/cors'
-require 'upfluence/handler/base'
 
 module Upfluence
   module HTTP
@@ -29,13 +28,14 @@ module Upfluence
         push_gateway_interval: 15, # sec
         app_name: ENV['APP_NAME'] || 'uhttp-rb-server',
         unit_name: ENV['UNIT_NAME'] || 'uhttp-rb-server-anonymous',
+        base_processor_klass: nil,
+        base_handler_klass: nil,
         debug: ENV['DEBUG']
-      }.freeze
+      }
 
       def initialize(options = {}, &block)
         @options = DEFAULT_OPTIONS.dup.merge(options)
         opts = @options
-        base_handler = Handler::Base.new(opts[:interfaces])
 
         @builder = Builder.new do
           use Middleware::Logger
@@ -54,13 +54,16 @@ module Upfluence
             run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
           end
 
-          map '/base' do
-            run_thrift Base::Base_service::BaseService::Processor, base_handler
+          if opts[:base_processor_klass] && opts[:base_handler_klass]
+            map '/base' do
+              run_thrift(
+                opts[:base_processor_klass],
+                opts[:base_handler_klass].new(@options[:interfaces])
+              )
+            end
           end
 
-          map '/debug' do
-            run Endpoint::Profiler.new
-          end if opts[:debug]
+          map('/debug') { run(Endpoint::Profiler.new) } if opts[:debug]
 
           instance_eval(&block)
         end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.8.4'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

data/rbutils.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_runtime_dependency 'upfluence-thrift', '~> 2.1'
-  spec.add_runtime_dependency 'base-thrift', '>= 0.1.0'
+  spec.add_runtime_dependency 'upfluence-thrift'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'redis'
   spec.add_runtime_dependency 'sentry-raven'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,32 +54,18 @@ dependencies:
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: upfluence-thrift
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: base-thrift
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -251,13 +237,11 @@ files:
 - Rakefile
 - lib/upfluence.rb
 - lib/upfluence/amqp/server.rb
-- lib/upfluence/base/exceptions/validation_error.rb
 - lib/upfluence/endpoint/api_endpoint.rb
 - lib/upfluence/environment.rb
 - lib/upfluence/error_logger.rb
 - lib/upfluence/error_logger/null.rb
 - lib/upfluence/error_logger/sentry.rb
-- lib/upfluence/handler/base.rb
 - lib/upfluence/http/builder.rb
 - lib/upfluence/http/endpoint/api_endpoint.rb
 - lib/upfluence/http/endpoint/healthcheck.rb
@@ -306,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Upfluence common utils for Ruby projects

data/lib/upfluence/base/exceptions/validation_error.rb

@@ -1,35 +0,0 @@
-require 'thrift/exceptions'
-require 'base/exceptions/exceptions_types'
-
-module Base
-  module Exceptions
-    class ValidationError < ::Thrift::Exception
-      class << self
-        attr_accessor :domain
-
-        def from_model(model)
-          validation_errors = model.errors.details.map do |error_field, errors|
-            errors.map do |error|
-              Base::Exceptions::Validation.new(
-                domain: domain,
-                model: model.model_name.singular,
-                field: error_field.to_s,
-                error: error[:error].to_s
-              )
-            end
-          end.flatten
-
-          new(validations: validation_errors)
-        end
-      end
-
-      def to_json
-        {
-          errors: validations.map do |v|
-            { resource: v.model, field: v.field, code: v.error }
-          end
-        }.to_json
-      end
-    end
-  end
-end

data/lib/upfluence/handler/base.rb

@@ -1,56 +0,0 @@
-require 'base/base_service/base_service'
-require 'base/version/version_types'
-require 'base/version'
-
-module Upfluence
-  module Handler
-    class Base
-      def initialize(modules = [])
-        @alive_since = Time.now.to_i
-        @modules = modules.reduce({ 'base' => ::Base::VERSION }) do |acc, cur|
-          acc.merge cur.name.downcase => cur::VERSION
-        end
-      end
-
-      def getVersion
-        semantic_version = if ENV['SEMVER_VERSION']
-          major, minor, patch = ENV['SEMVER_VERSION'].split('.')
-          ::Base::Version::SemanticVersion.new(
-            major: major[1..-1].to_i,
-            minor: minor.to_i,
-            patch: patch.to_i
-          )
-        end
-
-        git_version = if ENV['GIT_COMMIT']
-          ::Base::Version::GitVersion.new(
-            commit: ENV['GIT_COMMIT'],
-            branch: ENV['GIT_BRANCH'],
-            remote: ENV['GIT_REMOTE']
-          )
-        end
-
-        ::Base::Version::Version.new(
-          semantic_version: semantic_version,
-          git_version: git_version
-        )
-      end
-
-      def getName
-        ENV['UNIT_NAME'] || 'default'
-      end
-
-      def getStatus
-        ::Base::Base_service::Status::ALIVE
-      end
-
-      def aliveSince
-        @alive_since
-      end
-
-      def getInterfaceVersions
-        @modules
-      end
-    end
-  end
-end