getaround_utils 0.2.23 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0f45f64d93dc7e5b83b2ee8612dff306880d7953c3e9026edcafe40925e7127
-  data.tar.gz: 5bcd057a886ff3a7423841f5bc29fb491501fa3c9226658a4b17801ae6eee189
+  metadata.gz: 2f6dd68f18739dcc00d036bb09895bd7a9ea55cafb8b75c7b27f0fb1b9d0c9ed
+  data.tar.gz: 76fd9e2acedc062898d72a3f86f08c892157f3e36db8a5839025c346cd1e324e
 SHA512:
-  metadata.gz: 98f5f63856cc9319be1d3f04e69bcf8aa5a165c48ad982ebf058a9e0faf92e31bf6dbeb1b5311f8ea89512156e508a7d3e070fbf0cfc22897958bc7279d58c06
-  data.tar.gz: ae985999bf28745645966d3108fd0dce14fba751f4a2e53aace72f5089515ddd94d6765ae3ae3349972b69cbcd72ac73b9f5083a4ec8acbf1a3c0d532938e8f7
+  metadata.gz: d885550f6cc2d3d7f829696457a6cc29cc08be3118b0ab8daf66d680942d26d5ac4242bc22277c87d694f4666c215f78ae4dbf8b2a0fbb692010d82694325180
+  data.tar.gz: 96a3ab41e81e981db9ed51288d9bccd7fbf4f21255e80832c2fa5c924d328a660f332975b602867a7e35e7dbd4259faa42e2f9d9e2ea092a4a05fb1e88f0005f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    getaround_utils (0.2.23)
+    getaround_utils (0.2.25)
 
 GEM
   remote: https://rubygems.org/
@@ -71,11 +71,15 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    connection_pool (2.3.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
     diff-lcs (1.5.0)
+    dotenv (2.7.6)
+    dotenv-rails (2.7.6)
+      dotenv (= 2.7.6)
+      railties (>= 3.2)
     erubi (1.10.0)
     getaround-rubocop (0.2.7)
       relaxed-rubocop (= 2.5)
@@ -116,7 +120,7 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.5)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (6.1.4.6)
@@ -147,7 +151,8 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    redis (4.6.0)
+    redis-client (0.12.0)
+      connection_pool
     regexp_parser (2.2.1)
     relaxed-rubocop (2.5)
     request_store (1.5.1)
@@ -191,10 +196,11 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    sidekiq (6.5.0)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
+    sidekiq (7.0.3)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.11.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -220,6 +226,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  dotenv-rails (~> 2.7.6)
   getaround-rubocop (= 0.2.7)
   getaround_utils!
   lograge (~> 0.12.0)
@@ -231,7 +238,7 @@ DEPENDENCIES
   rspec (~> 3.9, >= 3.9.0)
   rspec-rails (~> 5.0)
   rubocop (= 1.25.1)
-  sidekiq (~> 6.0)
+  sidekiq (> 6.0, < 8.0)
   webmock (~> 3.7)
 
 BUNDLED WITH

data/README.md

@@ -4,6 +4,31 @@ Backend shared utility classes
 
 ## Railties
 
+### GetaroundUtils::Railties::Dotenv
+
+Enable currated .env files loading
+```
+# config/application.rb
+require 'getaround_utils/railties/dotenv'
+
+GetaroundUtils::Railties::Dotenv.load
+```
+
+Additional files can be loaded with the highed precedence via the `DOTENVS` variable, ie:
+```
+DOTENVS=custom1,custom2 rails c
+# Will `load` .env files in the following order:
+# - `.env.custom1.local`
+# - `.env.custom1`
+# - `.env.custom2.local`
+# - `.env.custom2`
+# - `.env.<RAILS_ENV>.local`
+# - `.env.<RAILS_ENV>`
+# - `.env.all.local`
+# - `.env.all`
+# - `.env.local`
+```
+
 ### GetaroundUtils::Railties::Lograge
 
 Enables lograge (http logs) with favored default.

data/getaround_utils.gemspec

@@ -28,9 +28,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock', '~> 3.7'
 
   # Functional (optional) dependencies
+  gem.add_development_dependency 'dotenv-rails', '~> 2.7.6'
   gem.add_development_dependency 'lograge', '~> 0.12.0'
   gem.add_development_dependency 'ougai', '~> 2.0'
   gem.add_development_dependency 'rails', '~> 6.0'
   gem.add_development_dependency 'request_store_rails', '~> 2.0'
-  gem.add_development_dependency 'sidekiq', '~> 6.0'
+  gem.add_development_dependency 'sidekiq', '> 6.0', "< 8.0"
 end

data/lib/getaround_utils/railties/dotenv.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails/railtie'
+
+module GetaroundUtils; end
+
+module GetaroundUtils::Railties; end
+
+class GetaroundUtils::Railties::Dotenv < Rails::Railtie
+  def load
+    if ENV['DOTENVS'].present?
+      overrides = ENV['DOTENVS'].split(',').map{ |n| [".env.#{n}.local", ".env.#{n}"] }.flatten
+      warn('=' * 100)
+      warn("⚠️  ENV is overriden with the following profiles: #{overrides}")
+      warn('=' * 100)
+      Dotenv.load(*overrides)
+    end
+    Dotenv::Railtie.load
+    Dotenv.load('.env.all', '.env.all.local')
+    nil
+  end
+end

data/lib/getaround_utils/railties/ougai.rb

@@ -13,7 +13,12 @@ module GetaroundUtils::Railties; end
 # https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#define-a-custom-logger
 class OugaiRailsLogger < Ougai::Logger
   include ActiveSupport::LoggerThreadSafeLevel
-  include Rails::VERSION::MAJOR < 6 ? LoggerSilence : ActiveSupport::LoggerSilence
+  include ActiveSupport::LoggerSilence
+
+  def initialize(*args)
+    super
+    after_initialize if respond_to?(:after_initialize) && ActiveSupport::VERSION::MAJOR < 6
+  end
 end
 
 # Patch for ActiveSupport::TaggedLogging
@@ -46,14 +51,14 @@ end
 
 class GetaroundUtils::Railties::Ougai < Rails::Railtie
   config.ougai_logger = OugaiRailsLogger.new($stdout)
-  config.ougai_logger.after_initialize if Rails::VERSION::MAJOR < 6
   config.ougai_logger.formatter = GetaroundUtils::Ougai::JsonFormatter.new
+
   config.ougai_logger.before_log = lambda do |data|
-    request_store = RequestStore.store[:ougai] || {}
-    data.deep_merge!(request_store) if request_store&.any?
+    data.deep_merge!(RequestStore.store[:ougai]) \
+      if defined?(RequestStore) && RequestStore.store.key?(:ougai)
 
-    sidekiq_context = Thread.current[:sidekiq_context] || {}
-    data.merge!(sidekiq: sidekiq_context) if sidekiq_context&.any?
+    data.merge!(sidekiq: Thread.current[:sidekiq_context]) \
+      if defined?(Sidekiq) && Thread.current.key?(:sidekiq_context)
   end
 
   initializer :getaround_utils_ougai, before: :initialize_logger do |app|
@@ -61,16 +66,17 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
   end
 
   initializer :getaround_utils_ougai_middleware do |app|
-    app.config.app_middleware.insert_after ActionDispatch::RequestId, OugaiRequestStoreMiddleware
+    app.config.app_middleware.insert_after(ActionDispatch::RequestId, OugaiRequestStoreMiddleware)
   end
 
   initializer :getaround_utils_ougai_activesupport do
-    ActiveSupport::TaggedLogging::Formatter.prepend OugaiTaggedLoggingFormatter
+    ActiveSupport::TaggedLogging::Formatter.prepend(OugaiTaggedLoggingFormatter)
   end
 
   initializer :getaround_utils_ougai_lograge do |app|
     next unless defined?(Lograge)
 
+    # https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#with-lograge
     app.config.lograge.logger = app.config.logger
     app.config.lograge.formatter = Lograge::Formatters::Raw.new
   end
@@ -79,9 +85,13 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
     next unless defined?(Sidekiq)
 
     # https://github.com/tilfin/ougai/wiki/Customize-Sidekiq-logger
-    Sidekiq.logger = config.ougai_logger
+    Sidekiq.configure_client do |config|
+      config.logger = Rails.application.config.logger
+    end
 
     Sidekiq.configure_server do |config|
+      config.logger = Rails.application.config.logger
+
       original_handler = config.error_handlers.shift
       config.error_handlers << lambda do |ex, ctx|
         if Sidekiq.logger.is_a?(Ougai::Logger)

data/lib/getaround_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GetaroundUtils
-  VERSION = '0.2.23'
+  VERSION = '0.2.25'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.25
 platform: ruby
 authors:
 - Drivy
 - Laurent Humez
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: dotenv-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.6
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -189,16 +203,22 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 description: Shared base utility classes for Getaround Backend Applications.
 email:
 - oss@drivy.com
@@ -218,6 +238,7 @@ files:
 - lib/getaround_utils/ougai.rb
 - lib/getaround_utils/ougai/deep_key_value_formatter.rb
 - lib/getaround_utils/ougai/json_formatter.rb
+- lib/getaround_utils/railties/dotenv.rb
 - lib/getaround_utils/railties/lograge.rb
 - lib/getaround_utils/railties/ougai.rb
 - lib/getaround_utils/utils.rb
@@ -227,7 +248,7 @@ homepage: https://github.com/drivy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -243,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Backend shared utility classes
 test_files: []