Merge pull request #20 from tmaier/patch-1

Fix .find modifies string which is an issue for frozen strings

lib/language_list.rb

@@ -58,11 +58,15 @@ def self.find_by_iso_639_2t(code)
     end
 
     def self.find_by_name(name)
+      return if name.nil?
+
       LanguageList::BY_NAME[name.downcase]
     end
 
     def self.find(code)
-      code.downcase!
+      return if code.nil?
+
+      code = code.downcase
       find_by_iso_639_1(code) ||
         find_by_iso_639_3(code) ||
         find_by_iso_639_2b(code) ||

test/language_list_test.rb

@@ -25,13 +25,66 @@ def test_find_by_iso_639_1
     assert_equal 'English', english.name
   end
 
+  def test_find_by_iso_639_1_with_nil
+    result = LanguageList::LanguageInfo.find_by_iso_639_1(nil)
+    assert_equal nil, result
+  end
+
+  def test_find_by_iso_639_1_with_empty_string
+    result = LanguageList::LanguageInfo.find_by_iso_639_1('')
+    assert_equal nil, result
+  end
+
+  def test_find_by_iso_639_1_with_frozen_string
+    english = LanguageList::LanguageInfo.find_by_iso_639_1('en'.freeze)
+    assert_equal 'en', english.iso_639_1
+    assert_equal 'eng', english.iso_639_3
+    assert_equal 'English', english.name
+  end
+
   def test_find_by_iso_639_3
     english = LanguageList::LanguageInfo.find_by_iso_639_3('eng')
     assert_equal 'en', english.iso_639_1
     assert_equal 'eng', english.iso_639_3
     assert_equal 'English', english.name
   end
 
+  def test_find_by_iso_639_3_with_nil
+    result = LanguageList::LanguageInfo.find_by_iso_639_3(nil)
+    assert_equal nil, result
+  end
+
+  def test_find_by_iso_639_3_with_empty_string
+    result = LanguageList::LanguageInfo.find_by_iso_639_3('')
+    assert_equal nil, result
+  end
+
+  def test_find_by_iso_639_3_with_frozen_string
+    english = LanguageList::LanguageInfo.find_by_iso_639_3('eng'.freeze)
+    assert_equal 'en', english.iso_639_1
+    assert_equal 'eng', english.iso_639_3
+    assert_equal 'English', english.name
+  end
+
+  def test_find_by_name_with_nil
+    result = LanguageList::LanguageInfo.find_by_name(nil)
+    assert_equal nil, result
+  end
+
+  def test_find_by_name_with_empty_string
+    result = LanguageList::LanguageInfo.find_by_name('')
+    assert_equal nil, result
+  end
+
+  def test_find_by_name_with_frozen_string
+    english = LanguageList::LanguageInfo.find_by_name('English'.freeze)
+    assert_equal 'en', english.iso_639_1
+    assert_equal 'eng', english.iso_639_3
+    assert_equal 'eng', english.iso_639_2b
+    assert_equal 'eng', english.iso_639_2t
+    assert_equal 'English', english.name
+  end
+
   def test_find_by_name
     english = LanguageList::LanguageInfo.find_by_name('English')
     assert_equal 'en', english.iso_639_1
@@ -48,6 +101,23 @@ def test_case_insensitive_find_by_name
     assert_equal 'English', english.name
   end
 
+  def test_find_with_nil
+    result = LanguageList::LanguageInfo.find(nil)
+    assert_equal nil, result
+  end
+
+  def test_find_with_empty_string
+    result = LanguageList::LanguageInfo.find('')
+    assert_equal nil, result
+  end
+
+  def test_find_with_frozen_string
+    english = LanguageList::LanguageInfo.find('EN'.freeze)
+    assert_equal 'en', english.iso_639_1
+    assert_equal 'eng', english.iso_639_3
+    assert_equal 'English', english.name
+  end
+
   def test_find_with_iso_639_1_code
     english = LanguageList::LanguageInfo.find('en')
     assert_equal 'en', english.iso_639_1