Actually return the strategy

tesch1 · Mar 5, 2015 · a1010b8 · a1010b8
1 parent 1bc1803
commit a1010b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
@@ -108,9 +108,10 @@ def self.detect(blob)
       Linguist.instrument("linguist.detection", :blob => blob) do
         # Call each strategy until one candidate is returned.
         languages = []
-        strategy = nil
+        returning_strategy = nil
 
         STRATEGIES.each do |strategy|
+          returning_strategy = strategy
           candidates = Linguist.instrument("linguist.strategy", :blob => blob, :strategy => strategy, :candidates => languages) do
             strategy.call(blob, languages)
           end
@@ -125,7 +126,7 @@ def self.detect(blob)
           end
         end
 
-        Linguist.instrument("linguist.detected", :blob => blob, :strategy => strategy, :language => languages.first)
+        Linguist.instrument("linguist.detected", :blob => blob, :strategy => returning_strategy, :language => languages.first)
 
         languages.first
       end

diff --git a/test/test_instrumentation.rb b/test/test_instrumentation.rb
@@ -38,7 +38,13 @@ def test_modeline_instrumentation
     blob = fixture_blob("Data/Modelines/ruby")
     Language.detect(blob)
 
+    detect_event = Linguist.instrumenter.events.last
+    detect_event_payload = detect_event[:args].first
+
     assert_equal 3, Linguist.instrumenter.events.size
-    assert_equal "linguist.detected", Linguist.instrumenter.events.last.name
+    assert_equal "linguist.detected", detect_event.name
+    assert_equal Language['Ruby'], detect_event_payload[:language]
+    assert_equal blob, detect_event_payload[:blob]
+    assert_equal Linguist::Strategy::Modeline, detect_event_payload[:strategy]
   end
 end