Ensure lang is skipped on any binary file

coolstuf · Sep 24, 2012 · 31e33f9 · 31e33f9
1 parent 7c51b90
commit 31e33f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
@@ -302,7 +302,7 @@ def language
       if defined?(@data) && @data.is_a?(String)
         data = @data
       else
-        data = lambda { binary_mime_type? ? "" : self.data }
+        data = lambda { (binary_mime_type? || binary?) ? "" : self.data }
       end
 
       @language = Language.detect(name.to_s, data, mode)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
@@ -84,7 +84,9 @@ def self.detect(name, data, mode = nil)
 
       if possible_languages.length > 1
         data = data.call() if data.respond_to?(:call)
-        if result = Classifier.classify(Samples::DATA, data, possible_languages.map(&:name)).first
+        if data.nil? || data == ""
+          nil
+        elsif result = Classifier.classify(Samples::DATA, data, possible_languages.map(&:name)).first
           Language[result[0]]
         end
       else