Adding support to detect the difference between a Grails gsp and a Go…

…su gsp.
github-linguist · Aug 29, 2011 · 3dd06de · josh · Aug 29, 2011 · 3dd06de
1 parent 5b9b461
commit 3dd06de
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 0 deletions.
diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
@@ -432,6 +432,19 @@ def guess_r_language
         Language['R']
       end
     end
+
+
+    # Internal: Guess language of .gsp files.
+    # 
+    # Returns a Language.
+    def guess_gsp_language
+    	    if lines.grep(/<%|<%@|${|<%|<g:|<meta name="layout"|<r:/).any?
+    	Language['Groovy Server Pages']
+      else
+        Language['Gosu']
+      end
+    end
+
 
     # Internal: Guess language from the first line.
     #

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
@@ -379,6 +379,16 @@ Groovy:
   - .gradle
   - .groovy
 
+Groovy Server Pages:
+  group: Groovy
+  lexer: Java Server Page
+  overrides:
+  - .gsp  
+  aliases:
+  - gsp
+  extensions:
+  - .gsp
+
 HTML:
   type: markup
   primary_extension: .html

diff --git a/test/fixtures/bar.gsp b/test/fixtures/bar.gsp
@@ -0,0 +1,10 @@
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Testing with SiteMesh and Resources</title>
+    <meta name="layout" content="blankMain"/>
+    <r:require module="style"/>
+</head>
+<body>
+</body>
+</html>
diff --git a/test/fixtures/hello-pagedirective.gsp b/test/fixtures/hello-pagedirective.gsp
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+
+<html>
+  <head>
+    <title>Using page directive tag</title>
+  </head>
+  <body>
+        <div class="center">
+            <a href="#" alt="Download" id="downloadButton">Download</a>
+        </div>
+        <div class="center">
+            <a href="#" alt="Print" id="printButton">Print</a>
+        </div>
+  </body>
+</html>
+
diff --git a/test/fixtures/hello-resources.gsp b/test/fixtures/hello-resources.gsp
@@ -0,0 +1,9 @@
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Testing with Resources</title>
+    <r:require module="style"/>
+</head>
+<body>
+</body>
+</html>
diff --git a/test/test_blob.rb b/test/test_blob.rb
@@ -332,6 +332,12 @@ def test_language
     assert_equal Language['Gosu'], blob("hello.gsp").language
     assert_equal Language['Gosu'], blob("Hello.gst").language
     assert_equal Language['Gosu'], blob("hello.vark").language
+
+    #Groovy Server Pages 
+    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
+
   end
 
   def test_lexer