const_conf 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94dee44a8f620b627c44b72326ffedc139d3e2ec03bffb74458337982757c8a9
-  data.tar.gz: 92ec058d76a2e5d26eb1775dfcd1a5eade1b31e91cb34659a37ed5e4a2c278ec
+  metadata.gz: af8de1ef676a5506d6ac24c9a0a5cb12c2764be09c78718a8ba89b1835b174df
+  data.tar.gz: f772b3255dcc22c76a1cd2a0767723e544f357857ec990a9e3f4525b479db44f
 SHA512:
-  metadata.gz: 424d7e0f4b3cc00ab78156c469da8aa61798a4d053f0d92b0249b17a6a37c191c7eccb05afca9ca21891d3332ef8b6f1dcd97ee7427abac9b90df4449b68ea50
-  data.tar.gz: 46908e964b3a1cb3f942e479669f342531f2932931e706d54d5abfcb2bf3365d60a53677b57bf04d3e69cf6bb70489a916cf07e0cd6dd90e5a86046585faa94e
+  metadata.gz: 63c554ea00c471a168199ce9fe2af35e7b2b90a070e2aa6d42b9f02cfd881dca59b3f9bcc0606186449ce7cbcc4620fd269c89fa3d1a13db434b276b82c9e9f0
+  data.tar.gz: 6cf09d2de496051711c5e0651496c2088c8a2518c7503568c7716e8bc7f620be13ebd7c6a95c94c62dff4282e278a0b930b2f0f7994a038b6ae53ab7e58c09fc

data/CHANGES.md

@@ -1,5 +1,34 @@
 # Changes
 
+## 2025-09-18 v0.4.0
+
+- Improved handling of configuration files with trailing whitespace:
+  - Added `strip: false` parameter to the `ConstConf::FilePlugin#file` method to
+    enable automatic whitespace stripping when `strip: true` is specified
+  - Added comprehensive tests for the new strip functionality in
+    `file_plugin_spec.rb`
+- Updated the `simplecov` development dependency version from **0.23** to
+  **0.22** in both `Rakefile` and `const_conf.gemspec`
+
+## 2025-09-18 v0.3.1
+
+- Replaced `require 'rails'` with `require 'active_support/all'` to reduce
+  dependency size
+- Updated `tins` dependency from version **1.42** to **1.43**
+- Updated `complex_config` dependency from version **0.22** to **0.23**
+- Updated development dependencies: `context_spook` from **0.3** to **0.4**,
+  `all_images` from **0.6** to **0.8**, and `simplecov` from **0.22** to
+  **0.23**
+- Added required Ruby version constraint of **= 3.2**
+- Replaced `it` with `_1` in block parameters for Ruby **3.2** compatibility
+- Updated Dockerfile to install `bundler` and `gem_hadar` gems directly
+- Changed test command from `rake test` to `rake spec`
+- Added `fail_fast: true` to CI configuration
+- Added support for Ruby **3.3** and **3.2** Alpine images in CI pipeline
+- Fixed prefix computation in nested modules with
+- Added `color:#07f` to all diagram node style definitions in `README.md` to
+  improve text visibility on colored backgrounds
+
 ## 2025-09-13 v0.2.2
 
 - Simplified ignore patterns in `Rakefile` by changing `*.contexts/*` to

data/README.md

@@ -249,16 +249,16 @@ graph TD
     Y --> AA[Default Value Handling]
     Y --> AB[Validation & Processing]
 
-    style A fill:#e1f5fe
-    style B fill:#f3e5f5
-    style C fill:#e8f5e9
-    style D fill:#fff3e0
-    style E fill:#fce4ec
-    style F fill:#f1f8e9
-    style G fill:#e0f2f1
-    style H fill:#f1f8e9
-    style I fill:#fafafa
-    style Y fill:#ffebee
+    style A fill:#e1f5fe;color:#07f
+    style B fill:#f3e5f5;color:#07f
+    style C fill:#e8f5e9;color:#07f
+    style D fill:#fff3e0;color:#07f
+    style E fill:#fce4ec;color:#07f
+    style F fill:#f1f8e9;color:#07f
+    style G fill:#e0f2f1;color:#07f
+    style H fill:#f1f8e9;color:#07f
+    style I fill:#fafafa;color:#07f
+    style Y fill:#ffebee;color:#07f
 ```
 
 #### FilePlugin

data/Rakefile

@@ -21,14 +21,16 @@ GemHadar do
     '.contexts'
   readme      'README.md'
 
-  dependency 'tins',           '~> 1.42'
+  required_ruby_version '~> 3.2'
+
+  dependency 'tins',           '~> 1.43'
   dependency 'json',           '~> 2.0'
-  dependency 'complex_config', '~> 0.22'
+  dependency 'complex_config', '~> 0.23'
   dependency 'activesupport',  '~> 8'
   development_dependency 'debug'
   development_dependency 'rspec',         '~> 3.13'
-  development_dependency 'context_spook', '~> 0.3'
-  development_dependency 'all_images',    '~> 0.6'
+  development_dependency 'context_spook', '~> 0.4'
+  development_dependency 'all_images',    '~> 0.8'
   development_dependency 'simplecov',     '~> 0.22'
 
   licenses << 'MIT'

data/const_conf.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: const_conf 0.2.2 ruby lib
+# stub: const_conf 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "const_conf".freeze
-  s.version = "0.2.2".freeze
+  s.version = "0.4.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/flori/const_conf".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "ConstConf - Clean DSL for config settings with validation and Rails integration".freeze, "--main".freeze, "README.md".freeze]
+  s.required_ruby_version = Gem::Requirement.new("~> 3.2".freeze)
   s.rubygems_version = "3.6.9".freeze
   s.summary = "Clean DSL for config settings with validation and Rails integration".freeze
   s.test_files = ["spec/const_conf/dir_plugin_spec.rb".freeze, "spec/const_conf/env_dir_extension_spec.rb".freeze, "spec/const_conf/file_plugin_spec.rb".freeze, "spec/const_conf/json_plugin_spec.rb".freeze, "spec/const_conf/setting_accessor_spec.rb".freeze, "spec/const_conf/setting_spec.rb".freeze, "spec/const_conf/tree_spec.rb".freeze, "spec/const_conf/yaml_plugin_spec.rb".freeze, "spec/const_conf_spec.rb".freeze, "spec/spec_helper.rb".freeze]
@@ -25,11 +26,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 2.6".freeze])
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.13".freeze])
-  s.add_development_dependency(%q<context_spook>.freeze, ["~> 0.3".freeze])
-  s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".freeze])
+  s.add_development_dependency(%q<context_spook>.freeze, ["~> 0.4".freeze])
+  s.add_development_dependency(%q<all_images>.freeze, ["~> 0.8".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.22".freeze])
-  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.42".freeze])
+  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.43".freeze])
   s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0".freeze])
-  s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze])
+  s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.23".freeze])
   s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 8".freeze])
 end

data/lib/const_conf/file_plugin.rb

@@ -23,9 +23,11 @@ module ConstConf::FilePlugin
   #
   # @raise [ConstConf::RequiredValueNotConfigured] if the file does not exist
   # and required is true
-  def file(path, required: false)
+  def file(path, required: false, strip: false)
     if File.exist?(path)
-      File.read(path)
+      value = File.read(path)
+      strip and value.strip!
+      value
     elsif required
       raise ConstConf::RequiredValueNotConfigured,
         "file required at path #{path.to_s.inspect}"

data/lib/const_conf/setting.rb

@@ -226,7 +226,7 @@ class ConstConf::Setting
   #
   # @return [String] the constructed environment variable name
   def env_var_name
-    prefix = @prefix.full? { "#{it}::" }.to_s
+    prefix = @prefix.full? { "#{_1}::" }.to_s
     name.sub(/^#{parent_namespace}::/,  prefix).gsub(/::/, ?_)
   end
 

data/lib/const_conf/tree.rb

@@ -71,7 +71,7 @@ module ConstConf
       # @return [ConstConf::Tree] a tree object representing the module's
       # configuration hierarchy
       def convert_module(modul)
-        desc = "#{modul.description.full? { italic(' # %s' % it) }}"
+        desc = "#{modul.description.full? { italic(' # %s' % _1) }}"
         obj  = new("#{modul.name}#{desc}")
         obj << new("prefix #{modul.prefix.inspect}")
         obj << new("#{modul.settings.size} settings")
@@ -105,7 +105,7 @@ module ConstConf
       #
       # @return [ConstConf::Tree] a tree node representing the configuration setting
       def convert_setting(setting)
-        desc = "#{setting.description.full? { italic(' # %s' % it) }}"
+        desc = "#{setting.description.full? { italic(' # %s' % _1) }}"
         obj  = new("#{bold(setting.name)}#{desc}")
 
         length = (Tins::Terminal.columns / 4).clamp(20..)

data/lib/const_conf/version.rb

@@ -1,6 +1,6 @@
 module ConstConf
   # ConstConf version
-  VERSION         = '0.2.2'
+  VERSION         = '0.4.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/const_conf.rb

@@ -1,5 +1,5 @@
 require 'tins/xt'
-require 'rails'
+require 'active_support/all'
 
 # A configuration management module that provides environment variable-based
 # settings with validation and thread-safe operations.
@@ -94,7 +94,7 @@ module ConstConf
     # files. It performs this operation in a thread-safe manner using the
     # monitor for synchronization.
     def reload
-      monitor.synchronize { destroy.each { load it } }
+      monitor.synchronize { destroy.each { load _1 } }
       nil
     end
   end
@@ -140,7 +140,7 @@ module ConstConf
           include ConstConf
         end
         prefix = [ self, *module_parents ].find {
-          !it.prefix.nil? and break it.prefix
+          !_1.prefix.nil? and break _1.prefix
         }
         const.prefix [ prefix, const.name.sub(/.*::/, '') ].select(&:present?) * ?_
       end
@@ -149,7 +149,7 @@ module ConstConf
           self.last_setting = nil
           remove_const(id)
           prefix = [ self, *module_parents ].find {
-            !it.prefix.nil? and break it.prefix
+            !_1.ask_and_send(:prefix).nil? and break _1.prefix
           }
           setting = Setting.new(name: [ name, id ], prefix:, &setting_block)
           if previous_setting = outer_configuration.setting_for(setting.env_var_name)
@@ -274,7 +274,7 @@ module ConstConf
     # @return [ Module, nil ] the outer configuration module if found, or nil
     # if none exists
     def outer_configuration
-      [ self, *module_parents ].reverse_each.find { it < ConstConf }
+      [ self, *module_parents ].reverse_each.find { _1 < ConstConf }
     end
 
     # Returns an array containing all nested configuration modules recursively,
@@ -442,8 +442,8 @@ module ConstConf
       configuration_modules = [ self ]
       while configuration = configuration_modules.pop
         configuration.nested_configurations.reverse_each do
-          configuration_modules.member?(it) and next
-          configuration_modules << it
+          configuration_modules.member?(_1) and next
+          configuration_modules << _1
         end
         yield configuration
       end

data/spec/const_conf/file_plugin_spec.rb

@@ -100,6 +100,50 @@ describe ConstConf::FilePlugin do
         }.to raise_error(ConstConf::RequiredValueNotConfigured)
       end
     end
+
+    context 'with strip option' do
+      let(:whitespace_file) { File.join(temp_dir, 'whitespace.txt') }
+
+      before do
+        File.write(whitespace_file, "  test_content  \n\n")
+      end
+
+      it 'strips whitespace when strip: true is specified' do
+        result = instance.file(whitespace_file, strip: true)
+        expect(result).to eq "test_content"
+      end
+
+      it 'does not strip whitespace when strip: false (default)' do
+        result = instance.file(whitespace_file, strip: false)
+        expect(result).to eq "  test_content  \n\n"
+      end
+
+      it 'does not strip whitespace when strip option is omitted' do
+        result = instance.file(whitespace_file)
+        expect(result).to eq "  test_content  \n\n"
+      end
+
+      it 'handles empty files with strip: true' do
+        empty_file = File.join(temp_dir, 'empty.txt')
+        File.write(empty_file, "")
+
+        result = instance.file(empty_file, strip: true)
+        expect(result).to eq ""
+      end
+
+      it 'handles whitespace-only files with strip: true' do
+        whitespace_only_file = File.join(temp_dir, 'whitespace_only.txt')
+        File.write(whitespace_only_file, "   \n\t  ")
+
+        result = instance.file(whitespace_only_file, strip: true)
+        expect(result).to eq ""
+      end
+
+      it 'works correctly with required files and strip option' do
+        result = instance.file(whitespace_file, required: true, strip: true)
+        expect(result).to eq "test_content"
+      end
+    end
   end
 
   describe 'integration with ConstConf settings' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: const_conf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Florian Frank
@@ -57,28 +57,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.42'
+        version: '1.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.42'
+        version: '1.43'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -220,9 +220,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="