upfluence-utils 0.7.1 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf89bde520f3bb7e52d3b43d14a6e514a64ef00359acc7a83a8380487279be04
-  data.tar.gz: bddf013280ab4620b7c96da45e47572b96aefe1bf6909b85be6e2c1281f9c06b
+  metadata.gz: d310a8621edea92a80becf4c98aff88eb475b0400433c0106f22e955ee2ff450
+  data.tar.gz: a54d85a72eff261b5d5365de804272fcd2a79a36e910bdb63256f0c882312f86
 SHA512:
-  metadata.gz: 99694e5f48b6878ec4b47d0e1bbba0ca7b99e531e4224750ab9ebe7856d81dc902dc2026e99ea3c0d2dd17bc71e5c21a5ba906f092bf1fe2aa4e64d6413f7592
-  data.tar.gz: 19f50f74f14cbcc531a769d66b248b266b50e091e37e60b1b4f48a49a8022d63ca57b903a84fd69ce16df6a7164f5b24a7839b31213d10602b1de9f546920237
+  metadata.gz: 0be0be14842252b5653b6e9f4026d60999a3814a940f80b09c2b4fe264fc484422252ce94a132409d40bd6c0df83c670536b3cf3bf5ad8759f8a4391be8a68f9
+  data.tar.gz: '087d9a21f297581df4b94134aa6bb964a5827bbd3abe71d95af2ce34f67aeee29d75366e768e5d667222aca2badb01f20f9d11a7a14b33fe9a4ef3e672ee1a9c'

data/.github/pull_request_template.md

@@ -0,0 +1,30 @@
+### What does this PR do?
+
+<!-- A brief description of the context of this pull request and its purpose. -->
+
+Fixes #<!-- enter issue number here -->
+
+### What are the observable changes?
+<!-- This question could be adequate with multiple use cases, for example: -->
+
+<!-- Frontend: explain the feature created / updated, give instructions telling how to see the change in staging -->
+<!-- Performance: what metric should be impacted, link to the right graphana dashboard for exemple -->
+<!-- Bug: a given issue trail on sentry should stop happening -->
+<!-- Feature: Implements X thrift service / Z HTTP REST API added, provide instructions on how leverage your feature from staging or your workstation -->
+
+### Good PR checklist
+
+- [ ] Title makes sense
+- [ ] Is against the correct branch
+- [ ] Only addresses one issue
+- [ ] Properly assigned
+- [ ] Added/updated tests
+- [ ] Added/updated documentation
+- [ ] Properly labeled
+
+### Additional Notes
+
+<!--
+    You can add anything you want here, an explanation on the way you built your implementation,
+    precisions on the origin of the bug, gotchas you need to mention.
+ -->

data/lib/upfluence.rb

@@ -3,3 +3,4 @@ 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,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
 

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('/').reject 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/resources.rb

@@ -0,0 +1 @@
+require 'upfluence/resources/countries'

data/lib/upfluence/resources/countries.rb

@@ -0,0 +1,23 @@
+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
+    ].freeze
+  end
+end

data/lib/upfluence/utils/version.rb

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

data/rbutils.gemspec

@@ -17,7 +17,7 @@ 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', '~> 2.1'
   spec.add_runtime_dependency 'base-thrift', '>= 0.1.0'
@@ -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', '~> 0.9.0'
+  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.7.1
+  version: 0.8.4
 platform: ruby
 authors:
 - Upfluence
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-12-11 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
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: userializer
   requirement: !ruby/object:Gem::Requirement
@@ -220,13 +220,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - dev@upfluence.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -256,7 +271,10 @@ 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/resources.rb
+- lib/upfluence/resources/countries.rb
 - lib/upfluence/utils.rb
 - lib/upfluence/utils/http/middleware/null.rb
 - lib/upfluence/utils/semaphore.rb
@@ -273,7 +291,7 @@ homepage: https://github.com/upfluence/rbutils
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -288,8 +306,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Upfluence common utils for Ruby projects
 test_files: []