aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMislav Marohnić <mislav.marohnic@gmail.com>2012-12-06 23:19:02 +0100
committerMislav Marohnić <mislav.marohnic@gmail.com>2012-12-06 23:25:29 +0100
commit04a2845e91e407f2846269aba19d40cf41fe1574 (patch)
tree67292a39c7891c0fe912265a533408770bd0d870
parentacb20d95cab43f8350a97812ba0e5ea62c0a525c (diff)
add ApacheConf language
Recognizes httpd/apache2.conf and .htaccess files
-rw-r--r--lib/linguist/languages.yml10
-rw-r--r--test/test_language.rb3
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 13e37fc..c639d4d 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -63,6 +63,16 @@ Ada:
- .adb
- .ads
+ApacheConf:
+ type: markup
+ aliases:
+ - apache
+ primary_extension: .conf
+ filenames:
+ - .htaccess
+ - httpd.conf
+ - apache2.conf
+
Apex:
type: programming
lexer: Text only
diff --git a/test/test_language.rb b/test/test_language.rb
index 8ed8261..14b39f7 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -61,6 +61,7 @@ class TestLanguage < Test::Unit::TestCase
assert_equal Language['ASP'], Language.find_by_alias('aspx')
assert_equal Language['ASP'], Language.find_by_alias('aspx-vb')
assert_equal Language['ActionScript'], Language.find_by_alias('as3')
+ assert_equal Language['ApacheConf'], Language.find_by_alias('apache')
assert_equal Language['Assembly'], Language.find_by_alias('nasm')
assert_equal Language['Batchfile'], Language.find_by_alias('bat')
assert_equal Language['C#'], Language.find_by_alias('c#')
@@ -230,6 +231,8 @@ class TestLanguage < Test::Unit::TestCase
assert_equal [Language['Ruby']], Language.find_by_filename('foo/bar.rb')
assert_equal [Language['Ruby']], Language.find_by_filename('Rakefile')
assert_equal [Language['Ruby']], Language.find_by_filename('PKGBUILD.rb')
+ assert_equal Language['ApacheConf'], Language.find_by_filename('httpd.conf').first
+ assert_equal [Language['ApacheConf']], Language.find_by_filename('.htaccess')
assert_equal ['C', 'C++', 'Objective-C'], Language.find_by_filename('foo.h').map(&:name).sort
assert_equal [], Language.find_by_filename('rb')
assert_equal [], Language.find_by_filename('.rb')