magic-support 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b309e0c4212931c949a0cfe73bc7aea984ad4eb4d70c8dbadf433e224147d9f9
-  data.tar.gz: bf84fd93b7fcfa2ac15a4b89e440cd3ee1cae63f779ca67d6b74244aa28b92e4
+  metadata.gz: 5ba52d68fd1ed326db4b48fea592086c453fbccb92092460b79f51bb8c368278
+  data.tar.gz: 6c07b4da16765a4ab27ed1cee7cdaf4c6202f2debb33d9cb266e8e1272c93e72
 SHA512:
-  metadata.gz: cbbf0b2f3347a495e5265391b529a42c42692e8d35ee7e5ff532faecd1e55c8602443df7524318bf5bd9f39efba608cf4ef344f4d7b0a679839062ef4fe01339
-  data.tar.gz: b62b4ec44998f16f0bc04293938d93883157c276d4f2ba537fc60abf38f62990f59e1aa58652391846dd10184f114c1306606d90dc6727b803fb75401919f727
+  metadata.gz: ec575506b2dea96321c08c9aa75d2ccf373c8b63d15cdbb0db9afd5c0f3f7483d9f13052f2c81a8f326d3ffdb1dd8c026cef86393f231bfb3eb70598c50d4324
+  data.tar.gz: c51019c9da5d4cc1a62cd775e80a417874ccad09092204aba21774cc8663caba5395ddb8aa5f918970f16409e41a486acb13d89ff042465cda5d48f7aaf28a53

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [0.3.1] — 2025-05-18
+
+### RSpec
+
+#### Method specs
+
+##### Fixed
+
+- Specs for methods with punctuation suffixes got broken in v0.3.0.
+
+
+## [0.3.0] — 2025-05-18
+
+### RSpec
+
+#### Method specs
+
+##### Changed
+
+- Set tested method’s owner to an overridden subject if any.
+
+##### Added
+
+- Support for nesting of method specs.
+- Support for named overridden subjects to follow the original RSpec API.
+
+##### Fixed
+
+- `receiver` should always be equal to `subject.receiver`.
+
+
 ## [0.2.1] — 2025-05-13
 
 ### RSpec

data/README.md

@@ -219,6 +219,12 @@ RSpec.describe MyModule do
 end
 ```
 
+##### Nesting
+
+One may nest method specs.
+This could be useful when a method being tested affects other methods.
+See the spec for examples.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/magic/support/version.rb

@@ -2,6 +2,6 @@
 
 module Magic
 	module Support
-		VERSION = '0.2.1'
+		VERSION = '0.3.1'
 	end
 end

data/lib/rspec/method/its.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RSpec
+	module Method # :nodoc:
+		# Adds the `its_result` to RSpec method example groups.
+		# Included by default.
+		module Its
+			def its_result(*args, &) = its(args, &)
+		end
+
+		ExampleGroup::ClassMethods.include Its
+	end
+end

data/lib/rspec/method.rb

@@ -11,7 +11,7 @@ module RSpec # :nodoc:
 		}
 				.map { |name, pattern| "(?<#{name}>#{pattern})" }
 				.join
-				.then { /(?:^|\s)#{_1}(?:$|\s)/ } # may be surrounded by some text
+				.then { /(?:^|\s)#{_1}(?:$|\s)?/ } # may be surrounded by some text
 
 		# @api public
 		# Container module for method specs.
@@ -21,45 +21,57 @@ module RSpec # :nodoc:
 			included do
 				metadata[:type] ||= :method
 
-				description.match(REFERENCE) in { scope:, name: } or
-						raise ArgumentError, "'#{description}' doesn't look like a method reference"
-
-				subject_method = instance_method :subject
+				setup_method_context
+			end
 
-				while subject_method.owner.then { not _1.respond_to? :metadata or _1.metadata[:method] }
-					subject_method = subject_method.super_method or break
+			class_methods do
+				def subject(name = nil, &)
+					if name
+						alias_method :__subject__, let(name, &)
+
+						self::NamedSubjectPreventSuper.__send__ :define_method, name do
+							raise NotImplementedError, '`super` in named subjects is not supported'
+						end
+					else
+						let :__subject__, &
+					end
 				end
 
-				if subject_method
-					let(:__subject__) { subject_method.bind_call self }
-				else
-					let(:__subject__) { method(:subject).super_method[] }
-				end
+				private
 
-				let :receiver do
-					case [ scope, __subject__ ]
-					in '#', receiver
-						receiver
-					in '.', Module => receiver
-						receiver
-					in '.', receiver
-						receiver.class
-					end
-				end
+				def setup_method_context
+					description.match(REFERENCE) in { scope:, name: } or
+							raise ArgumentError, "'#{description}' doesn't look like a method reference"
 
-				let(:method_name) { name.to_sym }
-			end
+					backup_subject
 
-			class_methods do
-				def subject(&)
-					prepend Module.new {
-						define_method(:subject) { super().unbind.bind instance_eval(&) }
-					}
+					let :receiver do
+						case [ scope, __subject__ ]
+						in '#', receiver
+							receiver
+						in '.', Module => receiver
+							receiver
+						in '.', receiver
+							receiver.class
+						end
+					end
+
+					let(:method_name) { name.to_sym }
 				end
 
-				next unless defined? RSpec::Its
+				def backup_subject
+					subject_method = instance_method :subject
+
+					while subject_method.owner.then { not _1.respond_to? :metadata or _1.metadata[:method] }
+						subject_method = subject_method.super_method or break
+					end
 
-				def its_result(*args, &) = its(args, &)
+					if subject_method
+						let(:__subject__) { subject_method.bind_call self }
+					else
+						let(:__subject__) { method(:subject).super_method[] }
+					end
+				end
 			end
 
 			def subject
@@ -75,6 +87,8 @@ module RSpec # :nodoc:
 		end
 	end
 
+	require_relative 'method/its' if defined? Its
+
 	shared_context :method, description: Method::REFERENCE do
 		include Method::ExampleGroup
 
@@ -94,6 +108,12 @@ module RSpec # :nodoc:
 		end
 	end
 
+	shared_context :nested_method, full_description: /(.*#{Method::REFERENCE}){2,}/ do
+		next unless metadata[:description].match? Method::REFERENCE
+
+		setup_method_context
+	end
+
 	configure do
 		_1.backtrace_exclusion_patterns << %r'/lib/rspec/method'
 	end

data/sig/rspec/method/its.rbs

@@ -0,0 +1,7 @@
+module RSpec
+	module Method
+		module Its
+			def its_result: (*untyped) -> void
+		end
+	end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: magic-support
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexander Senko
 bindir: bin
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
+date: 2025-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,6 +46,7 @@ files:
 - lib/magic/support/authors.rb
 - lib/magic/support/version.rb
 - lib/rspec/method.rb
+- lib/rspec/method/its.rb
 - lib/rubygems/author.rb
 - sig/lib/magic/support/author.rbs
 - sig/magic/core_ext.rbs
@@ -53,13 +54,14 @@ files:
 - sig/magic/loader.rbs
 - sig/magic/support.rbs
 - sig/rspec/method.rbs
+- sig/rspec/method/its.rbs
 - sig/rubygems/author.rbs
 homepage: https://github.com/Alexander-Senko/magic-support
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/Alexander-Senko/magic-support
-  changelog_uri: https://github.com/Alexander-Senko/magic-support/blob/v0.2.1/CHANGELOG.md
+  changelog_uri: https://github.com/Alexander-Senko/magic-support/blob/v0.3.1/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib