Merge master

test/test_blob.rb

@@ -469,16 +469,16 @@ class TestBlob < Test::Unit::TestCase
     # Test language detection for files which shouldn't be used as samples
     root = File.expand_path('../fixtures', __FILE__)
     Dir.entries(root).each do |language|
-      next unless File.file?(language)
+      next if language == '.' || language == '..'
 
       # Each directory contains test files of a language
       dirname = File.join(root, language)
       Dir.entries(dirname).each do |filename|
-        next unless File.file?(filename)
-        
         # By default blob search the file in the samples;
         # thus, we need to give it the absolute path
         filepath = File.join(dirname, filename)
+        next unless File.file?(filepath)
+
         blob = blob(filepath)
         assert blob.language, "No language for #{filepath}"
         assert_equal language, blob.language.name, blob.name

test/test_heuristics.rb

@@ -20,6 +20,12 @@ class TestHeuristcs < Test::Unit::TestCase
     Dir.glob("#{samples_path}/#{language_name}/#{file}")
   end
 
+  def test_no_match
+    language = []
+    results = Heuristics.call(file_blob("JavaScript/namespace.js"), language)
+    assert_equal [], results
+  end
+
   # Candidate languages = ["C++", "Objective-C"]
   def test_obj_c_by_heuristics
     # Only calling out '.h' filenames as these are the ones causing issues
@@ -122,4 +128,11 @@ class TestHeuristcs < Test::Unit::TestCase
       end
     end
   end
+
+  def test_ls_by_heuristics
+    assert_heuristics({
+      "LiveScript" => "LiveScript/hello.ls",
+      "LoomScript" => "LoomScript/HelloWorld.ls"
+    })
+  end
 end

test/test_shebang.rb

@@ -16,6 +16,7 @@ class TestShebang < Test::Unit::TestCase
     assert_interpreter nil, "\n\n\n\n\n"
     assert_interpreter nil, " #!/usr/sbin/ruby"
     assert_interpreter nil, "\n#!/usr/sbin/ruby"
+    assert_interpreter nil, "#!"
 
     assert_interpreter "ruby", "#!/usr/sbin/ruby\n# bar"
     assert_interpreter "ruby", "#!/usr/bin/ruby\n# foo"