lib/rotoscope/call_logger.rb in rotoscope-0.3.0 vs lib/rotoscope/call_logger.rb in rotoscope-0.3.1.pre.1

@@ -86,19 +86,19 @@
     end
 
     private
 
     def log_call(call)
-      return if blacklist.match?(call.caller_path)
+      caller_path = call.caller_path || ''
+      return if blacklist.match?(caller_path)
       return if self == call.receiver
 
+      caller_class_name = call.caller_class_name || '<UNKNOWN>'
       if call.caller_method_name.nil?
-        caller_class_name = '<ROOT>'
         caller_method_name = '<UNKNOWN>'
         caller_method_level = '<UNKNOWN>'
       else
-        caller_class_name = call.caller_class_name
         caller_method_name = escape_csv_string(call.caller_method_name)
         caller_method_level = call.caller_singleton_method? ? 'class' : 'instance'
       end
 
       call_method_level = call.singleton_method? ? 'class' : 'instance'
@@ -107,10 +107,10 @@
       buffer = @output_buffer
       buffer.clear
       buffer <<
         '"' << call.receiver_class_name << '",' \
         '"' << caller_class_name << '",' \
-        '"' << call.caller_path << '",' \
+        '"' << caller_path << '",' \
         << call.caller_lineno.to_s << ',' \
         '"' << method_name << '",' \
         << call_method_level << ',' \
         '"' << caller_method_name << '",' \
         << caller_method_level << "\n"