dry-system 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374dd39e2ef3e67b1a337af6d71aed0ebb5de9ebb31e8a16072ce37170576e88
-  data.tar.gz: 8c3fc432ccaba83593018b09cf0d24f9d2c145057a18b9266c49dc8f5919ed8e
+  metadata.gz: 7ee8640692f53a8c0a9a29fd59bfe5595a269b3680d4a8f71d630e87ed2398b9
+  data.tar.gz: 435806646f338c4bdec369ae98fc29f451bb6a5dbe38bc2f20d7c3cb422b4223
 SHA512:
-  metadata.gz: 9d855078f7dff3cd01a23e5cbfca252c3b801d2d7b3406d9c12038c01268de6c334c59c97e3d14ae333b5e2a76c6bde90d0c4b57bcc43c8310e1e9b41796e1be
-  data.tar.gz: 2bf41708e4da839a1ba447231e32313ecb77acaad87499a85394c2d39f1cea6bc4f3b5581cb25de806ece5621734874354e82a1edb94bf26b89a890a5904db00
+  metadata.gz: 90130f6f367b24a1b45fd6be2915efe9d0c9e22b676e03b3a827ea7e9d02accca210272c8f5cd330993f2ea378ca2674ffc9281f7d695b14b7acb6f4d0a24c6d
+  data.tar.gz: 30cb6a24cb9e12cbd259223d0b861f837b692e139b21f95e1dfdd6b0365129e37377153151bce0cda8b9171249507ff458e4239ac61df0200c7144063381c0ad

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.25.0 2022-07-10
+
+
+### Fixed
+
+- Fix incorrect type in `ManifestRegistrar#finalize!` (@alassek)
+
+### Changed
+
+- Import root components via `nil` import namespace (via #236) (@timriley)
+- Allow deeper `Provider::Source` hierarchies (via #240) (@timriley + @solnic)
+- Prefer local components when importing (via #241) (@timriley  + @solnic)
+
+[Compare v0.24.0...v0.25.0](https://github.com/dry-rb/dry-system/compare/v0.24.0...v0.25.0)
+
 ## 0.24.0 
 
 

data/dry-system.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "dry-auto_inject", ">= 0.4.0"
   spec.add_runtime_dependency "dry-configurable", "~> 0.14", ">= 0.14.0"
-  spec.add_runtime_dependency "dry-container", "~> 0.9", ">= 0.9.0"
+  spec.add_runtime_dependency "dry-container", "~> 0.10", ">= 0.10.0"
   spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
   spec.add_runtime_dependency "dry-inflector", "~> 0.1", ">= 0.1.2"
 

data/lib/dry/system/component.rb

@@ -7,6 +7,7 @@ require "dry/inflector"
 require "dry/system/loader"
 require "dry/system/errors"
 require "dry/system/constants"
+require "pathname"
 require_relative "identifier"
 
 module Dry
@@ -17,7 +18,7 @@ module Dry
     #
     # @api public
     class Component
-      include Dry::Equalizer(:identifier, :namespace, :options)
+      include Dry::Equalizer(:identifier, :file_path, :namespace, :options)
 
       DEFAULT_OPTIONS = {
         inflector: Dry::Inflector.new,
@@ -28,6 +29,10 @@ module Dry
       #   @return [String] the component's unique identifier
       attr_reader :identifier
 
+      # @!attribute [r] file_path
+      #   @return [Pathname] the component's source file path
+      attr_reader :file_path
+
       # @!attribute [r] namespace
       #   @return [Dry::System::Config::Namespace] the component's namespace
       attr_reader :namespace
@@ -37,8 +42,9 @@ module Dry
       attr_reader :options
 
       # @api private
-      def initialize(identifier, namespace:, **options)
+      def initialize(identifier, file_path:, namespace:, **options)
         @identifier = identifier
+        @file_path = Pathname(file_path)
         @namespace = namespace
         @options = DEFAULT_OPTIONS.merge(options)
       end

data/lib/dry/system/component_dir.rb

@@ -141,7 +141,12 @@ module Dry
           **MagicCommentsParser.(file_path)
         }
 
-        Component.new(identifier, namespace: namespace, **options)
+        Component.new(
+          identifier,
+          namespace: namespace,
+          file_path: file_path,
+          **options
+        )
       end
 
       def component_options

data/lib/dry/system/container.rb

@@ -2,9 +2,9 @@
 
 require "pathname"
 
-require "dry-auto_inject"
-require "dry-configurable"
-require "dry-container"
+require "dry/configurable"
+require "dry/auto_inject"
+require "dry/container"
 require "dry/core/deprecations"
 require "dry/inflector"
 
@@ -70,12 +70,11 @@ module Dry
     #
     # @api public
     class Container
-      extend Dry::Configurable
       extend Dry::Container::Mixin
       extend Dry::System::Plugins
 
       setting :name
-      setting :root, default: Pathname.pwd.freeze, constructor: -> path { Pathname(path) }
+      setting :root, default: Pathname.pwd.freeze, constructor: ->(path) { Pathname(path) }
       setting :provider_dirs, default: ["system/providers"]
       setting :bootable_dirs # Deprecated for provider_dirs, see .provider_paths below
       setting :registrations_dir, default: "system/registrations"
@@ -193,7 +192,7 @@ module Dry
         # @param other [Hash, Dry::Container::Namespace]
         #
         # @api public
-        def import(keys: nil, from: nil, as: nil, **deprecated_import_hash)
+        def import(keys: nil, from: Undefined, as: Undefined, **deprecated_import_hash)
           if deprecated_import_hash.any?
             Dry::Core::Deprecations.announce(
               "Dry::System::Container.import with {namespace => container} hash",
@@ -206,7 +205,7 @@ module Dry
               importer.register(container: container, namespace: namespace)
             end
             return self
-          elsif from.nil? || as.nil?
+          elsif from == Undefined || as == Undefined
             # These keyword arguments can become properly required in the params list once
             # we remove the deprecation shim above
             raise ArgumentError, "required keyword arguments: :from, :as"
@@ -376,10 +375,10 @@ module Dry
           hooks[:before_finalize].each { |hook| instance_eval(&hook) }
           yield(self) if block
 
-          importer.finalize!
           providers.finalize!
-          manifest_registrar.finalize!
           auto_registrar.finalize!
+          manifest_registrar.finalize!
+          importer.finalize!
 
           @__finalized__ = true
 
@@ -659,6 +658,7 @@ module Dry
 
         protected
 
+        # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
         # @api private
         def load_component(key)
           return self if registered?(key)
@@ -678,11 +678,14 @@ module Dry
           elsif manifest_registrar.file_exists?(component)
             manifest_registrar.(component)
           elsif importer.namespace?(component.identifier.root_key)
-            load_imported_component(component.identifier)
+            load_imported_component(component.identifier, namespace: component.identifier.root_key)
+          elsif importer.namespace?(nil)
+            load_imported_component(component.identifier, namespace: nil)
           end
 
           self
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
         private
 
@@ -692,14 +695,12 @@ module Dry
           end
         end
 
-        def load_imported_component(identifier)
-          import_namespace = identifier.root_key
-
-          return unless importer.namespace?(import_namespace)
+        def load_imported_component(identifier, namespace:)
+          return unless importer.namespace?(namespace)
 
-          import_key = identifier.namespaced(from: import_namespace, to: nil).key
+          import_key = identifier.namespaced(from: namespace, to: nil).key
 
-          importer.import(import_namespace, keys: [import_key])
+          importer.import(namespace, keys: [import_key])
         end
 
         def find_component(key)

data/lib/dry/system/importer.rb

@@ -84,7 +84,7 @@ module Dry
       end
 
       def import_keys(other, namespace, keys)
-        container.merge(build_merge_container(other, keys), namespace: namespace)
+        merge(container, build_merge_container(other, keys), namespace: namespace)
       end
 
       def import_all(other, namespace)
@@ -95,7 +95,14 @@ module Dry
             build_merge_container(other.finalize!, other.keys)
           end
 
-        container.merge(merge_container, namespace: namespace)
+        merge(container, merge_container, namespace: namespace)
+      end
+
+      # Merges `other` into `container`, favoring the container's existing registrations
+      def merge(container, other, namespace:)
+        container.merge(other, namespace: namespace) { |_key, old_item, new_item|
+          old_item || new_item
+        }
       end
 
       def build_merge_container(other, keys)

data/lib/dry/system/manifest_registrar.rb

@@ -27,7 +27,7 @@ module Dry
       # @api private
       def finalize!
         ::Dir[registrations_dir.join(RB_GLOB)].sort.each do |file|
-          call(File.basename(file, RB_EXT))
+          call(Identifier.new(File.basename(file, RB_EXT)))
         end
       end
 

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

@@ -53,9 +53,14 @@ module Dry
           def inherited(subclass)
             super
 
-            # FIXME: This shouldn't _need_ to be in an inherited hook but right now it's
-            # the only way to prevent individual Source instances from sharing settings
-            subclass.include Dry::Configurable
+            # Include Dry::Configurable only when first subclassing to ensure that
+            # distinct Source subclasses do not share settings.
+            #
+            # The superclass check here allows deeper Source class hierarchies to be
+            # created without running into a Dry::Configurable::AlreadyIncluded error.
+            if subclass.superclass == Source
+              subclass.include Dry::Configurable
+            end
           end
 
           # @api private

data/lib/dry/system/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module System
-    VERSION = "0.24.0"
+    VERSION = "0.25.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -64,20 +64,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-system/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-system
   bug_tracker_uri: https://github.com/dry-rb/dry-system/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -236,8 +236,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components
 test_files: []