KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the :ruby_encoding value from charlock 0.7.2

Browse Source
This commit is contained in:
Brian Lopez
2014-06-04 15:51:33 -05:00
parent 09c234ec26
commit 7e8be1293e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
github-linguist.gemspec
View File

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.files = Dir['lib/**/*'] s.files = Dir['lib/**/*']
s.executables << 'linguist' s.executables << 'linguist'
s.add_dependency 'charlock_holmes', '~> 0.7.1' s.add_dependency 'charlock_holmes', '~> 0.7.2'
s.add_dependency 'escape_utils', '~> 1.0.1' s.add_dependency 'escape_utils', '~> 1.0.1'
s.add_dependency 'mime-types', '~> 1.19' s.add_dependency 'mime-types', '~> 1.19'
s.add_dependency 'pygments.rb', '~> 0.5.4' s.add_dependency 'pygments.rb', '~> 0.5.4'

8
lib/linguist/blob_helper.rb
View File

@@ -112,6 +112,12 @@ module Linguist
end end
end end
def ruby_encoding
if hash = detect_encoding
hash[:ruby_encoding]
end
end
# Try to guess the encoding # Try to guess the encoding
# #
# Returns: a Hash, with :encoding, :confidence, :type # Returns: a Hash, with :encoding, :confidence, :type
@@ -258,7 +264,7 @@ module Linguist
# large) strings. # large) strings.
begin begin
encoded_newlines = ["\r\n", "\r", "\n"]. encoded_newlines = ["\r\n", "\r", "\n"].
map { |nl| nl.encode(encoding, "ASCII-8BIT").force_encoding(data.encoding) } map { |nl| nl.encode(ruby_encoding, "ASCII-8BIT").force_encoding(data.encoding) }
data.split(Regexp.union(encoded_newlines), -1) data.split(Regexp.union(encoded_newlines), -1)
rescue Encoding::ConverterNotFoundError rescue Encoding::ConverterNotFoundError