upfluence-utils 0.6.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9bb165753378088d8c1aa9ac2d8a806ca616e55a757470fce8661b3b7d583f1
-  data.tar.gz: 0ba2eea8776f3fe667f7b706832c27a132622b017f7d66ac36b6ea0f60540852
+  metadata.gz: 9ceaeab38d91b29c5642efd418464634aff70d4b856e81838119cfb9bb51ea07
+  data.tar.gz: d1bfcabd937fd21089a5a612c978975bfb076c247281b7e120be395898a85fc4
 SHA512:
-  metadata.gz: 3dc614b510107cdb8a4288e6acdd7919f77909d56642eb9d68ca89ddbf9f98890b0536424b08853ff8ac3a139af3dee7e6050721526139eebf5e283a2c0d825e
-  data.tar.gz: 5eb0e42513b6ff40510a01d649ed1d7867c5afc32fbc5136df2be3f90ef20362fd3e2dff34658985f55a0385654f800134f2575aa33ac20d8aa46b950b089da4
+  metadata.gz: dc7bca3bd0914d787e15e30900705037a845f98311df404e4a40f0f016241bd014691a235c340b543a30b51fc477eca413cadd49889e9ed36bf6c30e4a2bf4eb
+  data.tar.gz: 14d6565989fff758bb50662eb7dfbb2e2e9423469f85656a4cf78c3eac0ca7ceaaa6ed620f72335c3c747ceb495bd96bf85c9c1e8d28733359e2c70d04fc9c86

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

@@ -1,4 +1,6 @@
 require 'sinatra'
+require 'active_record'
+require 'active_support/hash_with_indifferent_access'
 
 module Upfluence
   module HTTP
@@ -31,9 +33,9 @@ module Upfluence
             token = params[:access_token]
 
             unless token
-              pattern      = /^Bearer /
-              header       = request.env['HTTP_AUTHORIZATION']
-              token = header.gsub(pattern, '') if header && header.match(pattern)
+              pattern = /^Bearer /
+              header  = request.env['HTTP_AUTHORIZATION']
+              token   = header.gsub(pattern, '') if header&.match(pattern)
             end
 
             token
@@ -50,13 +52,17 @@ module Upfluence
               opts = args.first || {}
 
               result = if resource.is_a? Enumerable
-                         USerializer::ArraySerializer.new(resource, *args).to_json
+                         USerializer::ArraySerializer.new(
+                           resource, *args
+                         ).to_json
                        elsif opts[:serializer]
                          opts[:serializer].new(resource, *args).to_json
                        elsif resource.respond_to?(:serialize)
                          resource.serialize(*args).to_json
                        else
-                         USerializer.serializer_for(resource).new(resource, *args).to_json
+                         USerializer.serializer_for(resource).new(
+                           resource, *args
+                         ).to_json
                        end
             end
 
@@ -64,7 +70,9 @@ module Upfluence
           end
 
           def json_params
-            ActiveSupport::HashWithIndifferentAccess.new(JSON.parse(request_body))
+            ActiveSupport::HashWithIndifferentAccess.new(
+              JSON.parse(request_body)
+            )
           end
         end
 
@@ -84,6 +92,10 @@ module Upfluence
       Sinatra::Base.not_found do
         [404, {}, { error: 'not_found' }.to_json]
       end
+
+      Sinatra::Base.error ActiveRecord::RecordInvalid do |e|
+        [422, Base::Exceptions::ValidationError.from_model(e.record).to_json]
+      end
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Upfluence
   module HTTP
     module Middleware
       class Prometheus
+        LABELS = %i[path method env].freeze
+
         def initialize(app, registry = ::Prometheus::Client.registry)
           @registry = registry
 
@@ -12,14 +14,16 @@ module Upfluence
             :uhttp_handler_requests_total
           ) || @registry.counter(
             :uhttp_handler_requests_total,
-            'Histogram of processed items',
+            docstring: 'Histogram of processed items',
+            labels:    LABELS + %i[status]
           )
 
           @request_histogram = @registry.get(
             :uhttp_handler_requests_duration_second
           ) || @registry.histogram(
             :uhttp_handler_requests_duration_second,
-            'Histogram of processing time',
+            docstring: 'Histogram of processing time',
+            labels:    LABELS
           )
 
           @app = app
@@ -41,19 +45,21 @@ module Upfluence
 
         def record(env, code, duration)
           @request_total_count.increment(
-            path: parse_route(env),
-            method: env['REQUEST_METHOD'].downcase,
-            status: code,
-            env: Upfluence.env.to_s
+            labels: {
+              path:   parse_route(env),
+              method: env['REQUEST_METHOD'].downcase,
+              status: code,
+              env:    Upfluence.env.to_s
+            }
           )
 
           @request_histogram.observe(
-            {
-              path: parse_route(env),
+            duration,
+            labels: {
+              path:   parse_route(env),
               method: env['REQUEST_METHOD'].downcase,
-              env: Upfluence.env.to_s
-            },
-            duration
+              env:    Upfluence.env.to_s
+            }
           )
         end
 
@@ -75,8 +81,8 @@ module Upfluence
 
           path = Rack::Request.new(env).path
 
-          splitted_template = route.split(' ').last.split('/').select do |v|
-            v != ''
+          splitted_template = route.split(' ').last.split('/').rejext do |v|
+            v.eql?('')
           end.reverse
 
           path.split('/').reverse.map.with_index do |part, i|

data/lib/upfluence/peer.rb

@@ -0,0 +1,30 @@
+module Upfluence
+  class Peer
+    attr_reader :environment, :authority, :instance_name, :project_name,
+                :app_name
+
+    def initialize(opts = {})
+      @authority = opts[:authority] || 'local'
+      @instance_name = opts[:instance_name] || 'unknown-server'
+      @app_name = opts[:app_name] || 'unknown-name'
+      @project_name = opts[:project_name] || 'unknown-app'
+      @environment = opts[:environment] || 'development'
+    end
+
+    def to_url
+      "peer://#{@environment}@#{@authority}/#{@instance_name}"
+    end
+
+    class << self
+      def from_env
+        Peer.new(
+          authority:     ENV['AUTHORITY'],
+          instance_name: ENV['INSTANCE_NAME'],
+          app_name:      ENV['APP_NAME'],
+          project_name:  ENV['PROJECT_NAME'],
+          environment:   ENV['ENV']
+        )
+      end
+    end
+  end
+end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.6.2'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/rbutils.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_runtime_dependency 'upfluence-thrift', '~> 1.0', '>= 1.0.3'
+  spec.add_runtime_dependency 'upfluence-thrift', '~> 2.1'
   spec.add_runtime_dependency 'base-thrift', '>= 0.1.0'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'redis'
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'puma'
   spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'stackprof'
-  spec.add_runtime_dependency 'prometheus-client'
+  spec.add_runtime_dependency 'prometheus-client', '~> 2.1'
   spec.add_runtime_dependency 'userializer'
+  spec.add_runtime_dependency 'activerecord'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Upfluence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: base-thrift
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +194,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: prometheus-client
+  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: userializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: userializer
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -262,6 +270,7 @@ files:
 - lib/upfluence/logger.rb
 - lib/upfluence/mixin/pagination.rb
 - lib/upfluence/mixin/strong_parameters.rb
+- lib/upfluence/peer.rb
 - lib/upfluence/pool.rb
 - lib/upfluence/utils.rb
 - lib/upfluence/utils/http/middleware/null.rb