upfluence-utils 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3bc57cd1a39618d9375c1e012443d9f5b700ab0f5ae821ccd634bc4d09a8c3f
-  data.tar.gz: ef52fa325dd39b37d053349e0adabea839cff25ad4cf1a3f24e56f8af79e3ca7
+  metadata.gz: a772a1a30ba2d049bcc080e162bd3c7c7a0168210d93e84dfb187c346bc7f559
+  data.tar.gz: e2677f4fcf561c494915dee9204150ec93e92600e7a5413bc7af7bed6143ed15
 SHA512:
-  metadata.gz: 3148ad418210609e1fadd1303f0a37b6e27865e67b85102d4828891359fcaeb23b2481d0ad1cc6aa4c0a7967ead1c6aec77b56a6f42dc1b66bc5466a0a0bbc9d
-  data.tar.gz: 3da77ccc075193d01908f5070026ab5b6408b06267bb72c3554704d1f5559316d6b2316f432e6e54de928a155d66227ccca4aaf8b28ddd75ca49e7998b5c3342
+  metadata.gz: 3ee9fbf46fa1421d1f3e66a29e701eda7cbdd361dc8b8d2a5e4ec1baa1a412a91502a99c8cd3389eaaffcc2a9d0d600d2fac1814232df659b84e5092176eb61a
+  data.tar.gz: 2d5551334b452dfd16d40340665d42e4efb7f4694ccb302b497dbe48f7113d206db8da2a704188a8670ee4209d95430ed5e59bcb69d56116601c3fc82a51a29a

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

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'active_record'
 require 'active_support/hash_with_indifferent_access'
 require 'upfluence/http/endpoint/validation_error'
+require 'upfluence/mixin/strong_parameters'
 
 module Upfluence
   module HTTP
@@ -99,6 +100,16 @@ module Upfluence
       Sinatra::Base.error ActiveRecord::RecordInvalid do |e|
         [422, Base::Exceptions::ValidationError.from_model(e.record).to_json]
       end
+
+      Sinatra::Base.error Upfluence::Mixin::StrongParameters::ParameterMissing do |e|
+        [
+          400,
+          {
+            error: 'missing_parameter',
+            param: e.param
+          }.to_json
+        ]
+      end
     end
   end
 end

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

@@ -36,6 +36,11 @@ module Upfluence
       def initialize(options = {}, &block)
         @options = DEFAULT_OPTIONS.dup.merge(options)
         opts = @options
+        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,12 +59,9 @@ module Upfluence
             run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
           end
 
-          if opts[:base_processor_klass] && opts[:base_handler_klass]
+          if opts[:base_processor_klass] && base_handler
             map '/base' do
-              run_thrift(
-                opts[:base_processor_klass],
-                opts[:base_handler_klass].new(@options[:interfaces])
-              )
+              run_thrift(opts[:base_processor_klass], base_handler)
             end
           end
 

data/lib/upfluence/resources/countries.rb

@@ -1,23 +1,15 @@
 module Upfluence
   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.9.0'.freeze
+    VERSION = '0.9.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.5
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -235,6 +235,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/test.rb
 - lib/upfluence.rb
 - lib/upfluence/amqp/server.rb
 - lib/upfluence/endpoint/api_endpoint.rb
@@ -246,6 +247,7 @@ files:
 - 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
@@ -290,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Upfluence common utils for Ruby projects