Merge branch 'release/v5.7.0'

Author: bolshakov

.github/workflows/ci.yml

@@ -17,12 +17,12 @@ jobs:
       contents: read
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Standard Ruby
         uses: standardrb/standard-ruby-action@eecb3f730879f5b8830705348c2961e5aa26de78 # v1.5.0
         with:
@@ -53,15 +53,15 @@ jobs:
           - 6379:6379
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
+        uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
         with:
           ruby-version: 3.3.4
           bundler-cache: true
@@ -101,15 +101,15 @@ jobs:
           - 6379:6379
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
+        uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
@@ -119,7 +119,7 @@ jobs:
         env:
           STOPLIGHT_REDIS_URL: 'redis://127.0.0.1:6379/0'
       - name: Coveralls
-        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
+        uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           flag-name: ruby-${{ matrix.ruby }}
@@ -131,12 +131,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # master
+        uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2

.github/workflows/release.yml

@@ -18,15 +18,15 @@ jobs:
       version: ${{ steps.version.outputs.version }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
+        uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
         with:
           bundler-cache: true
           ruby-version: ruby
@@ -49,15 +49,15 @@ jobs:
       contents: read
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Checkout Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
       - name: Checkout release
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           ref: refs/tags/${{ needs.gem.outputs.version }}
       - name: Login to Docker Hub

Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    stoplight (5.6.0)
+    stoplight (5.7.0)
+      concurrent-ruby
       zeitwerk
 
 GEM
@@ -49,7 +50,7 @@ GEM
     concurrent-ruby (1.3.5)
     concurrent-ruby-ext (1.3.5)
       concurrent-ruby (= 1.3.5)
-    connection_pool (2.5.4)
+    connection_pool (2.5.5)
     crass (1.0.6)
     cucumber (10.1.1)
       base64 (~> 0.2)
@@ -97,7 +98,7 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.13.2)
+    json (2.16.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -117,13 +118,13 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.5.1)
+    prism (1.6.0)
     psych (5.2.6)
       date
       stringio
@@ -167,7 +168,7 @@ GEM
       redis-client (>= 0.22.0)
     redis-client (0.25.1)
       connection_pool
-    regexp_parser (2.11.2)
+    regexp_parser (2.11.3)
     reline (0.6.1)
       io-console (~> 0.5)
     rspec (3.13.2)
@@ -191,18 +192,18 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.6)
-    rubocop (1.80.2)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.25.0)
@@ -234,10 +235,10 @@ GEM
       rack-protection (= 4.2.1)
       sinatra (= 4.2.1)
       tilt (~> 2.0)
-    standard (1.51.1)
+    standard (1.52.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.80.2)
+      rubocop (~> 1.81.7)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)

docs/architecture.md

@@ -309,26 +309,26 @@ end
 **Contains:**
 - Dependency injection container
 - Factory classes for creating configured objects
-- Fail-safe wrappers for resilience
 - Public API composition
 
 **Rules:**
 - Composes domain and infrastructure components
-- Provides fail-safe wrappers
 - Handles configuration and defaults
 - Should not contain business logic
 - Bridges between layers
 
 Example:
+
 ```ruby
+
 module Stoplight
   module Wiring
     # Compose dependencies
     class LightFactory
       def build_with(name:, data_store:, notifiers:, **config)
-        safe_data_store = FailSafeDataStore.wrap(data_store)
-        safe_notifiers = notifiers.map { FailSafeNotifier.wrap(_1) }
-        
+        safe_data_store = DataStoreFactory.create(data_store)
+        safe_notifiers = notifiers.map { NotifierFactory.create(_1) }
+
         # Build domain object
         Domain::Light.new(
           config: Domain::Config.new(name:, **config),

lib/stoplight.rb

@@ -55,8 +55,10 @@ def configure(trust_me_im_an_engineer: false)
         factory_builder = Wiring::DefaultFactoryBuilder.new
         yield factory_builder.configuration if block_given?
 
+        default_light_factory = factory_builder.build
+        default_light_factory.validate_configuration!
         @default_configuration = factory_builder.configuration
-        @default_light_factory = factory_builder.build
+        @default_light_factory = default_light_factory
       end
     end
 
@@ -67,7 +69,7 @@ def configure(trust_me_im_an_engineer: false)
     # @return [Stoplight::Light]
     # @api private
     def system_light(name, **settings)
-      Wiring::SystemLightFactory.build_with(name: "__stoplight__#{name}", **settings)
+      Wiring::LightFactory.new.with(name: "__stoplight__#{name}", **settings).build
     end
 
     # Create a Light with the user default configuration.
@@ -121,7 +123,6 @@ def __stoplight__default_configuration
 # @param settings [Hash] Optional settings to configure the circuit breaker.
 #   @option settings [Numeric] :cool_off_time The time to wait before resetting the circuit breaker.
 #   @option settings [Stoplight::DataStore::Base] :data_store The data store to use for storing state.
-#   @option settings [Proc] :error_notifier A proc to handle error notifications.
 #   @option settings [Array<Stoplight::Notifier::Base>] :notifiers A list of notifiers to use.
 #   @option settings [Numeric] :threshold The failure threshold to trip the circuit breaker.
 #   @option settings [Numeric] :window_size The size of the rolling window for failure tracking.
@@ -161,5 +162,19 @@ def __stoplight__default_configuration
 #   light = Stoplight("Payment API", traffic_control: :error_rate, threshold: 0.666, window_size: 300)
 #
 def Stoplight(name, **settings) # rubocop:disable Naming/MethodName
+  Stoplight::Common::Deprecations.deprecate(<<~MSG) if settings.include?(:error_notifier)
+    Passing "error_notifier" to Stoplight('#{name}') is deprecated and will be removed in v6.0.0.
+
+    IMPORTANT: The `error_notifier` is NOT called for exceptions in your protected code.
+    It only reports internal Stoplight failures (e.g., Redis connection errors).
+
+    To fix: Move `error_notifier` to global configuration:
+
+      Stoplight.configure do |config|
+        config.error_notifier = ->(error) { Logger.warn(error) }
+      end
+
+    See: https://github.com/bolshakov/stoplight#error-notifiers
+  MSG
   Stoplight.light(name, **settings)
 end

lib/stoplight/admin.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "cgi" # Ruby 3.2 needs this
+require "cgi/escape"
+require "cgi/util" if RUBY_VERSION < "3.5"
 
 begin
   require "sinatra/base"

lib/stoplight/admin/dependencies.rb

@@ -8,7 +8,7 @@ class Dependencies
       attr_reader :data_store
       private :data_store
 
-      # @param data_store [Stoplight::DataStore::Base]
+      # @param data_store [Stoplight::Domain::DataStore]
       def initialize(data_store:)
         @data_store = data_store
       end

lib/stoplight/admin/helpers.rb

@@ -15,11 +15,16 @@ def dependencies
       end
 
       private def data_store
-        settings.data_store.tap do |data_store|
-          if data_store.is_a?(Stoplight::DataStore::Memory)
-            raise "Stoplight Admin requires a persistent data store, but the current data store is Memory. " \
-              "Please configure a different data store in your Stoplight configuration."
-          end
+        if settings.data_store.is_a?(Stoplight::DataStore::Memory)
+          raise "Stoplight Admin requires a persistent data store, but the current data store is Memory. " \
+            "Please configure a different data store in your Stoplight configuration."
+        else
+          Stoplight::Wiring::LightBuilder.new(
+            {
+              data_store: settings.data_store,
+              config: Wiring::Light::DefaultConfig
+            }
+          ).__send__(:data_store)
         end
       end
     end