strict_ivars 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65516e69e17c893c02c57e0cc0be683c57c9dc3fd91b80f56942453d5df43649
-  data.tar.gz: 16d3c581474be1f5a7500eb24e442ac8bcd54f55ee5d7afef6cdea3ef986381f
+  metadata.gz: 6e1244d297abc3e3ade0882ca3a8767b63701c42721a7199803ad75b46c566ed
+  data.tar.gz: c141c19397e2942a40bb049ca77790ca9b29a6de9e0cd30e218162b1e51c4ee7
 SHA512:
-  metadata.gz: b92fa82ca1acbcef116a5ab531bb1a4ec08301db0b17eb9d5f5a99af47c29face2c82a51d0f63b905eec0a7506e2453b040731848a69afff951f6f44b18e789e
-  data.tar.gz: b650231f2312548af22bd11ecc031dbdcbf178a5ce4f501b29f48687a59209a6533c12a4ef8fe78a351cc03e591bbd3e01c1edf67f03568620279b3990ab0e63
+  metadata.gz: 8cd2d471ca00c86a910843da2cacf803d71f30d48c946f469a5f18ef34c23b54d99d20897501a769695ff37114b677b8ce25c927a135876d99f1202324ad2e8f
+  data.tar.gz: ab6d3154078514bb0bd9615bae2cecdda743cb7a3dcd5f55d8571fae1f5201f94d090ebffd582881876f3b66bdcfd2035e4d600b77b7fa3350759f33deb4850a

data/README.md

@@ -26,26 +26,6 @@ The replacement happens on load, so you never see this in your source code. It
 
 The real guard is a little uglier than this. It uses `::Kernel.raise` so it’s compatible with `BasicObject`. It also raises a `StrictIvars::NameError` with a helpful message mentioning the name of the instance variable, and that inherits from `NameError`, allowing you to rescue either `NameError` or `StrictIvars::NameError`.
 
-**When you check defined already**
-
-Within the same context (e.g. class definition, module definition, block, method), if you check `defined?`, Strict Ivars will not add a guard to reads of the checked instance variable.
-
-```ruby
-if defined?(@foo)
-  @foo
-end
-```
-
-This applies even if the read is not in one of the conditional’s branches since you’ve indicated local awareness of the potential for this instance variable not being defined.
-
-```ruby
-if defined?(@foo)
-  # anything
-end
-
-@foo
-```
-
 **Writes:**
 
 Strict Ivars doesn’t apply to writes, since these are considered the authoritative source of the instance variable definitions.

data/lib/strict_ivars/base_processor.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "securerandom"
+
+class StrictIvars::BaseProcessor < Prism::Visitor
+	EVAL_METHODS = Set[:class_eval, :module_eval, :instance_eval, :eval].freeze
+
+	#: (String) -> String
+	def self.call(source)
+		visitor = new
+		visitor.visit(Prism.parse(source).value)
+		buffer = source.dup
+		annotations = visitor.annotations
+		annotations.sort_by!(&:first)
+
+		annotations.reverse_each do |offset, string|
+			buffer.insert(offset, string)
+		end
+
+		buffer
+	end
+
+	def initialize
+		@context = Set[]
+		@annotations = []
+	end
+
+	#: Array[[Integer, :start_ivar_read | :end_ivar_read, Symbol]]
+	attr_reader :annotations
+
+	def visit_call_node(node)
+		name = node.name
+
+		if EVAL_METHODS.include?(name) && (arguments = node.arguments)
+			location = arguments.location
+
+			if node.receiver
+				receiver_local = "__eval_receiver_#{SecureRandom.hex(8)}__"
+				receiver_location = node.receiver.location
+
+				@annotations.push(
+					[receiver_location.start_character_offset, "(#{receiver_local} = "],
+					[receiver_location.end_character_offset, ")"],
+					[location.start_character_offset, "*(::StrictIvars.process_eval_args(#{receiver_local}, :#{name}, "],
+					[location.end_character_offset, "))"]
+				)
+			else
+				@annotations.push(
+					[location.start_character_offset, "*(::StrictIvars.process_eval_args(self, :#{name}, "],
+					[location.end_character_offset, "))"]
+				)
+			end
+		end
+
+		super
+	end
+end

data/lib/strict_ivars/configuration.rb

@@ -22,7 +22,8 @@ class StrictIvars::Configuration
 	end
 
 	#: (String) -> bool
-	def match(path)
+	def match?(path)
+		return false unless String === path
 		path = File.absolute_path(path)
 		return false if @exclude.any? { |pattern| File.fnmatch?(pattern, path) }
 		return true if @include.any? { |pattern| File.fnmatch?(pattern, path) }

data/lib/strict_ivars/processor.rb

@@ -1,36 +1,6 @@
 # frozen_string_literal: true
 
-class StrictIvars::Processor < Prism::Visitor
-	#: (String) -> String
-	def self.call(source)
-		visitor = new
-		visitor.visit(Prism.parse(source).value)
-		buffer = source.dup
-		annotations = visitor.annotations
-		annotations.sort_by!(&:first)
-
-		annotations.reverse_each do |offset, action, name|
-			case action
-			when :start
-				buffer.insert(offset, "(defined?(#{name}) ? ")
-			when :end
-				buffer.insert(offset, " : (::Kernel.raise(::StrictIvars::NameError.new('Undefined instance variable #{name}'))))")
-			else
-				raise "Invalid annotation"
-			end
-		end
-
-		buffer
-	end
-
-	def initialize
-		@context = Set[]
-		@annotations = []
-	end
-
-	#: Array[[Integer, :start | :end, Symbol]]
-	attr_reader :annotations
-
+class StrictIvars::Processor < StrictIvars::BaseProcessor
 	#: (Prism::ClassNode) -> void
 	def visit_class_node(node)
 		new_context { super }
@@ -51,17 +21,6 @@ class StrictIvars::Processor < Prism::Visitor
 		new_context { super }
 	end
 
-	#: (Prism::DefinedNode) -> void
-	def visit_defined_node(node)
-		value = node.value
-
-		if Prism::InstanceVariableReadNode === value
-			@context << value.name
-		end
-
-		super
-	end
-
 	#: (Prism::DefNode) -> void
 	def visit_def_node(node)
 		new_context { super }
@@ -95,9 +54,10 @@ class StrictIvars::Processor < Prism::Visitor
 
 			@context << name
 
-			@annotations <<
-				[location.start_character_offset, :start, name] <<
-				[location.end_character_offset, :end, name]
+			@annotations.push(
+				[location.start_character_offset, "(defined?(#{name}) ? "],
+				[location.end_character_offset, " : (::Kernel.raise(::StrictIvars::NameError.new('Undefined instance variable #{name}'))))"]
+			)
 		end
 
 		super

data/lib/strict_ivars/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StrictIvars
-	VERSION = "0.5.0"
+	VERSION = "0.6.0"
 end

data/lib/strict_ivars.rb

@@ -3,28 +3,71 @@
 require "prism"
 require "require-hooks/setup"
 require "strict_ivars/version"
+require "strict_ivars/base_processor"
+require "strict_ivars/processor"
 require "strict_ivars/configuration"
 
 module StrictIvars
 	NameError = Class.new(::NameError)
 
+	EMPTY_ARRAY = [].freeze
+	EVERYTHING = ["**/*"].freeze
+	METHOD_METHOD = Module.instance_method(:method)
+
 	CONFIG = Configuration.new
 
 	#: (include: Array[String], exclude: Array[String]) -> void
-	def self.init(include: [], exclude: [])
-		require "strict_ivars/patch_eval"
-
-		CONFIG.include(*include)
-		CONFIG.exclude(*exclude)
+	def self.init(include: EMPTY_ARRAY, exclude: EMPTY_ARRAY)
+		CONFIG.include(*include) unless include.length == 0
+		CONFIG.exclude(*exclude) unless exclude.length == 0
 
 		RequireHooks.source_transform(
-			patterns: include,
-			exclude_patterns: exclude
+			patterns: EVERYTHING,
+			exclude_patterns: EMPTY_ARRAY
 		) do |path, source|
 			source ||= File.read(path)
-			Processor.call(source)
+
+			if CONFIG.match?(path)
+				Processor.call(source)
+			else
+				BaseProcessor.call(source)
+			end
 		end
 	end
-end
 
-require "strict_ivars/processor"
+	def self.process_eval_args(receiver, method_name, *args)
+		method = METHOD_METHOD.bind_call(receiver, method_name)
+		owner = method.owner
+
+		source, file = nil
+
+		case method_name
+		when :class_eval, :module_eval
+			if Module == owner
+				source, file = args
+			end
+		when :instance_eval
+			if BasicObject == owner
+				source, file = args
+			end
+		when :eval
+			if Kernel == owner
+				source, binding, file = args
+			elsif Binding == owner
+				source, file = args
+			end
+		end
+
+		if String === source
+			file ||= caller_locations(1, 1).first&.path
+
+			if CONFIG.match?(file)
+				args[0] = Processor.call(source)
+			else
+				args[0] = BaseProcessor.call(source)
+			end
+		end
+
+		args
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strict_ivars
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Joel Drapper
@@ -47,8 +47,8 @@ files:
 - LICENSE.txt
 - README.md
 - lib/strict_ivars.rb
+- lib/strict_ivars/base_processor.rb
 - lib/strict_ivars/configuration.rb
-- lib/strict_ivars/patch_eval.rb
 - lib/strict_ivars/processor.rb
 - lib/strict_ivars/version.rb
 homepage: https://github.com/joeldrapper/strict_ivars

data/lib/strict_ivars/patch_eval.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module StrictIvars
-	module ModuleEvalPatch
-		#: (String, ?String, ?Integer) -> void
-		#: () { () -> void } -> void
-		def class_eval(*args)
-			source, file, lineno = args
-
-			file ||= caller_locations(1, 1).first.path
-
-			if source && file && CONFIG.match(file)
-				args[0] = Processor.call(source)
-			end
-
-			super
-		end
-
-		#: (String, ?String, ?Integer) -> void
-		#: () { () -> void } -> void
-		def module_eval(*args)
-			source, file, lineno = args
-
-			file ||= caller_locations(1, 1).first.path
-
-			if source && file && CONFIG.match(file)
-				args[0] = Processor.call(source)
-			end
-
-			super
-		end
-	end
-
-	module InstanceEvalPatch
-		#: (String, ?String, ?Integer) -> void
-		#: () { () -> void } -> void
-		def instance_eval(*args)
-			source, file, lineno = args
-
-			file ||= caller_locations(1, 1).first.path
-
-			if source && file && CONFIG.match(file)
-				args[0] = Processor.call(source)
-			end
-
-			super
-		end
-	end
-
-	module KernelEvalPatch
-		#: (String, Binding, ?String, ?Integer) -> void
-		def eval(*args)
-			source, binding, file, lineno = args
-
-			file ||= caller_locations(1, 1).first.path
-
-			if source && file && CONFIG.match(file)
-				args[0] = Processor.call(source.to_s)
-			end
-
-			super
-		end
-	end
-
-	module BindingEvalPatch
-		#: (String, ?String, ?Integer) -> void
-		def eval(*args)
-			source, file, lineno = args
-
-			file ||= caller_locations(1, 1).first.path
-
-			if source && file && CONFIG.match(file)
-				args[0] = Processor.call(source.to_s)
-			end
-
-			super
-		end
-	end
-
-	Kernel.prepend(KernelEvalPatch)
-	Module.prepend(ModuleEvalPatch)
-	Binding.prepend(BindingEvalPatch)
-	BasicObject.prepend(InstanceEvalPatch)
-end