Add configurable provider_source_class

Also allow provider registrar to pass additional extra options to provider sources when initializing.
dry-rb · Jun 27, 2024 · b80e73c · b80e73c
1 parent f826656
commit b80e73c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/lib/dry/system/container.rb b/lib/dry/system/container.rb
@@ -65,6 +65,7 @@ class Container
       setting :auto_registrar, default: Dry::System::AutoRegistrar
       setting :manifest_registrar, default: Dry::System::ManifestRegistrar
       setting :provider_registrar, default: Dry::System::ProviderRegistrar
+      setting :provider_source_class, default: Dry::System::Provider::Source
       setting :importer, default: Dry::System::Importer
 
       # Expect "." as key namespace separator. This is not intended to be user-configurable.

diff --git a/lib/dry/system/provider.rb b/lib/dry/system/provider.rb
@@ -127,7 +127,7 @@ class Provider
       attr_reader :source
 
       # @api private
-      def initialize(name:, namespace: nil, target_container:, source_class:, &block) # rubocop:disable Style/KeywordParametersOrder
+      def initialize(name:, namespace: nil, target_container:, build_source:) # rubocop:disable Style/KeywordParametersOrder
         @name = name
         @namespace = namespace
         @target_container = target_container
@@ -136,10 +136,9 @@ def initialize(name:, namespace: nil, target_container:, source_class:, &block)
         @statuses = []
         @step_running = nil
 
-        @source = source_class.new(
+        @source = build_source.call(
           provider_container: provider_container,
-          target_container: target_container,
-          &block
+          target_container: target_container
         )
       end
 

diff --git a/lib/dry/system/provider/source.rb b/lib/dry/system/provider/source.rb
@@ -120,7 +120,7 @@ def inspect
         alias_method :target, :target_container
 
         # @api private
-        def initialize(provider_container:, target_container:, &block)
+        def initialize(provider_container:, target_container:, **, &block)
           super()
           @callbacks = {before: CALLBACK_MAP.dup, after: CALLBACK_MAP.dup}
           @provider_container = provider_container

diff --git a/lib/dry/system/provider_registrar.rb b/lib/dry/system/provider_registrar.rb
@@ -196,13 +196,15 @@ def provider_paths
       end
 
       def build_provider(name, options:, source: nil, &block)
-        source_class = source || Provider::Source.for(name: name, &block)
+        source_class = source || container.config.provider_source_class.for(name: name, &block)
 
         Provider.new(
           **options,
           name: name,
           target_container: target_container,
-          source_class: source_class
+          build_source: -> **opts {
+            source_class.new(**provider_source_options, **opts)
+          }
         )
       end
 
@@ -214,11 +216,15 @@ def build_provider_from_source(name, source:, group:, options:, &block)
           **options,
           name: name,
           target_container: target_container,
-          source_class: provider_source.source,
-          &block
+          build_source: -> **opts {
+            provider_source.source.new(**provider_source_options, **opts, &block)
+          }
         )
       end
 
+      # Extension point for subclasses
+      def provider_source_options = {}
+
       def with_provider(provider_name)
         require_provider_file(provider_name) unless providers.key?(provider_name)