From 70bc20ce120fa09b5c7d017908d6f9b998b0c8ea Mon Sep 17 00:00:00 2001 From: Tim Clem Date: Fri, 9 Dec 2011 11:30:29 -0800 Subject: [PATCH] Detect jquery-x.x for exclusion --- lib/linguist/vendor.yml | 2 +- test/test_blob.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index ca424f9f..68599371 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -28,7 +28,7 @@ # jQuery - (^|/)jquery([^.]*)(\.min)?\.js$ -- (^|/)jquery\-\d\.\d\.\d(\.min)?\.js$ +- (^|/)jquery\-\d\.\d(\.\d)?(\.min)?\.js$ # Prototype - (^|/)prototype(.*)\.js$ diff --git a/test/test_blob.rb b/test/test_blob.rb index 0ec0d743..a0db6703 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -206,6 +206,8 @@ class TestBlob < Test::Unit::TestCase assert blob("jquery.js").vendored? assert blob("public/javascripts/jquery.js").vendored? assert blob("public/javascripts/jquery.min.js").vendored? + assert blob("public/javascripts/jquery-1.7.js").vendored? + assert blob("public/javascripts/jquery-1.7.min.js").vendored? assert blob("public/javascripts/jquery-1.5.2.js").vendored? assert blob("public/javascripts/jquery-1.6.1.js").vendored? assert blob("public/javascripts/jquery-1.6.1.min.js").vendored?