ravioli 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db780ea4e1fbb555cd42fd3c40f9102a18459a35d917cc214c998372b9599425
-  data.tar.gz: f4f7aa3bcd938fc48127be91f686263019e64728530e0591f687f465f2c63384
+  metadata.gz: 18e8f375f4680381f076c2cf30da628ad3eff949809c91bb5bdd8cbd497c5360
+  data.tar.gz: 7efd3e86edff327df47caad0be5e107ea0d9bdf1a79ff61ff55e5868389286c5
 SHA512:
-  metadata.gz: 2f6ddf167319edf2337b0f52d4bcf3211c7aaa5062404b834245ac31b0e1e1311ef45a992149b77c04050d6c4d94152d4556cab2f708f4f3706044725a4c2b0d
-  data.tar.gz: d9a6c2ea272073e80182318d8c112ea1a57f44ad85e352e560495c6a216a0f515bdc675c6f0e3a2f54a3a482177316b434989bfa3b191d4e7746186244eb4e67
+  metadata.gz: 10c5a53c1b2cb4bf44f5d0a633f2baab987a63d03154b3e154366652fd633575686c652e4b07fc82fa46dbc8e636a917a34f2e0f6717e669b922885ff11d07ea
+  data.tar.gz: bccc5db611656b946d46fd42439b360b2a4ddb1f6b3eef710c08ebf9689d7474bd62d4725bf40ddc5ae175c776160557ae4170e9fac0be69c5ffc14506b3c241

data/lib/ravioli/builder.rb

@@ -140,8 +140,8 @@ module Ravioli
     end
 
     # Load a file either with a given path or by name (e.g. `config/whatever.yml` or `:whatever`)
-    def load_file(path, options = {})
-      config = parse_config_file(path, options)
+    def load_file(path, **options)
+      config = parse_config_file(path, **options)
       configuration.append(config) if config.present?
     rescue => error
       warn "Could not load config file #{path}", error
@@ -221,10 +221,9 @@ module Ravioli
     # rubocop:enable Style/MissingRespondToMissing
     # rubocop:enable Style/MethodMissingSuper
 
-    def parse_config_file(path, options = {})
+    def parse_config_file(path, **options)
       # Stash a reference to the file we're parsing, so we can reload it later if it tries to use
       # the configuration object
-      @current_path = path
       path = path_to_config_file_path(path)
 
       config = case path.extname.downcase
@@ -286,7 +285,7 @@ module Ravioli
     def parse_yaml_config_file(path)
       contents = File.read(path)
       erb = ERB.new(contents).tap { |renderer| renderer.filename = path.to_s }
-      YAML.safe_load(erb.result, [Symbol], aliases: true)
+      YAML.safe_load(erb.result, permitted_classes: [Symbol], aliases: true)
     end
 
     def path_to_config_file_path(path, extnames: EXTNAMES, quiet: false)

data/lib/ravioli/configuration.rb

@@ -67,7 +67,9 @@ module Ravioli
     def cast(key, value)
       if value.is_a?(Hash)
         original_value = dig(*Array(key))
-        value = original_value.table.deep_merge(value.deep_symbolize_keys) if original_value.is_a?(self.class)
+        transform = ->(value) { value.is_a?(self.class) ? value.table.deep_transform_values(&transform) : value }
+        original_value = original_value.table.deep_transform_values(&transform) if original_value.is_a?(self.class)
+        value = original_value.deep_merge(value.deep_symbolize_keys) if original_value.is_a?(Hash)
         build(key, value)
       else
         fetch_env_key_for(key) {
@@ -89,7 +91,6 @@ module Ravioli
       Array(key_path) + Array(keys)
     end
 
-    # rubocop:disable Style/MethodMissingSuper
     # rubocop:disable Style/MissingRespondToMissing
     def method_missing(method, *args, &block)
       return super unless args.empty?

data/lib/ravioli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ravioli
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravioli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Flip Sasser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport