KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67 from beckje01/master

Browse Source 
GSP Guess fix for Ruby 1.8.7
This commit is contained in:
Joshua Peek
2011-08-29 10:23:39 -07:00
parent 007cd533aa 5c93120502
commit 7670ed654c
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/linguist/blob_helper.rb
View File

@@ -438,7 +438,7 @@ module Linguist
# #
# Returns a Language. # Returns a Language.
def guess_gsp_language def guess_gsp_language
if lines.grep(/<%|<%@|${|<%|<g:|<meta name="layout"|<r:/).any? if lines.grep(/<%|<%@|\${|<%|<g:|<meta name="layout"|<r:/).any?
Language['Groovy Server Pages'] Language['Groovy Server Pages']
else else
Language['Gosu'] Language['Gosu']

9
test/fixtures/hello-var.gsp vendored Normal file
View File

@@ -0,0 +1,9 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Testing with SiteMesh and ${example}</title>
</head>
<body>
</body>
</html>

2
test/test_blob.rb
View File

@@ -337,7 +337,7 @@ class TestBlob < Test::Unit::TestCase
assert_equal Language['Groovy Server Pages'], blob("bar.gsp").language assert_equal Language['Groovy Server Pages'], blob("bar.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-resources.gsp").language assert_equal Language['Groovy Server Pages'], blob("hello-resources.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-pagedirective.gsp").language assert_equal Language['Groovy Server Pages'], blob("hello-pagedirective.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-var.gsp").language
end end
def test_lexer def test_lexer