diff options
author | Johan Sørensen <johan@johansorensen.com> | 2009-08-24 10:52:21 +0200 |
---|---|---|
committer | Johan Sørensen <johan@johansorensen.com> | 2009-08-24 10:52:21 +0200 |
commit | 1c10c66802f46f3967847da66aa7c51280afcb5e (patch) | |
tree | cee2d3a36381a13d39604ad94d613dc60a49dc1b | |
parent | f136dab63dc103da9a12f2fa506724487cedf78a (diff) | |
download | gitorious-mainline-outdated-1c10c66802f46f3967847da66aa7c51280afcb5e.zip gitorious-mainline-outdated-1c10c66802f46f3967847da66aa7c51280afcb5e.tar.gz gitorious-mainline-outdated-1c10c66802f46f3967847da66aa7c51280afcb5e.tar.bz2 |
Make sure the special filetypes for the prettify.js is detected
properly
-rw-r--r-- | app/helpers/blobs_helper.rb | 4 | ||||
-rw-r--r-- | test/unit/helpers/blobs_helper_test.rb | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/app/helpers/blobs_helper.rb b/app/helpers/blobs_helper.rb index 5c07466..84e5b37 100644 --- a/app/helpers/blobs_helper.rb +++ b/app/helpers/blobs_helper.rb @@ -59,7 +59,9 @@ module BlobsHelper end def language_of_file(filename) - HIGHLIGHTER_TO_EXT.find{|lang, matcher| filename =~ matcher } + if lang_tuple = HIGHLIGHTER_TO_EXT.find{|lang, matcher| filename =~ matcher } + return lang_tuple.first + end end def render_highlighted(text, filename, code_theme_class = nil) diff --git a/test/unit/helpers/blobs_helper_test.rb b/test/unit/helpers/blobs_helper_test.rb index 310a9fd..57e9f85 100644 --- a/test/unit/helpers/blobs_helper_test.rb +++ b/test/unit/helpers/blobs_helper_test.rb @@ -101,5 +101,17 @@ class BlobsHelperTest < ActionView::TestCase repo = mock("grit repo") Grit::Blob.create(repo, {:name => name, :data => data}) end + + context "language highlightinh of a given filename" do + should "return the name of a known file type" do + assert_equal "list", language_of_file("foo.lisp") + assert_equal "css", language_of_file("foo.css") + assert_equal "lua", language_of_file("foo.lua") + end + + should "return nil if the filename can't be highlighted" do + assert_nil language_of_file("foo.bar") + end + end end |