complex_config 0.21.2 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6474060cd0f183904552779ab98ae7cb6fb9db5599fc482a903f3d392275179b
-  data.tar.gz: 035c81f9e729450c78768c37db1d4e59d22e3e2836e024bc673ade290bde3d78
+  metadata.gz: d25e925267a755f28ea324b3ed2f43d737659124e097ae52ac48bd87aedd9173
+  data.tar.gz: f68858a3bba577915b3d602093363f1143b29be84cfe42f4ac4c64056baa5551
 SHA512:
-  metadata.gz: 1354001406f48dd90e2cdefa85aace10f96bdcbaadc1f64fcd470bdbcd3cc8a7c82a9db56766b61cb37c944d4a465838c9157c369f6213c476797b8003647d91
-  data.tar.gz: 81cedae129b2079be7bd94b473d6d17ce53d292fc83493ee491bb73b86e5f7690849bf66f5d7a25c5ba36101210294a932b3857ac10512cf8c21a0f1311fcd70
+  metadata.gz: c9cb2d7480057aa2685952e8c272c8a10245664c0e30fbdf83d76c1fd5c2ff196eb84bec265baa5fae19283acdcb9efd5c25e90721e40df4fe185fa5c2273bf9
+  data.tar.gz: 463827352c5df8655b58ea371c57733b78aa2a00ca28ac0e77516cb2b7edaf43919f5b5c93cf27e32d3add7d8eec53b8204af9b862871ba3d9a0037220ce34ae

data/CHANGES.md

@@ -1,5 +1,29 @@
 # Changes
 
+## 2024-09-22 v0.22.1
+
+#### Bug Fixes and Improvements
+
+* Refactor ComplexConfig settings and specs to handle nil values:
+  * Added `nil` handling in `ComplexConfig::Settings`
+  * Updated `settings_spec.rb` to test for `nil` values
+* Update dependencies and date in gemspec files:
+  - Removed development dependency `'utils'` from Rakefile.
+  - Updated date in `complex_config.gemspec` from "2024-09-13" to "2024-09-22"
+
+* Bumped version to **0.22.1**:
+  - Updated `VERSION` in `lib/complex_config/version.rb` from **0.22.0** to **0.22.1**
+  - Updated `s.version` in `complex_config.gemspec` from **0.22.0** to **0.22.1**
+  - Updated gem stub version in `complex_config.gemspec` from **0.22.0** to **0.22.1**
+
+## 2024-09-12 v0.22.0
+
+* **New Feature: UTF-8 Support**
+	+ Added `utf8` parameter to `Tree#initialize`
+	+ Introduced `default_utf8` method to determine default encoding based on environment variables
+	+ Modified `inner_child_prefix` and `last_child_prefix` methods for UTF-8 and ASCII encodings
+	+ Updated tests in `spec/complex_config/settings_spec.rb`
+
 ## 2024-09-09 v0.21.2
 
 * **Settings List Method**:

data/Rakefile

@@ -30,7 +30,6 @@ GemHadar do
   development_dependency 'simplecov'
   development_dependency 'rspec'
   development_dependency 'monetize'
-  development_dependency 'utils'
   development_dependency 'debug'
 end
 

data/VERSION

@@ -1 +1 @@
-0.21.2
+0.22.1

data/complex_config.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.21.2 ruby lib
+# stub: complex_config 0.22.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config".freeze
-  s.version = "0.21.2".freeze
+  s.version = "0.22.1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2024-09-09"
+  s.date = "2024-09-22"
   s.description = "This library allows you to access configuration files via a simple interface".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["complex_config".freeze]
@@ -23,12 +23,11 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.17.0".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.17.1".freeze])
   s.add_development_dependency(%q<rake>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<rspec>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<monetize>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<json>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, [">= 0".freeze])

data/lib/complex_config/settings.rb

@@ -104,7 +104,11 @@ class ComplexConfig::Settings < BasicObject
         if ::Array === v
           v.to_ary.map { |x| (x.ask_and_send(:to_h) rescue x) || x }
         elsif v.respond_to?(:to_h)
-          v.ask_and_send(:to_h) rescue v
+          if v.nil?
+            nil
+          else
+            v.ask_and_send(:to_h) rescue v
+          end
         else
           v
         end

data/lib/complex_config/tree.rb

@@ -25,19 +25,32 @@ module ComplexConfig
       end
     end
 
-    def initialize(name)
+    def initialize(name, utf8: default_utf8)
       @name     = name
+      @utf8     = utf8
       @children = []
     end
 
+    def default_utf8
+      !!(ENV['LANG'] =~ /utf-8\z/i)
+    end
+
     private
 
     def inner_child_prefix(i)
-      i.zero? ? "├─ " : "│  "
+      if @utf8
+        i.zero? ? "├─ " : "│  "
+      else
+        i.zero? ? "+- " : "|  "
+      end
     end
 
     def last_child_prefix(i)
-      i.zero? ? "└─ " : "   "
+      if @utf8
+        i.zero? ? "└─ " : "   "
+      else
+        i.zero? ? "`- " : "   "
+      end
     end
 
     public

data/lib/complex_config/version.rb

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

data/spec/complex_config/config_spec.rb

@@ -16,4 +16,3 @@ RSpec.describe ComplexConfig::Config do
     expect(ComplexConfig::Provider.plugins).to include plugin_code
   end
 end
-

data/spec/complex_config/plugins_spec.rb

@@ -43,4 +43,3 @@ RSpec.describe ComplexConfig::Plugins do
     end
   end
 end
-

data/spec/complex_config/settings_spec.rb

@@ -6,13 +6,21 @@ RSpec.describe ComplexConfig::Settings do
     allow(ComplexConfig::Provider.instance).to receive(:plugins).and_return([])
   end
 
+  around do |example|
+    old_locale, ENV['LOCAL'] = 'en_US.UTF-8', ENV['LANG']
+    example.run
+  ensure
+    ENV['LOCAL'] = old_locale
+  end
+
   let :settings do
     obj = described_class[
       foo: {
         bar: {
           baz: true
         },
-        qux: 'quux'
+        nix: nil,
+        qux: 'quux',
       }
     ]
     obj.name_prefix = 'root'
@@ -62,7 +70,7 @@ RSpec.describe ComplexConfig::Settings do
   end
 
   it 'can display its attribute_names' do
-    expect(settings.foo.attribute_names).to eq [ :bar, :qux ]
+    expect(settings.foo.attribute_names).to eq %i[ bar nix qux ]
   end
 
   it 'can display its attribute_values' do
@@ -76,19 +84,21 @@ RSpec.describe ComplexConfig::Settings do
   end
 
   it 'can be converted into a hash' do
-    expect(settings.foo.to_h).to eq(bar: { baz: true }, qux: 'quux')
+    expect(settings.foo.to_h).to eq(bar: { baz: true }, nix: nil, qux: 'quux')
   end
 
   it 'can return a hash with pathes as keys' do
     expect(settings.pathes(path_sep: ?:)).to eq(
       'root:foo:bar:baz' => true,
-      'root:foo:qux'     => "quux"
+      'root:foo:nix'     => nil,
+      'root:foo:qux'     => "quux",
     )
   end
 
   it 'can be listed as string' do
     expect(settings.attributes_list(pair_sep: ' → ', path_sep: ?/)).to eq <<~EOT
       root/foo/bar/baz → true
+      root/foo/nix → nil
       root/foo/qux → "quux"
     EOT
   end
@@ -101,6 +111,7 @@ RSpec.describe ComplexConfig::Settings do
     settings[:ary] = described_class[ [ 1, { nested: 2 }, 3 ] ]
     expect(settings.attributes_list).to eq <<~EOT
       root.foo.bar.baz = true
+      root.foo.nix = nil
       root.foo.qux = "quux"
       root.ary[0] = 1
       root.ary[1].nested = 2
@@ -115,6 +126,7 @@ RSpec.describe ComplexConfig::Settings do
       ├─ foo
       │  ├─ bar
       │  │  └─ baz = true
+      │  ├─ nix = nil
       │  └─ qux = "quux"
       └─ ary
          ├─ 1
@@ -124,30 +136,46 @@ RSpec.describe ComplexConfig::Settings do
     EOT
   end
 
-  it 'can be pretty printed' do
+  it 'can be pretty printed with utf8' do
     q = double
     expect(q).to receive(:text).with(<<~EOT.chomp)
       root
       └─ foo
          ├─ bar
          │  └─ baz = true
+         ├─ nix = nil
          └─ qux = "quux"
     EOT
     settings.pretty_print(q)
   end
 
+  it 'can be pretty printed with ASCII7' do
+    q = double
+    expect(q).to receive(:text).with(<<~EOT.chomp)
+      root
+      `- foo
+         +- bar
+         |  `- baz = true
+         +- nix = nil
+         `- qux = "quux"
+    EOT
+    ENV['LANG'] = 'de_DE.ISO8859-15'
+    settings.pretty_print(q)
+  end
+
   it 'can be converted into YAML' do
     expect(settings.to_yaml).to eq <<EOT
 ---
 :foo:
   :bar:
     :baz: true
+  :nix:
   :qux: quux
 EOT
   end
 
   it 'can be converted into JSON' do
-    expect(settings.to_json).to eq '{"foo":{"bar":{"baz":true},"qux":"quux"}}'
+    expect(settings.to_json).to eq '{"foo":{"bar":{"baz":true},"nix":null,"qux":"quux"}}'
   end
 
   it 'raises exception if expected attribute is missing' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.22.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement