lib/covered/source.rb in covered-0.16.7 vs lib/covered/source.rb in covered-0.16.8

@@ -1,33 +1,20 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
 
+# Released under the MIT License.
+# Copyright, 2018-2022, by Samuel Williams.
+
 require_relative 'wrapper'
 
 require 'thread'
 require 'parser/current'
 
 module Covered
 	# The source map, loads the source file, parses the AST to generate which lines contain executable code.
 	class Source < Wrapper
+		Script = Struct.new(:path, :source, :line_offset)
+		
 		def initialize(output)
 			super(output)
 			
 			@paths = {}
 			@mutex = Mutex.new
@@ -41,11 +28,11 @@
 					# We only track source files which begin at line 1, as these represent whole files instead of monkey patches.
 					if instruction_sequence.first_lineno <= 1
 						# Extract the source path and source itself and save it for later:
 						if path = instruction_sequence.path and source = trace.eval_script
 							@mutex.synchronize do
-								@paths[path] = source
+								@paths[path] = Script.new(path, source, instruction_sequence.first_lineno)
 							end
 						end
 					end
 				end
 			rescue
@@ -101,47 +88,70 @@
 		
 		def ignore_children?(node)
 			IGNORE_CHILDREN[node.type]
 		end
 		
+		IGNORE_METHOD = {
+			freeze: true
+		}
+		
+		def ignore_method?(name)
+			IGNORE_METHOD[name]
+		end
+		
 		def expand(node, coverage, level = 0)
 			if node.is_a? Parser::AST::Node
 				if ignore?(node)
 					# coverage.annotate(node.location.line, "ignoring #{node.type}")
 				elsif node.type == :begin
-					if last_child = node.children&.last
-						coverage.counts[last_child.location.line] ||= 0
-					end
+					# if last_child = node.children&.last
+					# 	coverage.counts[last_child.location.line] ||= 0
+					# end
 					
 					expand(node.children, coverage, level + 1)
 				elsif node.type == :send
-					coverage.counts[node.location.selector.line] ||= 0
+					if ignore_method?(node.children[1])
+						# coverage.annotate(node.location.line, "ignoring #{node.type}")
+						return
+					else
+						# coverage.annotate(node.location.line, "accepting selector #{node.type}")
+						coverage.counts[node.location.selector.line] ||= 0
+					end
 				elsif executable?(node)
 					# coverage.annotate(node.location.line, "executable #{node.type}")
 					coverage.counts[node.location.line] ||= 0
+				end
+
+				if ignore_children?(node)
+					# coverage.annotate(node.location.line, "ignoring #{node.type} children")
 				else
-					if ignore_children?(node)
-						# coverage.annotate(node.location.line, "ignoring #{node.type} children")
-					else
-						expand(node.children, coverage, level + 1)
-					end
+					expand(node.children, coverage, level + 1)
 				end
 			elsif node.is_a? Array
 				node.each do |child|
 					expand(child, coverage, level)
 				end
 			else
 				return false
 			end
 		end
 		
+		def add(path, source = nil)
+			if coverage = super
+				top = Parser::CurrentRuby.parse(source)
+				self.expand(top, coverage)
+			end
+			
+			return coverage
+		end
+		
 		def parse(path)
-			if source = @paths[path]
-				Parser::CurrentRuby.parse(source)
+			if script = @paths[path]
+				Parser::CurrentRuby.parse(script.source, script.path, script.line_offset)
 			elsif File.exist?(path)
 				Parser::CurrentRuby.parse_file(path)
 			else
-				warn "Couldn't parse #{path}, file doesn't exist?"
+				# warn "Couldn't parse #{path}, file doesn't exist?"
 			end
 		rescue
 			warn "Couldn't parse #{path}: #{$!}"
 		end