From 850ab6dedb28b8e23e6585eee1d63faf4a833dbb Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Tue, 18 Nov 2014 15:10:07 -0500 Subject: [PATCH] #all_extensions already includes primary extension --- lib/linguist/language.rb | 8 +++----- test/test_samples.rb | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb index 438e1a0e..1ee2d7aa 100644 --- a/lib/linguist/language.rb +++ b/lib/linguist/language.rb @@ -413,6 +413,9 @@ module Linguist # Returns the extensions Array attr_reader :extensions + # DEPRECATED: Will be removed in 5.x + alias_method :all_extensions, :extensions + # Public: Get interpreters # # Examples @@ -431,11 +434,6 @@ module Linguist # Returns the extensions Array attr_reader :filenames - # Public: Return all possible extensions for language - def all_extensions - (extensions + [primary_extension]).uniq - end - # Deprecated: Get primary extension # # Defaults to the first extension but can be overridden diff --git a/test/test_samples.rb b/test/test_samples.rb index 6371d007..929a7a00 100644 --- a/test/test_samples.rb +++ b/test/test_samples.rb @@ -57,8 +57,8 @@ class TestSamples < Test::Unit::TestCase # If a language extension isn't globally unique then make sure there are samples Linguist::Language.all.each do |language| define_method "test_#{language.name}_has_samples" do - language.all_extensions.each do |extension| - language_matches = Language.find_by_filename("foo#{extension}") + language.extensions.each do |extension| + language_matches = Language.find_by_extension(extension) # Check for samples if more than one language matches the given extension. if language_matches.length > 1