Merge pull request #67 from beckje01/master

GSP Guess fix for Ruby 1.8.7
github-linguist · Aug 29, 2011 · 7670ed6 · 7670ed6
2 parents 007cd53 + 5c93120
commit 7670ed6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
@@ -438,7 +438,7 @@ def guess_r_language
     # 
     # Returns a 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']
       else
         Language['Gosu']

diff --git a/test/fixtures/hello-var.gsp b/test/fixtures/hello-var.gsp
@@ -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>
diff --git a/test/test_blob.rb b/test/test_blob.rb
@@ -337,7 +337,7 @@ def test_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-pagedirective.gsp").language
-
+    assert_equal Language['Groovy Server Pages'], blob("hello-var.gsp").language 
   end
 
   def test_lexer