From 446f53be705bcec37c8f31ec9ae47bada88b963c Mon Sep 17 00:00:00 2001 From: Tim Clem Date: Wed, 7 Dec 2011 13:57:50 -0800 Subject: [PATCH 1/3] Improve language stats for .net projects This excludes some common js used in many .net project so that they don't show up in language stats. Things exlude now include: - Visual Studio intellisense js files - Microsoft's Ajax and Validation js - Anything in the NuGet packages directory --- lib/linguist/vendor.yml | 11 +++++++++++ test/test_blob.rb | 14 ++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index cd5a551d..ae0abc29 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -73,3 +73,14 @@ # Sparkle - (^|/)Sparkle/ + +## .NET ## + +# Visual Studio IntelliSense +- -vsdoc\.js$ + +# Microsoft Ajax +- (^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$ + +# NuGet +- ^[Pp]ackages/ diff --git a/test/test_blob.rb b/test/test_blob.rb index ac659c79..881872e0 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -241,6 +241,20 @@ class TestBlob < Test::Unit::TestCase # WAF assert blob("waf").vendored? + + # Visual Studio IntelliSense + assert blob("Scripts/jquery-1.7-vsdoc.js").vendored? + + # Microsoft Ajax + assert blob("Scripts/MicrosoftAjax.debug.js").vendored? + assert blob("Scripts/MicrosoftAjax.js").vendored? + assert blob("Scripts/MicrosoftMvcAjax.debug.js").vendored? + assert blob("Scripts/MicrosoftMvcAjax.js").vendored? + assert blob("Scripts/MicrosoftMvcValidation.debug.js").vendored? + assert blob("Scripts/MicrosoftMvcValidation.js").vendored? + + # NuGet Packages + assert blob("packages/Modernizr.2.0.6/Content/Scripts/modernizr-2.0.6-development-only.js").vendored? end def test_indexable From 1acfe23347c22846a13e0fa14a440b17f8edbd54 Mon Sep 17 00:00:00 2001 From: Tim Clem Date: Wed, 7 Dec 2011 14:08:59 -0800 Subject: [PATCH 2/3] Add jQuery validation plugin to the exclusions --- lib/linguist/vendor.yml | 3 +++ test/test_blob.rb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index ae0abc29..ca424f9f 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -79,6 +79,9 @@ # Visual Studio IntelliSense - -vsdoc\.js$ +# jQuery validation plugin (MS bundles this with asp.net mvc) +- (^|/)jquery([^.]*)\.validate(\.min)?\.js$ + # Microsoft Ajax - (^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$ diff --git a/test/test_blob.rb b/test/test_blob.rb index 881872e0..92b6e967 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -253,6 +253,10 @@ class TestBlob < Test::Unit::TestCase assert blob("Scripts/MicrosoftMvcValidation.debug.js").vendored? assert blob("Scripts/MicrosoftMvcValidation.js").vendored? + + # jQuery validation plugin (MS bundles this with asp.net mvc) + assert blob("Scripts/jquery.validate.js").vendored? + # NuGet Packages assert blob("packages/Modernizr.2.0.6/Content/Scripts/modernizr-2.0.6-development-only.js").vendored? end From 08620f4293475fd0bc136461913670216eec1439 Mon Sep 17 00:00:00 2001 From: Tim Clem Date: Wed, 7 Dec 2011 14:13:26 -0800 Subject: [PATCH 3/3] Get rid of the extra whitespace --- test/test_blob.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_blob.rb b/test/test_blob.rb index 92b6e967..0ec0d743 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -253,7 +253,6 @@ class TestBlob < Test::Unit::TestCase assert blob("Scripts/MicrosoftMvcValidation.debug.js").vendored? assert blob("Scripts/MicrosoftMvcValidation.js").vendored? - # jQuery validation plugin (MS bundles this with asp.net mvc) assert blob("Scripts/jquery.validate.js").vendored?