getaround_utils 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b8f527ba9f0f5c93d0aa5f5898278230277ccbe435b690c03d0b79eceb277ab
-  data.tar.gz: 276a5197b07e3052fc813367d04ca0e04a84c1400da83c2487c83d22e8c43bce
+  metadata.gz: 1a0b5e64b0be84ffcfe22850f5b73c5e6d08d7eb6d843e7792d35268626377c7
+  data.tar.gz: 9dcefce00a8ad7bbb89ed28e6e4264c3ba80139ef9c2d2e0ade8f9fe0fe739c7
 SHA512:
-  metadata.gz: 66dcca84c67e6f7f030c359fce44e48e154b7fa1c2b780a1a6ef9b0f4d6dd9045d2da248f13ead1e04cea5ed9e523d50b5bd5b5e001703e3f3b1fef00151d48e
-  data.tar.gz: 327b48e801f84b263ae6be9d3e9c4535b3295e2a91634f77b39271d73d81a96ddc960dedc928d668513510f2701ac94da813f893510e11c4ae3769109d4b8677
+  metadata.gz: dff6641aa462aaf39e532b023723e25f1d8af1bc9fcaa1b24a5ea7b896910788c5f7c66121940281474d760dbf7e9d08f7a7fd2234e777cf08964c433283b83a
+  data.tar.gz: 63b26fa1260b94a4884d49bd42ce0aeb13fd3c1c0b3b03fa31863d214e2ff323530de7315dd7843ba5dbb54b3bf8d2957efa90d51644c4a3c147aca1178e3860

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.3.4] 2026-02-27
+
+### Breaking Changes
+
+- `GetaroundUtils::Utils::ConfigUrl.from_env` ([#460](https://github.com/drivy/backend-configs/pull/460))
+  - Add `_USERNAME` variable support
+  - Make sub variables overriding base url segments
+  ```dotenv
+  TEST_URL="whatever://foo:my-pwd@localhost:666/test"
+  TEST_USERNAME="bar"
+  TEST_PASSWORD="new-pwd"
+  ```
+  ```ruby
+  # BEFORE (<= 0.3.3)
+  GetaroundUtils::Utils::ConfigUrl.from_env('TEST')
+  # => <URI::Generic whatever://foo:my-pwd@localhost:666/test>
+    
+  # AFTER (> 0.3.3)
+  GetaroundUtils::Utils::ConfigUrl.from_env('TEST')
+  # => <URI::Generic whatever://bar:new-pwd@localhost:666/test>
+  ```
+
 ## [0.3.3] 2026-02-27
 - `GetaroundUtils::I18nBackend::FlatKeys` should be a module
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    getaround_utils (0.3.3)
+    getaround_utils (0.3.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -147,23 +147,25 @@ For more details, [read the spec](spec/getaround_utils/utils/deep_key_value_spec
 
 ### GetaroundUtils::Utils::ConfigUrl
 
-This helper allows to manage configuration urls with password extracted in a dedicated variable.
+This helper allows to manage configuration urls with username and password extracted in dedicated variables.
 
-It uses `*_URL` variable and tries to compute `*_PASSWORD` inside the parsed url.
+Uses `*_URL` variable and tries to compute `*_USERNAME` and `*_PASSWORD` variables inside the parsed url.
 
+```dotenv
+FOO_URL="redis://foo@localhost:666/10"
+FOO_PASSWORD="added-pwd"
+BAR_URL="whatever://bar:baz@localhost:666/42"
+BAR_USERNAME="user666"
+BAR_PASSWORD="new-pwd"
+ENV_TEST_NUMBER=1
+```
 ```ruby
-# FOO_URL="redis://foo@localhost:666/10"
-# FOO_PASSWORD="added-pwd"
-# BAR_URL="whatever://bar:used-pwd@localhost:666/42"
-# BAR_PASSWORD="not-used-pwd"
-# ENV_TEST_NUMBER=1
-
 GetaroundUtils::Utils::ConfigUrl
   .from_env('FOO')
   .tap { |uri| uri.path += ENV['ENV_TEST_NUMBER'] }
 # => <URI::Generic redis://foo:added-pwd@localhost:666/101>
 GetaroundUtils::Utils::ConfigUrl.from_env('BAR').to_s
-# => "whatever://bar:used-pwd@localhost:666/42"
+# => "whatever://user666:new-pwd@localhost:666/42"
 GetaroundUtils::Utils::ConfigUrl.from_env('UNKNOWN')
 # => KeyError: key not found "UNKNOWN_URL"
 GetaroundUtils::Utils::ConfigUrl.from_env('UNKNOWN', 'mysql://localhost/test')

data/lib/getaround_utils/utils/config_url.rb

@@ -9,15 +9,19 @@ module GetaroundUtils::Utils; end
 module GetaroundUtils::Utils::ConfigUrl
   def self.from_env(config_name, ...)
     env_url = ENV.fetch("#{config_name}_URL", ...)
+    env_usr = ENV.fetch("#{config_name}_USERNAME", nil)
     env_pwd = ENV.fetch("#{config_name}_PASSWORD", nil)
-    return if env_url.nil?
+    return if env_url.nil? || env_url.empty? # rubocop:disable Rails/Blank
 
     ::URI.parse(env_url).tap do |uri|
-      if env_pwd && !uri.userinfo
-        uri.userinfo = ":#{env_pwd}"
-      elsif env_pwd
-        uri.password ||= env_pwd
-      end
+      uri_usr, uri_pwd = uri.userinfo&.split(':', 2)
+      uri_pwd = uri_pwd.to_s if uri.userinfo&.include?(':')
+      usr = env_usr.nil? ? uri_usr : env_usr
+      pwd = env_pwd.nil? ? uri_pwd : env_pwd
+      userinfo = usr.to_s
+      userinfo += ":#{pwd}" unless pwd.nil?
+
+      uri.userinfo = userinfo unless userinfo.empty?
     end
   end
 end

data/lib/getaround_utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Drivy