Rename Sample -> Samples

This commit is contained in:
Joshua Peek
2012-07-23 13:15:27 -05:00
parent 0c9a947f39
commit 80e8ee7ce6
6 changed files with 19 additions and 19 deletions

View File

@@ -2,7 +2,7 @@ require 'linguist/classifier'
require 'linguist/language'
require 'linguist/mime'
require 'linguist/pathname'
require 'linguist/sample'
require 'linguist/samples'
require 'charlock_holmes'
require 'escape_utils'
@@ -442,7 +442,7 @@ module Linguist
if Language.ambiguous?(extname)
possible_languages = Language.all.select { |l| l.extensions.include?(extname) }.map(&:name)
if possible_languages.any?
if result = Classifier.new(Sample::DATA).classify(data, possible_languages).first
if result = Classifier.new(Samples::DATA).classify(data, possible_languages).first
Language[result[0]]
end
end

View File

@@ -2,7 +2,7 @@ require 'escape_utils'
require 'pygments'
require 'yaml'
require 'linguist/sample'
require 'linguist/samples'
module Linguist
# Language names that are recognizable by GitHub. Defined languages
@@ -441,8 +441,8 @@ module Linguist
end
end
extensions = Sample.extensions
filenames = Sample.filenames
extensions = Samples.extensions
filenames = Samples.filenames
popular = YAML.load_file(File.expand_path("../popular.yml", __FILE__))
YAML.load_file(File.expand_path("../languages.yml", __FILE__)).each do |name, options|

View File

@@ -3,7 +3,7 @@ require 'yaml'
module Linguist
# Model for accessing classifier training data.
module Sample
module Samples
# Samples live in test/ for now, we'll eventually move them out
PATH = File.expand_path("../../../samples", __FILE__)