From 2a15f69812198a430cd64045fa27b930718a7fa2 Mon Sep 17 00:00:00 2001 From: Paarth Madan Date: Wed, 3 Nov 2021 12:33:12 -0400 Subject: [PATCH] Symbolize and freeze keys when loading from YAML --- lib/i18n/backend/base.rb | 13 +++++++++++-- test/backend/simple_test.rb | 7 ++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/i18n/backend/base.rb b/lib/i18n/backend/base.rb index e7b95272..99da3763 100644 --- a/lib/i18n/backend/base.rb +++ b/lib/i18n/backend/base.rb @@ -236,14 +236,23 @@ def load_rb(filename) eval(IO.read(filename), binding, filename) end + # Feature tests YAML load options and only selects those that + # are supported in the current version of Psych. + YAML_LOAD_OPTIONS = { symbolize_names: true, freeze: true }.select do |k, v| + YAML.load_file('test/test_data/locales/en.yml', **{ k => v }) + true + rescue ::ArgumentError + false + end + # Loads a YAML translations file. The data must have locales as # toplevel keys. def load_yml(filename) begin if YAML.respond_to?(:unsafe_load_file) # Psych 4.0 way - YAML.unsafe_load_file(filename) + YAML.unsafe_load_file(filename, **YAML_LOAD_OPTIONS) else - YAML.load_file(filename) + YAML.load_file(filename, **YAML_LOAD_OPTIONS) end rescue TypeError, ScriptError, StandardError => e raise InvalidLocaleData.new(filename, e.inspect) diff --git a/test/backend/simple_test.rb b/test/backend/simple_test.rb index 960e8cc9..5f793daf 100644 --- a/test/backend/simple_test.rb +++ b/test/backend/simple_test.rb @@ -72,7 +72,12 @@ def setup test "simple load_yml: loads data from a YAML file" do data = I18n.backend.send(:load_yml, "#{locales_dir}/en.yml") - assert_equal({ 'en' => { 'foo' => { 'bar' => 'baz' } } }, data) + opts = I18n.backend.class::YAML_LOAD_OPTIONS + if opts[:symbolize_names] + assert_equal({ :en => { :foo => { :bar => 'baz' } } }, data) + else + assert_equal({ 'en' => { 'foo' => { 'bar' => 'baz' } } }, data) + end end test "simple load_json: loads data from a JSON file" do