magic-support 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b45a52aa66c0c22ad94c811078bb9cfa23259b47bf100bf1801764ceb11a5fd
-  data.tar.gz: adc4e53bf22e41cc8347e9cf7304c4659f054d622ad25c0312d7f17fed836200
+  metadata.gz: 300e982507adbfef7f0443c3a28e10eef71663ad657111414bcc378fbefa671e
+  data.tar.gz: 6d880303471f7fd11c0adb570bc243e3924cc84930fd06b449a7c85b6d820e77
 SHA512:
-  metadata.gz: 02aaa8dced956eca69517aba746fd53dd4e2c77c69944a0504aaf66b13e59a80e0f48b1ca56d4a9b11c3e532375acaab5ecd6312b4a09699db4523765a102df3
-  data.tar.gz: d49b593c146296b518730b6c8d74d2238ab890f0a68db9bc132c9c8623099dc7a47d9c7bce3d98d1dc076b4f5e0a1a79625e0cbedf7dfa0fef1af992fc1c2b10
+  metadata.gz: 3ab3d1dbcf81b9d22a4ea50e24cf0ce11cf5d23231711d7baf8ee5cc556963d544a41152a6273fcea8980814100f0b3c9c5ea5ef68f1accd9add6daaa1cf002b
+  data.tar.gz: a83ab7bd0a8c1397e35dee965efcb155c2788a1fb13c11a4f2c58eac67167e39968c6544406cfc7242785b68cc0474b36acef9f559385e2005bb40ef570fb7b0

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## [0.4.0] — 2026-10-09
+
+### Changed
+
+- Moved to Ruby 3.4+.
+
+#### `Kernel`
+
+- Replaced `#optional` with `#then_try`.
+
+### Added
+
+#### `Kernel`
+
+- Conditional `Kernel#then` via `if:`/`unless:` parameters.
+	When a condition isn’t met it returns self the same way `#then_try` does.
+- Optional arguments for `Kernel#then_try`
+	to call `#try` under the hood.
+	Thus, one can replace, e.g., `.then_try { it.try :decorate }` with a shortcut: `.then_try :decorate`.
+- `Kernel#then_try` without a block
+	to return an enumerator suppressing `NoMethodError`s.
+	Thus, one can call, e.g., `.then_try.detect &:odd?` for any `Numeric`, not just `Integer`.
+
+
 ## [0.3.2] — 2026-05-05
 
 Works with Ruby 4+.

data/README.md

@@ -3,11 +3,15 @@
 ![GitHub Actions Workflow Status](
 	https://img.shields.io/github/actions/workflow/status/Alexander-Senko/magic-support/ci.yml
 )
-![Code Climate maintainability](
-	https://img.shields.io/codeclimate/maintainability-percentage/Alexander-Senko/magic-support
+[![Maintainability](
+	https://qlty.sh/gh/Alexander-Senko/projects/magic-support/maintainability.svg
+)](
+	https://qlty.sh/gh/Alexander-Senko/projects/magic-support
 )
-![Code Climate coverage](
-	https://img.shields.io/codeclimate/coverage/Alexander-Senko/magic-support
+[![Code Coverage](
+	https://qlty.sh/gh/Alexander-Senko/projects/magic-support/coverage.svg
+)](
+	https://qlty.sh/gh/Alexander-Senko/projects/magic-support
 )
 
 Magic Support is a collection of utility classes and standard library extensions
@@ -71,28 +75,66 @@ require 'magic/core_ext'
 
 ### Extensions to all objects
 
-#### `#optional`
+#### `#then`
+
+Yields self to the block and returns the block’s result, just like the original `then`, if the condition permits it.
+Returns self otherwise, just like `then_try`.
+
+```ruby
+@people = Person
+  .then(if: new?) { it.where created_at: 1.hour.ago... }
+  .then(if: gdpr?, &:anonymize)
+```
+
+Conditions may be callables, in which case they are called with self.
+
+```ruby
+data
+  .then(if: :compressed?) { decompress it }
+  .then(unless: :parsed?) { parse it }
+  .then(if: -> { it.size > LIMIT }) { shrink it }
+```
+
+With no condition keywords, it behaves like the standard `then`.
+
+Defined in `core_ext/kernel/then`.
+
+#### `#then_try`
 
 Yields self to the block and returns the result of the block if it’s truthy, and self otherwise.
 
 ```ruby
 rand(6)                              # returns 0–5
-  .optional { it + 1 if one_based? } # returns 1–6 if 1-based, or
+  .then_try { it + 1 if one_based? } # returns 1–6 if 1-based, or
                                      # the original 0–5 otherwise
 ```
 
-It can be considered as a conditional `#then`.
-
-Good usage for `#optional` is value piping in method chains with conditional processing:
+Good usage for `#then_try` is value piping in method chains with conditional processing:
 
 ```ruby
 @people = Person
-  .optional { it.where created_at: (1.hour.ago...) if new? }
-  .optional { anonymize it if gdpr? }
-  .optional { try :decorate }
+  .then_try { it.where created_at: (1.hour.ago...) if new? }
+  .then_try { anonymize it if gdpr? }
+  .then_try(:decorate)
+```
+
+When called without a block, the method returns an Enumerator, which can be used, for example, for `NoMethodError`-proof conditional circuit-breaking:
+
+```ruby
+  101.then_try.detect &:odd? # => 101
+  102.then_try.detect &:odd? # => nil
+  1.3.then_try.detect &:odd? # => nil
+```
+
+Traditional `#then` behaves like this:
+
+```ruby
+  101.then.detect &:odd? # => 101
+  102.then.detect &:odd? # => nil
+  1.3.then.detect &:odd? # raises NoMethodError
 ```
 
-Defined in `core_ext/kernel/optional`.
+Defined in `core_ext/kernel/then`.
 
 ## Gems
 

data/lib/magic/core_ext/kernel/then.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require_relative 'utils'
+
+require 'active_support/core_ext/object/try'
+
+Magic::CoreExt.kernel do
+	# Yields self to the block and returns the block’s result, just like
+	# the original +then+, if the condition permits it.
+	# Returns self otherwise, just like +then_try+.
+	#
+	#   rand(6)                         # returns 0–5
+	#     .then(&:succ, if: one_based?) # returns 1–6 if 1-based, or
+	#                                   # the original 0–5 otherwise
+	#
+	#   @people = Person
+	#     .then(if: new?) { it.where created_at: 1.hour.ago... }
+	#     .then(if: gdpr?, &:anonymize)
+	#
+	# Conditions may be callables, in which case they are called with self.
+	#
+	#   data
+	#     .then(if: :compressed?) { decompress it }
+	#     .then(unless: :parsed?) { parse it }
+	#     .then(if: -> { it.size > LIMIT }) { shrink it }
+	#
+	# With no condition keywords, it behaves like the standard +then+.
+	def then **conditions, &block # rubocop:disable Metrics
+		return super unless conditions.any?
+
+		return Enumerator.new do |yielder|
+			self.then **conditions do
+				yielder << it
+			end
+		end unless block
+
+		if (keywords = conditions.keys - %i[ if unless ]).any?
+			require 'active_support/core_ext/enumerable'
+
+			raise ArgumentError, "unknown keyword#{'s' if keywords.many?}: #{keywords.map(&:inspect) * ', '}"
+		end
+
+		conditions.transform_values! do |condition|
+			if condition.respond_to? :to_proc
+				condition.to_proc[self]
+			else
+				condition
+			end
+		end
+
+		if conditions.fetch(:if, true) and not conditions.fetch(:unless, false)
+			super &block
+		else
+			self
+		end
+	end
+
+	# Yields self to the block and returns the result of the block if it’s
+	# truthy, and self otherwise.
+	#
+	#   rand(6)                              # returns 0–5
+	#     .then_try { it + 1 if one_based? } # returns 1–6 if 1-based, or
+	#                                        # the original 0–5 otherwise
+	#
+	# It can be considered as a conditional +then+.
+	#
+	# Good usage for +then_try+ is value piping in method chains with
+	# conditional processing:
+	#
+	#   @people = Person
+	#     .then_try { it.where created_at: (1.hour.ago...) if new? }
+	#     .then_try { anonymize it if gdpr? }
+	#     .then_try(:decorate)
+	#
+	# See the proposal: https://bugs.ruby-lang.org/issues/21435
+	#
+	# When called without a block, the method returns an Enumerator, which
+	# can be used, for example, for +NoMethodError+-proof conditional
+	# circuit-breaking:
+	#
+	#   101.then.detect &:odd?     # => 101
+	#   102.then.detect &:odd?     # => nil
+	#   1.3.then.detect &:odd?     # raises NoMethodError
+	#
+	#   101.then_try.detect &:odd? # => 101
+	#   102.then_try.detect &:odd? # => nil
+	#   1.3.then_try.detect &:odd? # => nil
+	def then_try(*args, **, &)
+		tap do
+			result = if args.any?
+				try(*args, **, &)
+			else
+				# Enumerator mode
+				return Enumerator.new do |yielder|
+					yielder << self
+				rescue NoMethodError => error
+					raise unless
+							self == error.receiver
+				end unless block_given?
+
+				yield self
+			end or next # bypass
+
+			break result # `#then` mode
+		end
+	end
+end

data/lib/magic/core_ext/kernel/utils.rb

@@ -16,7 +16,7 @@ module Magic # :nodoc:
 
 		def kernel(&)
 			Module.new(&).tap do |kernel|
-				Kernel::MODULES.each { _1.include kernel }
+				Kernel::MODULES.each { it.prepend kernel }
 			end
 		end
 	end

data/lib/magic/loader.rb

@@ -10,7 +10,7 @@ module Magic # :nodoc:
 			Pathname(scope)
 					.sub_ext('')
 					.glob('*.rb')
-					.each { require _1 }
+					.each { require it }
 		end
 	end
 end

data/lib/magic/support/version.rb

@@ -2,6 +2,6 @@
 
 module Magic
 	module Support
-		VERSION = '0.3.2'
+		VERSION = '0.4.0'
 	end
 end

data/lib/rspec/method.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
-require 'magic/core_ext/kernel/optional'
+require 'magic/core_ext/kernel/then'
 
 module RSpec # :nodoc:
 	module Method
@@ -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)#{it}(?:$|\s)?/ } # may be surrounded by some text
 
 		# @api public
 		# Container module for method specs.
@@ -43,6 +43,7 @@ module RSpec # :nodoc:
 					description.match(REFERENCE) in { scope:, name: } or
 							raise ArgumentError, "'#{description}' doesn't look like a method reference"
 
+					adjust_description if description.start_with? scope
 					backup_subject
 
 					let :receiver do
@@ -62,7 +63,7 @@ module RSpec # :nodoc:
 				def backup_subject
 					subject_method = instance_method :subject
 
-					while subject_method.owner.then { not _1.respond_to? :metadata or _1.metadata[:method] }
+					while subject_method.owner.then { not it.respond_to? :metadata or it.metadata[:method] }
 						subject_method = subject_method.super_method or break
 					end
 
@@ -72,6 +73,11 @@ module RSpec # :nodoc:
 						let(:__subject__) { method(:subject).super_method[] }
 					end
 				end
+
+				def adjust_description
+					metadata[:full_description]
+							.sub!(/#{described_class}\s+#{description}/, "#{described_class}#{description}")
+				end
 			end
 
 			def subject
@@ -95,7 +101,7 @@ module RSpec # :nodoc:
 		shared_context :delegated do |to:, with: nil|
 			before do
 				allow(to).to receive(method_name)
-						.optional { _1.with *with if with }
+						.then(if: with) { it.with *with }
 						.and_call_original
 			end
 
@@ -115,6 +121,6 @@ module RSpec # :nodoc:
 	end
 
 	configure do
-		_1.backtrace_exclusion_patterns << %r'/lib/rspec/method'
+		it.backtrace_exclusion_patterns << %r'/lib/rspec/method'
 	end
 end

data/sig/magic/core_ext/kernel.rbs

@@ -2,6 +2,13 @@ module Magic
 	module CoreExt
 		module Kernel
 			MODULES: Array[Module]
+
+			def then_try: [U] { (self) -> U } -> (U | self)
+					| (interned method_name, *untyped, **untyped) ?{ (*untyped, **untyped) -> untyped } -> (untyped | self)
+					| -> Enumerator[self, untyped]
+
+			def then: [U] (?if: bool, ?unless: bool) { (self) -> U } -> (U | self)
+					|         (?if: bool, ?unless: bool)                 -> Enumerator[self, untyped]
 		end
 	end
 end

metadata

@@ -1,82 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: magic-support
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
-- Alexander Senko
+  - Alexander Senko
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  - !ruby/object:Gem::Dependency
+    name: activesupport
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
+    type: :runtime
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
 description: Utility classes and Ruby extensions beyond Active Support.
 email:
-- Alexander.Senko@gmail.com
+  - Alexander.Senko@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- ".rubocop.yml"
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- LICENSE.txt
-- README.md
-- Rakefile
-- lib/magic/core_ext.rb
-- lib/magic/core_ext/kernel.rb
-- lib/magic/core_ext/kernel/optional.rb
-- lib/magic/core_ext/kernel/utils.rb
-- lib/magic/loader.rb
-- lib/magic/support.rb
-- 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
-- sig/magic/core_ext/kernel.rbs
-- 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
+  - CHANGELOG.md
+  - CODE_OF_CONDUCT.md
+  - LICENSE.txt
+  - README.md
+  - Rakefile
+  - lib/magic/core_ext.rb
+  - lib/magic/core_ext/kernel.rb
+  - lib/magic/core_ext/kernel/then.rb
+  - lib/magic/core_ext/kernel/utils.rb
+  - lib/magic/loader.rb
+  - lib/magic/support.rb
+  - 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
+  - sig/magic/core_ext/kernel.rbs
+  - 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
+  - MIT
 metadata:
-  source_code_uri: https://github.com/Alexander-Senko/magic-support
-  changelog_uri: https://github.com/Alexander-Senko/magic-support/blob/v0.3.2/CHANGELOG.md
+  source_code_uri: "https://github.com/Alexander-Senko/magic-support"
+  changelog_uri: "https://github.com/Alexander-Senko/magic-support/blob/v0.4.0/CHANGELOG.md"
 rdoc_options: []
 require_paths:
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '3.2'
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: "3.4"
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: Active Support extended
 test_files: []

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,7 +0,0 @@
-inherit_from:
-  - https://github.com/Alexander-Senko/Alexander-Senko/raw/refs/heads/main/.rubocop.yml
-  - https://github.com/Alexander-Senko/Alexander-Senko/raw/refs/heads/main/.rubocop-rspec.yml
-
-plugins:
-  - rubocop-rspec
-  - rubocop-rake

data/lib/magic/core_ext/kernel/optional.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'utils'
-
-Magic::CoreExt.kernel do
-	# Yields self to the block and returns the result of the block if it’s
-	# truthy, and self otherwise.
-	#
-	#   rand(6)                              # returns 0–5
-	#     .optional { it + 1 if one_based? } # returns 1–6 if 1-based, or
-	#                                        # the original 0–5 otherwise
-	#
-	# It can be considered as a conditional +then+.
-	#
-	# Good usage for +optional+ is value piping in method chains with
-	# conditional processing:
-	#
-	#   @people = Person
-	#     .optional { it.where created_at: (1.hour.ago...) if new? }
-	#     .optional { anonymize it if gdpr? }
-	#     .optional { try :decorate }
-	#
-	def optional
-		tap do
-			result = yield(self) or
-					next
-
-			break result
-		end
-	end
-end