dry-system 1.1.0.beta1 → 1.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0772f1a642fb7e44cdafda2659b417fec6f8d583c14098751a94d1163c9c5571
-  data.tar.gz: 37a2e8c32bff3b24b1ff47f7bdb5095057dc5d7283327a3eab7c1424964c9f08
+  metadata.gz: 432379faf1a5f4a181f7bc5c729ce9eb337818c7bd882a6742565fb032ebc3ce
+  data.tar.gz: 813b6ea310a5125199f636080e7c3c122b7c66018972b434e4262bbe2048b5fe
 SHA512:
-  metadata.gz: bb137a83e1fa1eba5578255c6535282edfee7608faf4dbe9771d4dfda4cafbeeef167bb970c986b86e5a1e34162275ca63d796bf1d53148148df2dc835f2db80
-  data.tar.gz: 42c3050148a8de2e63376642ca4be35f6726b8462d708935ecb206d353ff0f6bf3b45a47e38b8440c368a88592933973705756de81cfd5be7066e0b41ff6d785
+  metadata.gz: e440c87a5df03645d15189f35b4a73988088849038fee92b1f48803f33789a1bfd639658d6361b95c1edd1ee89d6e6a3dfbbb0b1ef6af5ae7836a85c031520ad
+  data.tar.gz: e4d2a8d500c320975c3f67ff849aef9ba518852111929c7953ad4865ec70d2feb9eff1fa39de2854664b7a3f9ceea033bf4085b7581543a4148d60c9d8db663a

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.1.0.beta2 2024-09-25
+
+
+### Changed
+
+- Allow provider sources to use a custom superclass. This requires a custom provider registrar
+to be configured, with its own implementations of `#provider_source_class` (the superclass to
+use) and `#provider_source_options` (custom initialization args to pass to the provider
+source). (via #275) (@alassek, @timriley)
+
+[Compare v1.1.0.beta1...v1.1.0.beta2](https://github.com/dry-rb/dry-system/compare/v1.1.0.beta1...v1.1.0.beta2)
+
 ## 1.1.0.beta1 2024-07-03
 
 

data/lib/dry/system/provider/source.rb

@@ -37,10 +37,20 @@ module Dry
           # @see Dry::System::Provider::SourceDSL
           #
           # @api private
-          def for(name:, group: nil, &block)
-            Class.new(self) { |klass|
+          def for(name:, group: nil, superclass: nil, &block)
+            superclass ||= self
+
+            Class.new(superclass) { |klass|
               klass.source_name name
               klass.source_group group
+
+              name_with_group = group ? "#{group}->#{name}" : name
+              klass.instance_eval <<~RUBY, __FILE__, __LINE__ + 1
+                def name
+                  "#{superclass.name}[#{name_with_group}]"
+                end
+              RUBY
+
               SourceDSL.evaluate(klass, &block) if block
             }
           end
@@ -58,14 +68,6 @@ module Dry
             end
           end
 
-          # @api private
-          def name
-            source_str = source_name
-            source_str = "#{source_group}->#{source_str}" if source_group
-
-            "Dry::System::Provider::Source[#{source_str}]"
-          end
-
           # @api private
           def to_s
             "#<#{name}>"
@@ -117,7 +119,10 @@ module Dry
         #
         # @api public
         attr_reader :target_container
-        alias_method :target, :target_container
+
+        # @see #target_container
+        # @api public
+        def target = target_container
 
         # @api private
         def initialize(provider_container:, target_container:, &block)

data/lib/dry/system/provider.rb

@@ -127,7 +127,8 @@ module Dry
       attr_reader :source
 
       # @api private
-      def initialize(name:, namespace: nil, target_container:, source_class:, &block) # rubocop:disable Style/KeywordParametersOrder
+      # rubocop:disable Layout/LineLength, Style/KeywordParametersOrder
+      def initialize(name:, namespace: nil, target_container:, source_class:, source_options: {}, &block)
         @name = name
         @namespace = namespace
         @target_container = target_container
@@ -137,11 +138,13 @@ module Dry
         @step_running = nil
 
         @source = source_class.new(
+          **source_options,
           provider_container: provider_container,
           target_container: target_container,
           &block
         )
       end
+      # rubocop:enable Layout/LineLength, Style/KeywordParametersOrder
 
       # Runs the `prepare` lifecycle step.
       #

data/lib/dry/system/provider_registrar.rb

@@ -136,6 +136,21 @@ module Dry
         }.first
       end
 
+      # Extension point for subclasses to customize their
+      # provider source superclass. Expected to be a subclass
+      # of Dry::System::Provider::Source
+      #
+      # @api public
+      # @since 1.1.0
+      def provider_source_class = Dry::System::Provider::Source
+
+      # Extension point for subclasses to customize initialization
+      # params for provider_source_class
+      #
+      # @api public
+      # @since 1.1.0
+      def provider_source_options = {}
+
       # @api private
       def finalize!
         provider_files.each do |path|
@@ -196,25 +211,45 @@ module Dry
       end
 
       def build_provider(name, options:, source: nil, &block)
-        source_class = source || Provider::Source.for(name: name, &block)
+        source_class = source || Provider::Source.for(
+          name: name,
+          superclass: provider_source_class,
+          &block
+        )
+
+        source_options =
+          if source_class < provider_source_class
+            provider_source_options
+          else
+            {}
+          end
 
         Provider.new(
           **options,
           name: name,
           target_container: target_container,
-          source_class: source_class
+          source_class: source_class,
+          source_options: source_options
         )
       end
 
       def build_provider_from_source(name, source:, group:, options:, &block)
         provider_source = System.provider_sources.resolve(name: source, group: group)
 
+        source_options =
+          if provider_source.source <= provider_source_class
+            provider_source_options
+          else
+            {}
+          end
+
         Provider.new(
           **provider_source.provider_options,
           **options,
           name: name,
           target_container: target_container,
           source_class: provider_source.source,
+          source_options: source_options,
           &block
         )
       end

data/lib/dry/system/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module System
-    VERSION = "1.1.0.beta1"
+    VERSION = "1.1.0.beta2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta1
+  version: 1.1.0.beta2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject