From 62894ad13cb19532d1a27687213c192fe752f423 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 11 May 2011 14:35:08 -0500 Subject: [PATCH] Return 'text' for missing lexer --- lib/linguist/language.rb | 2 +- test/test_language.rb | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb index 70881421..f6800315 100644 --- a/lib/linguist/language.rb +++ b/lib/linguist/language.rb @@ -36,7 +36,7 @@ module Linguist end def self.find_by_lexer(lexer) - @lexer_index[lexer] + @lexer_index[lexer] || self['Text'] end def self.popular diff --git a/test/test_language.rb b/test/test_language.rb index 3dc8a32c..566c1082 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -13,10 +13,9 @@ class TestLanguage < Test::Unit::TestCase end def test_find_by_extension - ruby = Language['Ruby'] - assert_equal ruby, Language.find_by_extension('.rb') - assert_equal ruby, Language.find_by_extension('rb') - assert_nil Language.find_by_extension('foo.rb') + assert_equal Language['Ruby'], Language.find_by_extension('.rb') + assert_equal Language['Ruby'], Language.find_by_extension('rb') + assert_nil Language.find_by_extension('.kt') end def test_find_by_lexer @@ -26,7 +25,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['C++'], Language.find_by_lexer('cpp') assert_equal Language['JavaScript'], Language.find_by_lexer('javascript') assert_equal Language['Scheme'], Language.find_by_lexer('scheme') - assert_nil Language.find_by_lexer('kt') + assert_equal Language['Text'], Language.find_by_lexer('kt') end def test_name