From 5c931205022ea099567a97d7281715a209291a05 Mon Sep 17 00:00:00 2001 From: Jeff Beck Date: Mon, 29 Aug 2011 12:20:36 -0500 Subject: [PATCH] Fix for Ruby 1.8.7 Added a test to catch the case better --- lib/linguist/blob_helper.rb | 2 +- test/fixtures/hello-var.gsp | 9 +++++++++ test/test_blob.rb | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/hello-var.gsp diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb index b982c2e1..10600c07 100644 --- a/lib/linguist/blob_helper.rb +++ b/lib/linguist/blob_helper.rb @@ -438,7 +438,7 @@ module Linguist # # Returns a Language. def guess_gsp_language - if lines.grep(/<%|<%@|${|<%| + + + Testing with SiteMesh and ${example} + + + + + diff --git a/test/test_blob.rb b/test/test_blob.rb index 1218eda8..413365c5 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -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("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