Merge pull request ruby-i18n#295 from davidcornu/nil-dup

Don't try to duplicate nil options
tenderlove · Jan 10, 2015 · f2c9c66 · f2c9c66
2 parents ee7fef8 + 886de11
commit f2c9c66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/i18n/exceptions.rb b/lib/i18n/exceptions.rb
@@ -43,7 +43,8 @@ module Base
       attr_reader :locale, :key, :options
 
       def initialize(locale, key, options = nil)
-        @key, @locale, @options = key, locale, options.dup || {}
+        options = options && options.dup || {}
+        @key, @locale, @options = key, locale, options
         options.each { |k, v| self.options[k] = v.inspect if v.is_a?(Proc) }
       end
 

diff --git a/test/i18n/exceptions_test.rb b/test/i18n/exceptions_test.rb
@@ -13,6 +13,11 @@ def test_invalid_locale_stores_locale
     end
   end
 
+  test "MissingTranslation::Base#initialize can be called without options" do
+    exception = I18n::MissingTranslation.new(:en, 'foo')
+    assert_equal({}, exception.options)
+  end
+
   test "MissingTranslationData exception stores locale, key and options" do
     force_missing_translation_data do |exception|
       assert_equal 'de', exception.locale