confg 2.1.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d57cdcb6b4260c49d3eb285d7a99f2af3fd5d794e946106d2a712f5ea8667ee
-  data.tar.gz: 03bb960cce3ef04f638b2fbd8eb5fdf984a202236239cb36eff5591d051f65d5
+  metadata.gz: 2ffa65a341a5ea7d93390edf845981fd50c0df586c6e28b7c8487b035706092a
+  data.tar.gz: c5bba8919704165a458b2509a75f83ef10b1c5eb9056a39aa53368e7f6a19a2a
 SHA512:
-  metadata.gz: cc67bcb712453cd0c1eec6c7a5e0a451ce3aaf928df8105f00fceda604248a4b87b8d17def76ed5da4e381203e3a47aea9a4d9552fb9b52d81fe466ab656f072
-  data.tar.gz: e5b86cdc382144724de10a92023341a5d1258742994882900948c5db565e13287c1c678332ecb85970a9841467295ad9e356872d3b83e52c5bac8a18190145a3
+  metadata.gz: f15b35166baaaf7270a755a6770839c774cb581052004aac9b4f85a1d0e333a52eec9c0a8ea0d577d96bf8028f1c1a63106c0a7cf21eb47016787d5b7d64f53c
+  data.tar.gz: 9b28f027b6aab53c8ff152faafc932ad01767fe64f5de95ec84839956d54e393cf743b92171a0120f36d36f01611b2dc0dc4cb7cd3def5fb68414687d3bfcff2

data/.gitignore

@@ -14,3 +14,4 @@
 mkmf.log
 *.gem
 .byebug_history
+/vendor/

data/.ruby-version

@@ -0,0 +1 @@
+3.0.6

data/confg.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
 end

data/lib/confg/configuration.rb

@@ -71,12 +71,12 @@ module Confg
       set(key, inner)
     end
 
-    def load_key(key)
+    def load_key(key,yaml_loader_options = {})
       # loads yaml file with given key
-      load_yaml(key, key: key)
+      load_yaml(key, yaml_loader_options, key: key)
     end
 
-    def load_yaml(path, key: nil, ignore_env: false)
+    def load_yaml(path, yaml_loader_options = {}, key: nil, ignore_env: false)
       found_path = find_config_yaml(path)
 
       raise ArgumentError, "#{path} could not be found" if found_path.nil?
@@ -84,7 +84,7 @@ module Confg
       ctxt = ::Confg::ErbContext.new
       raw_content = ::File.read(found_path)
       erb_content = ctxt.evaluate(raw_content)
-      yaml_content = ::YAML.send :load, erb_content
+      yaml_content = ::YAML.safe_load(erb_content, **yaml_loader_options.merge(aliases: true)) # due to shared sections
 
       unless ignore_env
         yaml_content = yaml_content[confg_env] if confg_env && yaml_content.is_a?(::Hash) && yaml_content.key?(confg_env)
@@ -104,13 +104,13 @@ module Confg
     end
     alias load_yml load_yaml
 
-    def method_missing(key, *args, &block)
+    def method_missing(key, *args, **kwargs, &block)
       key = key.to_s
       return set(key[0...-1], args[0]) if key.end_with?("=")
       return fetch(key) if key?(key)
 
       begin
-        confg_data.send(key, *args, &block)
+        confg_data.send(key, *args, **kwargs, &block)
       rescue NoMethodError => e
         raise KeyError, "Unrecognized key `#{key}`", e.backtrace
       end

data/lib/confg/version.rb

@@ -2,6 +2,6 @@
 
 module Confg
 
-  VERSION = "2.1.0"
+  VERSION = "3.0.1"
 
 end

data/lib/confg.rb

@@ -39,11 +39,11 @@ module Confg
     end
     alias configure config
 
-    def method_missing(method_name, *args, &block)
-      config.send(method_name, *args, &block)
+    def method_missing(method_name, ...)
+      config.send(method_name, ...)
     end
 
-    def respond_to_missing?(*_args)
+    def respond_to_missing?(...)
       true
     end
 

data/test/confg_test.rb

@@ -65,6 +65,21 @@ class ConfgTest < Minitest::Test
     }, config.to_h)
   end
 
+  def test_a_yml_file_doesnt_load_with_additional_permitted_classes
+    assert_raises "Psych::DisallowedClass: Tried to load unspecified class: Symbol" do
+      config.load_yaml("example_with_symbols.yml", ignore_env: true)
+    end
+  end
+
+  def test_a_yml_file_can_be_loaded_with_additional_permitted_classes
+    config.load_yaml("example_with_symbols.yml", { permitted_classes: [Symbol] }, ignore_env: true)
+    assert_equal({
+      "shared" => { "foo" => :foo },
+      "production" => { "env_setting" => :setting_prod, "foo" => :foo },
+      "test" => { "env_setting" => :setting_test, "foo" => :foo },
+    }, config.to_h)
+  end
+
   def test_top_level_configs_are_cached_in_root_namespace
     ::Confg.send :reset!
     assert_equal({}, ::Confg.cache)

data/test/example_with_symbols.yml

@@ -0,0 +1,10 @@
+shared: &shared
+  foo: :foo
+
+production:
+  <<: *shared
+  env_setting: :setting_prod
+
+test:
+  <<: *shared
+  env_setting: :setting_test

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: confg
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Mike Nelson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Config the pipes
 email:
 - mike@mnelson.io
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -84,11 +85,12 @@ files:
 - lib/confg/version.rb
 - test/confg_test.rb
 - test/example.yml
+- test/example_with_symbols.yml
 - test/test_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,11 +105,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Sets shared variables for applications
 test_files:
 - test/confg_test.rb
 - test/example.yml
+- test/example_with_symbols.yml
 - test/test_helper.rb