confg 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a22c813a8d81e3381f37ac6a2e98863c363091fc2cca5e35d8d4b81dae51d9d7
-  data.tar.gz: 03b2fb1a7415571f1062c0a493fa4b1bd1fa130692ee59b0e926dab1641adf4f
+  metadata.gz: 2ffa65a341a5ea7d93390edf845981fd50c0df586c6e28b7c8487b035706092a
+  data.tar.gz: c5bba8919704165a458b2509a75f83ef10b1c5eb9056a39aa53368e7f6a19a2a
 SHA512:
-  metadata.gz: 3da4ee7440ff963e2d760e7eb342f83bef36acab2bfd286a43b4e2645afb0947f19e34c2f0b0e7d6ab6013711c00cecc99132b29468e2bfeca7b93c5ad261c7d
-  data.tar.gz: 9b5962463d289b4872911e3c7cbad774f0d127613bc06780b6fb3102c2751f89c3bf418bb8bfeab2e9add483c8edd25c27006300361d51c5e12cd73bda18fbb5
+  metadata.gz: f15b35166baaaf7270a755a6770839c774cb581052004aac9b4f85a1d0e333a52eec9c0a8ea0d577d96bf8028f1c1a63106c0a7cf21eb47016787d5b7d64f53c
+  data.tar.gz: 9b28f027b6aab53c8ff152faafc932ad01767fe64f5de95ec84839956d54e393cf743b92171a0120f36d36f01611b2dc0dc4cb7cd3def5fb68414687d3bfcff2

data/.ruby-version

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

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 :safe_load, erb_content, aliases: true # due to shared sections
+      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)

data/lib/confg/version.rb

@@ -2,6 +2,6 @@
 
 module Confg
 
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: confg
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Mike Nelson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -84,6 +85,7 @@ files:
 - lib/confg/version.rb
 - test/confg_test.rb
 - test/example.yml
+- test/example_with_symbols.yml
 - test/test_helper.rb
 homepage: ''
 licenses: []
@@ -110,4 +112,5 @@ summary: Sets shared variables for applications
 test_files:
 - test/confg_test.rb
 - test/example.yml
+- test/example_with_symbols.yml
 - test/test_helper.rb