Fix for Ruby 1.8.7

Added a test to catch the case better
This commit is contained in:
Jeff Beck
2011-08-29 12:20:36 -05:00
parent 3dd06de711
commit 5c93120502
3 changed files with 11 additions and 2 deletions

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>

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