From 6b3fe2e519885db5572ad029d8d061cbc17af6ac Mon Sep 17 00:00:00 2001 From: Anton Sokolov Date: Sat, 23 Aug 2025 16:53:48 +0900 Subject: [PATCH 1/2] Update dependency constraints for `servactory` and others **Changes:** - Updated `servactory` dependency to `>= 2.16` in `featury.gemspec` and `Gemfile.lock`. - Upgraded various gem versions, including `activesupport`, `json`, `parser`, `rack`, `rubocop`, `rubocop-rails`, and others, to their latest compatible versions. - Adjusted `BUNDLED WITH` version to `2.7.1` in `Gemfile.lock`. This ensures compatibility with the latest gem changes and updates the project dependencies for improved stability and functionality. --- Gemfile.lock | 26 +++++++++++++------------- featury.gemspec | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff1a984..7e236ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,13 +4,13 @@ PATH featury (1.0.0.rc24) activesupport (>= 5.1, < 8.1) i18n (>= 1.14) - servactory (>= 2.15) + servactory (>= 2.16) zeitwerk (>= 2.6) GEM remote: https://rubygems.org/ specs: - activesupport (8.0.2) + activesupport (8.0.2.1) base64 benchmark (>= 0.3) bigdecimal @@ -37,24 +37,24 @@ GEM drb (2.2.3) i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.13.0) + json (2.13.2) language_server-protocol (3.17.0.5) lint_roller (1.1.0) logger (1.7.0) minitest (5.25.5) mutex_m (0.3.0) parallel (1.27.0) - parser (3.3.8.0) + parser (3.3.9.0) ast (~> 2.4.1) racc prism (1.4.0) racc (1.8.1) - rack (3.1.16) + rack (3.2.0) rainbow (3.1.1) rake (13.3.0) rbs (3.9.4) logger - regexp_parser (2.10.0) + regexp_parser (2.11.2) rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -67,8 +67,8 @@ GEM rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.4) - rubocop (1.78.0) + rspec-support (3.13.5) + rubocop (1.80.0) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -76,7 +76,7 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.45.1, < 2.0) + rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) rubocop-ast (1.46.0) @@ -89,7 +89,7 @@ GEM lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rails (2.32.0) + rubocop-rails (2.33.3) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) @@ -107,7 +107,7 @@ GEM rubocop-rspec (~> 3.5) ruby-progressbar (1.13.0) securerandom (0.4.1) - servactory (2.15.1) + servactory (2.16.0) activesupport (>= 5.1, < 8.1) base64 (>= 0.2) bigdecimal (>= 3.1) @@ -125,7 +125,7 @@ GEM thor (1.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (3.1.4) + unicode-display_width (3.1.5) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) uri (1.0.3) @@ -153,4 +153,4 @@ DEPENDENCIES servactory-rubocop (>= 0.9) BUNDLED WITH - 2.7.0 + 2.7.1 diff --git a/featury.gemspec b/featury.gemspec index 567e18a..0d90eaa 100644 --- a/featury.gemspec +++ b/featury.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_dependency "activesupport", ">= 5.1", "< 8.1" spec.add_dependency "i18n", ">= 1.14" - spec.add_dependency "servactory", ">= 2.15" + spec.add_dependency "servactory", ">= 2.16" spec.add_dependency "zeitwerk", ">= 2.6" spec.add_development_dependency "appraisal", ">= 2.5" From 756affcc650303b6ad22c91e4a3cfc7c130cec11 Mon Sep 17 00:00:00 2001 From: Anton Sokolov Date: Sat, 23 Aug 2025 16:54:48 +0900 Subject: [PATCH 2/2] Improve clarity with consistent spacing in `Collection` classes **Changes:** - Added a blank line after `extend Forwardable` in all `Collection` subclasses (`Actions`, `Callbacks`, `Conditions`, `Features`, `Groups`, and `Resources`). - Maintained uniform structure across all relevant classes. This change enhances code readability and consistency throughout the project. --- lib/featury/actions/collection.rb | 1 + lib/featury/callbacks/collection.rb | 1 + lib/featury/conditions/collection.rb | 1 + lib/featury/features/collection.rb | 1 + lib/featury/groups/collection.rb | 1 + lib/featury/resources/collection.rb | 1 + 6 files changed, 6 insertions(+) diff --git a/lib/featury/actions/collection.rb b/lib/featury/actions/collection.rb index d8f6ef2..89ae1b9 100644 --- a/lib/featury/actions/collection.rb +++ b/lib/featury/actions/collection.rb @@ -4,6 +4,7 @@ module Featury module Actions class Collection extend Forwardable + def_delegators :@collection, :<<, :filter, :each, :map, :merge, :find def initialize(collection = Set.new) diff --git a/lib/featury/callbacks/collection.rb b/lib/featury/callbacks/collection.rb index b246cb6..03ab371 100644 --- a/lib/featury/callbacks/collection.rb +++ b/lib/featury/callbacks/collection.rb @@ -4,6 +4,7 @@ module Featury module Callbacks class Collection extend Forwardable + def_delegators :@collection, :<<, :filter, :each, :map, :merge, :find def initialize(collection = Set.new) diff --git a/lib/featury/conditions/collection.rb b/lib/featury/conditions/collection.rb index 7632486..7970d46 100644 --- a/lib/featury/conditions/collection.rb +++ b/lib/featury/conditions/collection.rb @@ -4,6 +4,7 @@ module Featury module Conditions class Collection extend Forwardable + def_delegators :@collection, :<<, :each, :merge, :all? def initialize(collection = Set.new) diff --git a/lib/featury/features/collection.rb b/lib/featury/features/collection.rb index da25bb3..a3ca338 100644 --- a/lib/featury/features/collection.rb +++ b/lib/featury/features/collection.rb @@ -4,6 +4,7 @@ module Featury module Features class Collection extend Forwardable + def_delegators :@collection, :<<, :each, :map, :merge, :to_a, :empty? def initialize(collection = Set.new) diff --git a/lib/featury/groups/collection.rb b/lib/featury/groups/collection.rb index 293850f..8cc6793 100644 --- a/lib/featury/groups/collection.rb +++ b/lib/featury/groups/collection.rb @@ -4,6 +4,7 @@ module Featury module Groups class Collection extend Forwardable + def_delegators :@collection, :<<, :each, :map, :flat_map, :filter, :to_h, :merge, :to_a, :all?, :empty? def initialize(collection = Set.new) diff --git a/lib/featury/resources/collection.rb b/lib/featury/resources/collection.rb index 9b9bab1..d1b8147 100644 --- a/lib/featury/resources/collection.rb +++ b/lib/featury/resources/collection.rb @@ -4,6 +4,7 @@ module Featury module Resources class Collection extend Forwardable + def_delegators :@collection, :<<, :each, :map, :filter, :to_h, :merge def initialize(collection = Set.new)