From 7c2a8874a3765e744ed38950dca0df7672aa5907 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 18 Jun 2011 20:45:49 -0500 Subject: [PATCH] Return nil if no Language is found --- lib/linguist/language.rb | 6 ++---- test/test_language.rb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb index ecce8066..cfeb13d1 100644 --- a/lib/linguist/language.rb +++ b/lib/linguist/language.rb @@ -135,8 +135,6 @@ module Linguist # # name - The String name of the Language # - # TODO: Consider returning nil instead of Text - # # Examples # # Language['Ruby'] @@ -145,9 +143,9 @@ module Linguist # Language['ruby'] # # => # # - # Returns the Language or Text if none was found. + # Returns the Language or nil if none was found. def self.[](name) - @index[name] || self['Text'] + @index[name] end # Public: A List of popular languages diff --git a/test/test_language.rb b/test/test_language.rb index cd016ef2..a64f8b30 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -320,7 +320,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal 'C#', Language['C#'].name assert_equal 'C#', Language['c#'].name assert_equal 'C#', Language['csharp'].name - assert_equal 'Text', Language['defunkt'].name + assert_nil Language['defunkt'] end def test_name