dry-system 0.25.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ee8640692f53a8c0a9a29fd59bfe5595a269b3680d4a8f71d630e87ed2398b9
-  data.tar.gz: 435806646f338c4bdec369ae98fc29f451bb6a5dbe38bc2f20d7c3cb422b4223
+  metadata.gz: 84621f047b9ae5be5233f099d1031bf5241c8694bd965884d161ce5f5b6ee079
+  data.tar.gz: be2f0f633dcbea09059608ed3dde19a0cb7d89b7d3f1b9e5484e780eb438f3d0
 SHA512:
-  metadata.gz: 90130f6f367b24a1b45fd6be2915efe9d0c9e22b676e03b3a827ea7e9d02accca210272c8f5cd330993f2ea378ca2674ffc9281f7d695b14b7acb6f4d0a24c6d
-  data.tar.gz: 30cb6a24cb9e12cbd259223d0b861f837b692e139b21f95e1dfdd6b0365129e37377153151bce0cda8b9171249507ff458e4239ac61df0200c7144063381c0ad
+  metadata.gz: 9b5fc46ed7af654f4abc07cf95815ccfac84a44ed7ea76cc20d4253092ca78f82aa6ab5d66769ccbbe2f94937e536fa90f8156b2fbabd83466e59a6bbda098eb
+  data.tar.gz: d727819c4894eff4b5b095b33c27da01952643c7fed843321bca02e6e622c519a200b6a2f71cfe137003ef42cecb36b17a460005f291793816af10e1ad7a6475

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.27.0 2022-10-15
+
+
+### Changed
+
+- Use zeitwerk for auto-loading dry-system (@flash-gordon + @solnic)
+
+[Compare v0.26.0...v0.27.0](https://github.com/dry-rb/dry-system/compare/v0.26.0...v0.27.0)
+
+## 0.26.0 2022-10-08
+
+
+### Changed
+
+- Update dry-configurable dependency to 0.16.0 and make internal adjustments to suit (@timriley in #249)
+- Remove now-unused concurrent-ruby gem dependency (@timriley in #250)
+
+[Compare v0.25.0...v0.26.0](https://github.com/dry-rb/dry-system/compare/v0.25.0...v0.26.0)
+
 ## 0.25.0 2022-07-10
 
 

data/dry-system.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
   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-configurable", "~> 0.16", ">= 0.16.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-core", "~> 0.9", ">= 0.9.0"
   spec.add_runtime_dependency "dry-inflector", "~> 0.1", ">= 0.1.2"
 
   spec.add_development_dependency "bundler"

data/lib/dry/system/auto_registrar.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/system/constants"
-require_relative "component"
 
 module Dry
   module System

data/lib/dry/system/component.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-require "concurrent/map"
-
-require "dry/core/equalizer"
+require "pathname"
 require "dry/inflector"
-require "dry/system/loader"
 require "dry/system/errors"
 require "dry/system/constants"
-require "pathname"
-require_relative "identifier"
 
 module Dry
   module System

data/lib/dry/system/component_dir.rb

@@ -2,9 +2,6 @@
 
 require "pathname"
 require "dry/system/constants"
-require_relative "constants"
-require_relative "identifier"
-require_relative "magic_comments_parser"
 
 module Dry
   module System

data/lib/dry/system/components.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 Dry::Core::Deprecations.announce(
   "require \"dry/system/components\"",
   "Use `require \"dry/system/provider_sources\"` instead",

data/lib/dry/system/config/component_dir.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/deprecations"
 require "dry/system/constants"
-require "dry/system/loader"
-require_relative "namespaces"
 
 module Dry
   module System
@@ -247,30 +243,6 @@ module Dry
           !!config.auto_register
         end
 
-        # Returns true if the given setting has been explicitly configured by the user
-        #
-        # This is used when determining whether to apply system-wide default values to a
-        # component dir (explicitly configured settings will not be overridden by
-        # defaults)
-        #
-        # @param key [Symbol] the setting name
-        #
-        # @return [Boolean]
-        #
-        # @see Dry::System::Config::ComponentDirs#apply_defaults_to_dir
-        # @api private
-        def configured?(key)
-          case key
-          when :namespaces
-            # Because we mutate the default value for the `namespaces` setting, rather
-            # than assign a new one, to check if it's configured we must see whether any
-            # namespaces have been added
-            !config.namespaces.empty?
-          else
-            config._settings[key].input_defined?
-          end
-        end
-
         private
 
         def method_missing(name, *args, &block)

data/lib/dry/system/config/component_dirs.rb

@@ -2,7 +2,6 @@
 
 require "dry/system/constants"
 require "dry/system/errors"
-require_relative "component_dir"
 
 module Dry
   module System

data/lib/dry/system/config/namespace.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
 require "dry/system/constants"
 
 module Dry

data/lib/dry/system/config/namespaces.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
 require "dry/system/errors"
-require_relative "namespace"
 
 module Dry
   module System
@@ -13,6 +11,8 @@ module Dry
       #
       # @api private
       class Namespaces
+        include Dry::Equalizer(:namespaces)
+
         # @api private
         attr_reader :namespaces
 

data/lib/dry/system/constants.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/constants"
-
 module Dry
   module System
     include Dry::Core::Constants

data/lib/dry/system/container.rb

@@ -5,25 +5,8 @@ require "pathname"
 require "dry/configurable"
 require "dry/auto_inject"
 require "dry/container"
-require "dry/core/deprecations"
 require "dry/inflector"
 
-require "dry/system/auto_registrar"
-require "dry/system/component"
-require "dry/system/constants"
-require "dry/system/errors"
-require "dry/system/identifier"
-require "dry/system/importer"
-require "dry/system/indirect_component"
-require "dry/system/manifest_registrar"
-require "dry/system/plugins"
-require "dry/system/provider_registrar"
-require "dry/system/provider"
-require "dry/system/provider/source"
-
-require_relative "component_dir"
-require_relative "config/component_dirs"
-
 module Dry
   module System
     # Abstract container class to inherit from
@@ -86,8 +69,7 @@ module Dry
       setting :provider_registrar, default: Dry::System::ProviderRegistrar
       setting :importer, default: Dry::System::Importer
 
-      # We presume "." as key namespace separator. This is not intended to be
-      # user-configurable.
+      # Expect "." as key namespace separator. This is not intended to be user-configurable.
       config.namespace_separator = KEY_SEPARATOR
 
       class << self
@@ -127,14 +109,7 @@ module Dry
         # @api public
         def configure(finalize_config: true, &block)
           super(&block)
-
-          unless configured?
-            hooks[:after_configure].each { |hook| instance_eval(&hook) }
-            config.finalize! if finalize_config
-            @__configured__ = true
-          end
-
-          self
+          configured!(finalize_config: finalize_config)
         end
 
         # Marks the container as configured, runs the after-`configured` hooks, then
@@ -156,12 +131,19 @@ module Dry
           return self if configured?
 
           hooks[:after_configure].each { |hook| instance_eval(&hook) }
-          config.finalize! if finalize_config
+
+          _configurable_finalize! if finalize_config
+
           @__configured__ = true
 
           self
         end
 
+        # Finalizes the config for this container
+        #
+        # @api private
+        alias_method :_configurable_finalize!, :finalize!
+
         def configured?
           @__configured__.equal?(true)
         end

data/lib/dry/system/errors.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module System
     extend Dry::Core::Deprecations["dry-system"]

data/lib/dry/system/identifier.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require_relative "constants"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/importer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/container"
-require_relative "constants"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/indirect_component.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 module Dry
   module System
     # An indirect component is a component that cannot be directly from a source file

data/lib/dry/system/loader/autoloading.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../loader"
-
 module Dry
   module System
     class Loader

data/lib/dry/system/plugins/plugin.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Dry
+  module System
+    module Plugins
+      # @api private
+      class Plugin
+        attr_reader :name
+
+        attr_reader :mod
+
+        attr_reader :block
+
+        # @api private
+        def initialize(name, mod, &block)
+          @name = name
+          @mod = mod
+          @block = block
+        end
+
+        # @api private
+        def apply_to(system, **options)
+          system.extend(stateful? ? mod.new(**options) : mod)
+          system.instance_eval(&block) if block
+          system
+        end
+
+        # @api private
+        def load_dependencies(dependencies = mod_dependencies, gem = nil)
+          Array(dependencies).each do |dependency|
+            if dependency.is_a?(Array) || dependency.is_a?(Hash)
+              dependency.each { |value| load_dependencies(*Array(value).reverse) }
+            elsif !Plugins.loaded_dependencies.include?(dependency.to_s)
+              load_dependency(dependency, gem)
+            end
+          end
+        end
+
+        # @api private
+        def load_dependency(dependency, gem)
+          Kernel.require dependency
+          Plugins.loaded_dependencies << dependency.to_s
+        rescue LoadError => e
+          raise PluginDependencyMissing.new(name, e.message, gem)
+        end
+
+        # @api private
+        def stateful?
+          mod < Module
+        end
+
+        # @api private
+        def mod_dependencies
+          return EMPTY_ARRAY unless mod.respond_to?(:dependencies)
+
+          mod.dependencies.is_a?(Array) ? mod.dependencies : [mod.dependencies]
+        end
+      end
+    end
+  end
+end

data/lib/dry/system/plugins.rb

@@ -1,64 +1,8 @@
 # frozen_string_literal: true
 
-require "dry/system/constants"
-
 module Dry
   module System
     module Plugins
-      # @api private
-      class Plugin
-        attr_reader :name
-
-        attr_reader :mod
-
-        attr_reader :block
-
-        # @api private
-        def initialize(name, mod, &block)
-          @name = name
-          @mod = mod
-          @block = block
-        end
-
-        # @api private
-        def apply_to(system, **options)
-          system.extend(stateful? ? mod.new(**options) : mod)
-          system.instance_eval(&block) if block
-          system
-        end
-
-        # @api private
-        def load_dependencies(dependencies = mod_dependencies, gem = nil)
-          Array(dependencies).each do |dependency|
-            if dependency.is_a?(Array) || dependency.is_a?(Hash)
-              dependency.each { |value| load_dependencies(*Array(value).reverse) }
-            elsif !Plugins.loaded_dependencies.include?(dependency.to_s)
-              load_dependency(dependency, gem)
-            end
-          end
-        end
-
-        # @api private
-        def load_dependency(dependency, gem)
-          Kernel.require dependency
-          Plugins.loaded_dependencies << dependency.to_s
-        rescue LoadError => e
-          raise PluginDependencyMissing.new(name, e.message, gem)
-        end
-
-        # @api private
-        def stateful?
-          mod < Module
-        end
-
-        # @api private
-        def mod_dependencies
-          return EMPTY_ARRAY unless mod.respond_to?(:dependencies)
-
-          mod.dependencies.is_a?(Array) ? mod.dependencies : [mod.dependencies]
-        end
-      end
-
       # Register a plugin
       #
       # @param [Symbol] name The name of a plugin
@@ -93,7 +37,7 @@ module Dry
       def use(name, **options)
         return self if enabled_plugins.include?(name)
 
-        raise PluginNotFoundError, name unless (plugin = Plugins.registry[name])
+        raise PluginNotFoundError, name unless (plugin = Dry::System::Plugins.registry[name])
 
         plugin.load_dependencies
         plugin.apply_to(self, **options)

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/class_attributes"
-require "dry/core/deprecations"
 require_relative "source_dsl"
 
 module Dry

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module System
     class Provider

data/lib/dry/system/provider.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require_relative "constants"
-require_relative "provider/source"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/provider_registrar.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require "dry/system"
 require "pathname"
-require_relative "errors"
-require_relative "constants"
-require_relative "provider"
+
+require "dry/system/errors"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/provider_source_registry.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require_relative "constants"
-require_relative "provider/source"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/provider_sources/settings/config.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/deprecations"
-require_relative "loader"
-
 module Dry
   module System
     module ProviderSources

data/lib/dry/system/provider_sources/settings/loader.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/deprecations"
-
 module Dry
   module System
     module ProviderSources

data/lib/dry/system/version.rb

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

data/lib/dry/system.rb

@@ -1,10 +1,25 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require_relative "system/provider_source_registry"
+require "zeitwerk"
+require "dry/core"
 
 module Dry
   module System
+    # @api private
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-system"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-system.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-system.rb",
+          "#{root}/dry/system/{constants,errors,stubs,version}.rb"
+        )
+        loader.inflector.inflect("dsl" => "DSL")
+      end
+    end
+
     # Registers the provider sources in the files under the given path
     #
     # @api public
@@ -58,5 +73,7 @@ module Dry
     def self.provider_sources
       @provider_sources ||= ProviderSourceRegistry.new
     end
+
+    loader.setup
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-10 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -84,20 +84,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - lib/dry/system/plugins/monitoring.rb
 - lib/dry/system/plugins/monitoring/proxy.rb
 - lib/dry/system/plugins/notifications.rb
+- lib/dry/system/plugins/plugin.rb
 - lib/dry/system/plugins/zeitwerk.rb
 - lib/dry/system/plugins/zeitwerk/compat_inflector.rb
 - lib/dry/system/provider.rb