upfluence-utils 0.8.3 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445bf3674db4ae9627f19c3c572a1c6bca6cd89fc4279e570b24d927da6e1d8b
-  data.tar.gz: 7b9413b8f197ff9ed260865fd1c2acd56276b6b5a863d8987ce9d171ad5a8fe8
+  metadata.gz: 9de927439a57bb3fe4965c7ae407a23a3bd2a66c3d77d2cf020d278154cc0233
+  data.tar.gz: a28ae01832068a5a06af2810480e272f5120e40c429fd89b8a94d2142cbc2d1d
 SHA512:
-  metadata.gz: a4fa4e97b5f8ee0d1f9bdb440946cea644691a66b7387207353d458e257bdfebc9ac0577401957af5fa24094c998a6f17c4f1d0baa7d70c19a3f4578a5734e87
-  data.tar.gz: 2cd094d1bd2fa605afbcd2e90f32de161cc57cb0ef1304d93364defb7d543ab1f556d8b6dbf2b4721ec4677b3795a8040969791cb70b217cea723fb455a26a7e
+  metadata.gz: d246c89ce9474146caf1a31759e898343fffaa36d5c08139e277e8b302a3dfbb3a796b34bfacc47edbb2b34a90afd0332b3477114c93085682e2eeb1fb17db7b
+  data.tar.gz: 978b2e1d3b54ed04a58a289ce0aef61e84ee8d2eee4d4285f46be421c15d8c387b6697fc5d4fa3247cd4203a06477eb8ef7cd5b5e3b5a8f361dc559f40d27a56

data/lib/test.rb

@@ -0,0 +1,4 @@
+require 'upfluence/http/server'
+
+Upfluence::HTTP::Server.new do
+end.serve

data/lib/upfluence.rb

@@ -2,5 +2,4 @@ require 'upfluence/utils'
 require 'upfluence/endpoint/api_endpoint'
 require 'upfluence/mixin/strong_parameters'
 require 'upfluence/mixin/pagination'
-require 'upfluence/base/exceptions/validation_error'
 require 'upfluence/resources'

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/endpoint/validation_error.rb

@@ -0,0 +1,31 @@
+module Upfluence
+  module HTTP
+    module Endpoint
+      class ValidationError
+        def initialize(validations)
+          @validations = validations
+        end
+
+        class << self
+          def from_model(model)
+            validations = model.errors.details.map do |error_field, errors|
+              errors.map do |error|
+                OpenStruct.new(
+                  ressource: model.model_name.singular,
+                  field:     error_field.to_s,
+                  code:      error[:error].to_s
+                )
+              end
+            end.flatten
+
+            new(validations)
+          end
+        end
+
+        def to_json
+          { errors: @validations }.to_json
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/http/middleware/application_headers.rb

@@ -4,10 +4,7 @@ module Upfluence
       class ApplicationHeaders
         def initialize(app, handler)
           @app = app
-          @headers = {
-            "X-Upfluence-Unit-Name" => handler.getName,
-            "X-Upfluence-Version" => build_version(handler.getVersion)
-          }
+          @headers = handler ? build_headers(handler) : {}
         end
 
         def call(env)
@@ -17,14 +14,19 @@ module Upfluence
 
         private
 
+        def build_headers(handler)
+          {
+            'X-Upfluence-Unit-Name' => handler.getName,
+            'X-Upfluence-Version'   => build_version(handler.getVersion)
+          }
+        end
+
         def build_version(thrift_version)
-          if v = thrift_version.semantic_version
-            return "v#{v.major}.#{v.minor}.#{v.patch}"
-          end
+          v = thrift_version.semantic_version
+          return "v#{v.major}.#{v.minor}.#{v.patch}" if v
 
-          if v = thrift_version.git_version
-            return "v0.0.0-#{v.commit}"
-          end
+          v = thrift_version.git_version
+          return "v0.0.0-#{v.commit}" if v
 
           'undefined'
         end

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,19 @@ 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])
+        base_handler = nil
+
+        if opts[:base_handler_klass]
+          base_handler = opts[:base_handler_klass].new(@options[:interfaces])
+        end
 
         @builder = Builder.new do
           use Middleware::Logger
@@ -54,13 +59,13 @@ 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] && base_handler
+            map '/base' do
+              run_thrift(opts[:base_processor_klass], base_handler)
+            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/resources/countries.rb

@@ -1,23 +1,15 @@
 module Upfluence
-  module Ressources
+  module Resources
     COUNTRIES = %w[
-      US FR GB DE CH AF AL DZ AS AD AO AI
-      AG AR AM AW AU AT AZ BS BH BD BB BY
-      BE BZ BJ BM BT BO BA BW BR BN BG BF
-      BI CV KH CM CA KY CF TD CL CN CO KM
-      CG CD CK CI HR CU CY CZ DK DJ DM DO
-      GW GY HT VA HN HK HU IS IN ID IR IQ
-      IE IM IL IT JM JP JE JO KZ KE KI KP
-      KR KW KG LA LV LB LI LS LR LY LT LU
-      MO MK MG MW MY MV ML MT MH MQ MR MU
-      MX FM MD MC MN ME MS MA MZ MM NA NR
-      NP NL NC NZ NI NE NG NO OM PK PW PS
-      PA PG PY PE PH PL PT PR QA RE RO RU
-      RW KN LC VC WS SM ST SA SN RS SC SL
-      SG SK SI SB SO ZA ES LK SD SR SZ SE
-      SY TW TJ TZ TH TL TG TO TT TN TR TM
-      TC TV UG UA AE GB UY UZ VU VE VN VG
-      VI EH YE ZM ZW CR
+      US FR GB DE CH AF AL DZ AS AD AO AI AG AR AM AW AU AT AZ BS BH BD BB BY BE
+      BZ BJ BM BT BO BA BW BR BN BG BF BI CV KH CM CA KY CF TD CL CN CO KM CG CD
+      CK CI HR CU CY CZ DK DJ DM DO EC EG SV GQ ER EE ET FO FJ FI PF GA GM GE GH
+      GI GR GL GD GP GU GT GG GN GW GY HT VA HN HK HU IS IN ID IR IQ IE IM IL IT
+      JM JP JE JO KZ KE KI KP KR KW KG LA LV LB LI LS LR LY LT LU MO MK MG MW MY
+      MV ML MT MH MQ MR MU MX FM MD MC MN ME MS MA MZ MM NA NR NP NL NC NZ NI NE
+      NG NO OM PK PW PS PA PG PY PE PH PL PT PR QA RE RO RU RW KN LC VC WS SM ST
+      SA SN RS SC SL SG SK SI SB SO ZA ES LK SD SR SZ SE SY TW TJ TZ TH TL TG TO
+      TT TN TR TM TC TV UG UA AE GB UY UZ VU VE VN VG VI EH YE ZM ZW CR
     ].freeze
   end
 end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.8.3'.freeze
+    VERSION = '0.9.3'.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.3
+  version: 0.9.3
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-02-15 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
@@ -249,19 +235,19 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/test.rb
 - 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
 - lib/upfluence/http/endpoint/profiler.rb
+- lib/upfluence/http/endpoint/validation_error.rb
 - lib/upfluence/http/middleware/application_headers.rb
 - lib/upfluence/http/middleware/cors.rb
 - lib/upfluence/http/middleware/handle_exception.rb

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