Compare commits

..

5 Commits

Author SHA1 Message Date
Joshua Peek
ade20e4b46 Linguist 2.1.2 2012-07-23 17:20:36 -05:00
Joshua Peek
aedbe1d5b7 Rebuild samples db 2012-07-23 17:20:05 -05:00
Joshua Peek
65d05e02c9 name can be nil 2012-07-23 17:19:11 -05:00
Joshua Peek
b4378ca89f Linguist 2.1.1 2012-07-23 16:59:19 -05:00
Joshua Peek
12b27deb78 Allow for newer version of pygments.rb 2012-07-23 16:58:57 -05:00
3 changed files with 1938 additions and 1938 deletions

View File

@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'github-linguist'
s.version = '2.1.0'
s.version = '2.1.2'
s.summary = "GitHub Language detection"
s.authors = "GitHub"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.add_dependency 'charlock_holmes', '~> 0.6.6'
s.add_dependency 'escape_utils', '~> 0.2.3'
s.add_dependency 'mime-types', '~> 1.18'
s.add_dependency 'pygments.rb', '~> 0.2.13'
s.add_dependency 'pygments.rb', '>= 0.2.13'
s.add_development_dependency 'json'
s.add_development_dependency 'rake'
s.add_development_dependency 'yajl-ruby'

View File

@@ -21,7 +21,7 @@ module Linguist
#
# Returns a String
def extname
File.extname(name)
File.extname(name.to_s)
end
# Public: Get the actual blob mime type
@@ -33,7 +33,7 @@ module Linguist
#
# Returns a mime type String.
def mime_type
@mime_type ||= Mime.mime_for(extname)
@mime_type ||= Mime.mime_for(extname.to_s)
end
# Public: Get the Content-Type header value
@@ -414,7 +414,7 @@ module Linguist
disambiguate_extension_language ||
# See if there is a Language for the extension
Language.find_by_filename(name) ||
Language.find_by_filename(name.to_s) ||
# Try to detect Language from shebang line
shebang_language

File diff suppressed because it is too large Load Diff