Merge pull request #583 from Shopify/pm/yaml-load-dedup-and-symbolize…

…-keys Symbolize keys and freeze values when loading from YAML
ruby-i18n · Jan 26, 2022 · b48b0bc · b48b0bc
2 parents b1de892 + 0fda789
commit b48b0bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/i18n/backend/base.rb b/lib/i18n/backend/base.rb
@@ -240,7 +240,7 @@ def load_rb(filename)
         def load_yml(filename)
           begin
             if YAML.respond_to?(:unsafe_load_file) # Psych 4.0 way
-              [YAML.unsafe_load_file(filename), false]
+              [YAML.unsafe_load_file(filename, symbolize_names: true, freeze: true), true]
             else
               [YAML.load_file(filename), false]
             end

diff --git a/test/backend/simple_test.rb b/test/backend/simple_test.rb
@@ -92,7 +92,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)
+    if ::YAML.respond_to?(:unsafe_load_file)
+      assert_equal({ :en => { :foo => { :bar => 'baz' } } }, data)
+      assert_predicate data.dig(:en, :foo, :bar), :frozen?
+    else
+      assert_equal({ 'en' => { 'foo' => { 'bar' => 'baz' } } }, data)
+    end
   end
 
   test "simple load_json: loads data from a JSON file" do