From 5232a45d1ff5f2811cf2f55f067987856d78fdbd Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 11 Oct 2013 21:21:43 -0400 Subject: [PATCH] Recognize jQuery >= 1.10.0 jQuery recently passed 1.10, but the vendor regexp assumed each component of the version number would be only one digit. Allow multiple digits for the minor and micro versions. --- 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 8967c266..d7695643 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -37,7 +37,7 @@ # jQuery - (^|/)jquery([^.]*)(\.min)?\.js$ -- (^|/)jquery\-\d\.\d(\.\d)?(\.min)?\.js$ +- (^|/)jquery\-\d\.\d+(\.\d+)?(\.min)?\.js$ # jQuery UI - (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?(\.min)?\.(js|css)$ diff --git a/test/test_blob.rb b/test/test_blob.rb index 3dd90a99..325ab125 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -236,6 +236,8 @@ class TestBlob < Test::Unit::TestCase 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? + assert blob("public/javascripts/jquery-1.10.1.js").vendored? + assert blob("public/javascripts/jquery-1.10.1.min.js").vendored? assert !blob("public/javascripts/jquery.github.menu.js").vendored? # jQuery UI