From b5ef077778190825216b71b221a06620f0b1f36c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 23 May 2011 10:14:51 -0500 Subject: [PATCH] Remove lexer_name helpers --- lib/linguist/blob_helper.rb | 4 ---- lib/linguist/pathname.rb | 4 ---- test/test_blob.rb | 12 ------------ test/test_language.rb | 10 ---------- test/test_pathname.rb | 9 --------- 5 files changed, 39 deletions(-) diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb index 00c3e3a1..2310127e 100644 --- a/lib/linguist/blob_helper.rb +++ b/lib/linguist/blob_helper.rb @@ -98,10 +98,6 @@ module Linguist end end - def lexer_name - language.lexer_name - end - def lexer language.lexer end diff --git a/lib/linguist/pathname.rb b/lib/linguist/pathname.rb index 32398ee6..44dadd2c 100644 --- a/lib/linguist/pathname.rb +++ b/lib/linguist/pathname.rb @@ -25,10 +25,6 @@ module Linguist Language.find_by_extension(extname) || Language['Text'] end - def lexer_name - language.lexer_name - end - def lexer language.lexer end diff --git a/test/test_blob.rb b/test/test_blob.rb index d8f7cc5a..12eb47f2 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -134,18 +134,6 @@ class TestBlob < Test::Unit::TestCase assert_equal Language['Ruby'], blob("wrong_shebang.rb").language end - def test_lexer_name - assert_equal 'ruby', blob("grit.rb").lexer_name - assert_equal 'text', blob("README").lexer_name - assert_equal 'diff', blob("dude-thing-okay--001.patch").lexer_name - assert_equal 'scheme', blob("dude.el").lexer_name - assert_equal 'javascript', blob("dude.js").lexer_name - assert_equal 'ruby', blob("Capfile").lexer_name - - assert_equal 'ruby', blob("Rakefile").lexer_name - assert_equal 'ruby', blob("subdir/Rakefile").lexer_name - end - def test_lexer assert_equal Lexer['Ruby'], blob("grit.rb").lexer assert_equal Lexer['Text only'], blob("README").lexer diff --git a/test/test_language.rb b/test/test_language.rb index 710fdbb9..dff035b6 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -68,16 +68,6 @@ class TestLanguage < Test::Unit::TestCase assert_equal nil, Language['Text'].search_term end - def test_lexer_name - assert_equal 'perl', Language['Perl'].lexer_name - assert_equal 'python', Language['Python'].lexer_name - assert_equal 'ruby', Language['Ruby'].lexer_name - assert_equal 'cpp', Language['C++'].lexer_name - assert_equal 'bash', Language['Gentoo Ebuild'].lexer_name - assert_equal 'scheme', Language['Nu'].lexer_name - assert_equal 'text', Language['Text'].lexer_name - end - def test_lexer assert_equal Lexer['Perl'], Language['Perl'].lexer assert_equal Lexer['Python'], Language['Python'].lexer diff --git a/test/test_pathname.rb b/test/test_pathname.rb index ae1281f6..9486e164 100644 --- a/test/test_pathname.rb +++ b/test/test_pathname.rb @@ -42,15 +42,6 @@ class TestPathname < Test::Unit::TestCase assert_equal Language['Text'], Pathname.new("defun.kt").language end - def test_lexer_name - assert_equal 'ruby', Pathname.new("file.rb").lexer_name - assert_equal 'ruby', Pathname.new("Rakefile").lexer_name - assert_equal 'bash', Pathname.new("file.ebuild").lexer_name - assert_equal 'python', Pathname.new("itty.py").lexer_name - assert_equal 'scheme', Pathname.new("itty.nu").lexer_name - assert_equal 'text', Pathname.new("defun.kt").lexer_name - end - def test_lexer assert_equal Lexer['Ruby'], Pathname.new("file.rb").lexer assert_equal Lexer['Ruby'], Pathname.new("Rakefile").lexer