aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-07-23 13:15:27 -0500
committerJoshua Peek <josh@joshpeek.com>2012-07-23 13:15:27 -0500
commit80e8ee7ce6b5c221feecbf490f83fadd0d7626ba (patch)
tree178c175c83d716c0efaee5a99099b3ef55bdeabd /lib
parent0c9a947f399702f05f3ddc20142b34be4053f2b8 (diff)
Rename Sample -> Samples
Diffstat (limited to 'lib')
-rw-r--r--lib/linguist/blob_helper.rb4
-rw-r--r--lib/linguist/language.rb6
-rw-r--r--lib/linguist/samples.rb (renamed from lib/linguist/sample.rb)2
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
index b932612..39d62c0 100644
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -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
diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index 88ccb9f..4317936 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -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|
diff --git a/lib/linguist/sample.rb b/lib/linguist/samples.rb
index 4c3f5e9..f85f9ae 100644
--- a/lib/linguist/sample.rb
+++ b/lib/linguist/samples.rb
@@ -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__)