dry-system 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 691aea0bf618106d932309794bcf87afa5d84a3c423871342c2ceb39b45a6ce6
-  data.tar.gz: 1ac5655641e9ffd965e3f0b37a199367e7157074a14250745a49925bab0ec517
+  metadata.gz: 75ae2c71ec73569babb52c596854afc53947908e0d6e4043bd7af02395cd3f33
+  data.tar.gz: e60b2a914e0479ec74226a92aa9d6e257c37bc4383d980d838e8ecb18dfe8c3d
 SHA512:
-  metadata.gz: 589e77b1739b554528f13633f93bf61c39f4945067318f08afcc5be5bf0afbc53db137f54d0e1b2202aa45a5f2a3df697564cfc7f208cb3fa043d28b0f174706
-  data.tar.gz: 8271fb82fde50c7bfed6e52da6a58ea90a447ee7097562402cfd38d94823edb29bee835b0e462bc893ddb59ddb76f1d0fe0c9dab99d4cf14062f74082ab0ccdc
+  metadata.gz: 11cff300881fb7e00e2575fcc0c1fc3d3d9e9ae0046035287d2c8aa9df47afca1c5f05abce90224899eb503aaa43b47402fa0a25f6d2c1626246aef31c338489
+  data.tar.gz: 1f28987740aa6cfc5ab97a20039e62d11cc5394d100dcf1df9c94f663577dfd2fdd363bc8dcb9ff67d162f94fffbb413f304d530563044697b8a638de782a746

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.11.0 - 2019-03-22
+
+### Changed
+
+* [BREAKING] `:decorate` plugin was moved from dry-system to dry-container (available in 0.7.0+). To upgrade remove `use :decorate` and change `decorate` calls from `decorate(key, decorator: something)` to `decorate(key, with: something)` (flash-gordon)
+* [internal] Compatibility with dry-struct 0.7.0 and dry-types 0.15.0
+
+[Compare v0.10.1...v0.11.0](https://github.com/dry-rb/dry-system/compare/v0.10.1...v0.11.0)
+
 # 0.10.1 - 2018-07-05
 
 ### Added

data/lib/dry/system/auto_registrar.rb

@@ -35,7 +35,7 @@ module Dry
           next if !component.auto_register? || registration_config.exclude.(component)
 
           container.require_component(component) do
-            register(component.identifier) { registration_config.instance.(component) }
+            register(component.identifier, memoize: registration_config.memoize) { registration_config.instance.(component) }
           end
         end
       end

data/lib/dry/system/auto_registrar/configuration.rb

@@ -16,7 +16,6 @@ module Dry
         def self.setting(name)
           define_method(name) do |&block|
             ivar = "@#{name}"
-
             if block
               instance_variable_set(ivar, block)
             else
@@ -28,10 +27,13 @@ module Dry
         setting :exclude
         setting :instance
 
+        attr_accessor :memoize
+
         # @api private
         def initialize
           @instance = DEFAULT_INSTANCE
           @exclude = FALSE_PROC
+          @memoize = false
         end
       end
     end

data/lib/dry/system/booter.rb

@@ -69,6 +69,15 @@ module Dry
         freeze
       end
 
+      # @api private
+      def shutdown
+        components.each do |component|
+          next unless booted.include?(component)
+
+          stop(component)
+        end
+      end
+
       # @api private
       def init(name_or_component)
         with_component(name_or_component) do |component|
@@ -100,7 +109,10 @@ module Dry
       def stop(name_or_component)
         call(name_or_component) do |component|
           raise ComponentNotStartedError.new(name_or_component) unless booted.include?(component)
+
           component.stop
+          booted.delete(component)
+
           yield if block_given?
         end
       end

data/lib/dry/system/constants.rb

@@ -25,7 +25,7 @@ module Dry
       private
 
       def attributes_errors(attributes)
-        attributes.map { |key, error| "#{key}: #{error}" }
+        attributes.map { |key, error| "#{key.name}: #{error}" }
       end
     end
 

data/lib/dry/system/container.rb

@@ -304,6 +304,7 @@ module Dry
           @__finalized__ = true
 
           self.freeze if freeze
+          self
         end
 
         # Boots a specific component
@@ -356,6 +357,11 @@ module Dry
           self
         end
 
+        def shutdown!
+          booter.shutdown
+          self
+        end
+
         # Sets load paths relative to the container's root dir
         #
         # @example
@@ -556,11 +562,22 @@ module Dry
             raise FileNotFoundError, component
           end
 
-          require component.path
+          require_path(component.path)
 
           yield
         end
 
+        # Allows subclasses to use a different strategy for required files.
+        #
+        # E.g. apps that use `ActiveSupport::Dependencies::Loadable#require_dependency`
+        # will override this method to allow container managed dependencies to be reloaded
+        # for non-finalized containers.
+        #
+        # @api private
+        def require_path(path)
+          require path
+        end
+
         # @api private
         def load_component(key)
           return self if key?(key)

data/lib/dry/system/importer.rb

@@ -27,6 +27,7 @@ module Dry
         registry.each do |name, container|
           call(name, container.finalize!)
         end
+        self
       end
 
       # @api private

data/lib/dry/system/plugins.rb

@@ -111,9 +111,6 @@ module Dry
       require 'dry/system/plugins/env'
       register(:env, Plugins::Env)
 
-      require 'dry/system/plugins/decorate'
-      register(:decorate, Plugins::Decorate)
-
       require 'dry/system/plugins/notifications'
       register(:notifications, Plugins::Notifications)
 

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

@@ -10,7 +10,6 @@ module Dry
         def self.extended(system)
           super
 
-          system.use(:decorate)
           system.use(:notifications)
 
           system.after(:configure) do
@@ -36,7 +35,7 @@ module Dry
               end
             end
 
-            decorate(key, decorator: proxy.new(target, notifications))
+            decorate(key, with: proxy.new(target, notifications))
           end
         end
       end

data/lib/dry/system/settings.rb

@@ -42,11 +42,11 @@ module Dry
           attributes = {}
           errors = {}
 
-          schema.each do |key, type|
-            value = ENV.fetch(key.to_s.upcase) { env_data[key.to_s.upcase] }
-            type_check = type.try(value || Undefined)
+          schema.each do |key|
+            value = ENV.fetch(key.name.to_s.upcase) { env_data[key.name.to_s.upcase] }
+            type_check = key.try(value || Undefined)
 
-            attributes[key] = value if value
+            attributes[key.name] = value if value
             errors[key] = type_check if type_check.failure?
           end
 

data/lib/dry/system/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module System
-    VERSION = '0.10.1'.freeze
+    VERSION = '0.11.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -56,36 +56,36 @@ dependencies:
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,6 @@ files:
 - lib/dry/system/components/bootable.rb
 - lib/dry/system/components/config.rb
 - lib/dry/system/constants.rb
-- lib/dry/system/container.mod.rb
 - lib/dry/system/container.rb
 - lib/dry/system/errors.rb
 - lib/dry/system/importer.rb
@@ -207,7 +206,6 @@ files:
 - lib/dry/system/manual_registrar.rb
 - lib/dry/system/plugins.rb
 - lib/dry/system/plugins/bootsnap.rb
-- lib/dry/system/plugins/decorate.rb
 - lib/dry/system/plugins/env.rb
 - lib/dry/system/plugins/logging.rb
 - lib/dry/system/plugins/monitoring.rb
@@ -233,15 +231,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components

data/lib/dry/system/container.mod.rb

@@ -1,664 +0,0 @@
-require 'pathname'
-
-require 'dry-auto_inject'
-require 'dry-configurable'
-require 'dry-container'
-require 'dry/inflector'
-
-require 'dry/core/deprecations'
-
-require 'dry/system'
-require 'dry/system/errors'
-require 'dry/system/loader'
-require 'dry/system/booter'
-require 'dry/system/auto_registrar'
-require 'dry/system/manual_registrar'
-require 'dry/system/importer'
-require 'dry/system/component'
-require 'dry/system/constants'
-require 'dry/system/plugins'
-
-module Dry
-  module System
-    # Abstract container class to inherit from
-    #
-    # Container class is treated as a global registry with all system components.
-    # Container can also import dependencies from other containers, which is
-    # useful in complex systems that are split into sub-systems.
-    #
-    # Container can be finalized, which triggers loading of all the defined
-    # components within a system, after finalization it becomes frozen. This
-    # typically happens in cases like booting a web application.
-    #
-    # Before finalization, Container can lazy-load components on demand. A
-    # component can be a simple class defined in a single file, or a complex
-    # component which has init/start/stop lifecycle, and it's defined in a boot
-    # file. Components which specify their dependencies using Import module can
-    # be safely required in complete isolation, and Container will resolve and
-    # load these dependencies automatically.
-    #
-    # Furthermore, Container supports auto-registering components based on
-    # dir/file naming conventions. This reduces a lot of boilerplate code as all
-    # you have to do is to put your classes under configured directories and
-    # their instances will be automatically registered within a container.
-    #
-    # Every container needs to be configured with following settings:
-    #
-    # * `:name` - a unique container identifier
-    # * `:root` - a system root directory (defaults to `pwd`)
-    # * `:system_dir` - directory name relative to root, where bootable components
-    #                 can be defined in `boot` dir this defaults to `system`
-    #
-    # @example
-    #   class MyApp < Dry::System::Container
-    #     configure do |config|
-    #       config.name = :my_app
-    #
-    #       # this will auto-register classes from 'lib/components'. ie if you add
-    #       # `lib/components/repo.rb` which defines `Repo` class, then it's
-    #       # instance will be automatically available as `MyApp['repo']`
-    #       config.auto_register = %w(lib/components)
-    #     end
-    #
-    #     # this will configure $LOAD_PATH to include your `lib` dir
-    #     load_paths!('lib')
-    #   end
-    #
-    # @api public
-    class Container
-      extend Dry::Configurable
-      extend Dry::Container::Mixin
-      extend Dry::System::Plugins
-
-      setting :name
-      setting :default_namespace
-      setting(:root, Pathname.pwd.freeze) { |path| Pathname(path) }
-      setting :system_dir, 'system'.freeze
-      setting :registrations_dir, 'container'.freeze
-      setting :auto_register, []
-      setting :inflector, Dry::Inflector.new
-      setting :loader, Dry::System::Loader
-      setting :booter, Dry::System::Booter
-      setting :auto_registrar, Dry::System::AutoRegistrar
-      setting :manual_registrar, Dry::System::ManualRegistrar
-      setting :importer, Dry::System::Importer
-      setting(:components, {}, reader: true) { |v| v.dup }
-
-      class << self
-        extend Dry::Core::Deprecations['Dry::System::Container']
-
-        # Configures the container
-        #
-        # @example
-        #   class MyApp < Dry::System::Container
-        #     configure do |config|
-        #       config.root = Pathname("/path/to/app")
-        #       config.name = :my_app
-        #       config.auto_register = %w(lib/apis lib/core)
-        #     end
-        #   end
-        #
-        # @return [self]
-        #
-        # @api public
-        def configure(&block)
-          super(&block)
-          load_paths!(config.system_dir)
-          hooks[:configure].each { |hook| instance_eval(&hook) }
-          self
-        end
-
-        # Registers another container for import
-        #
-        # @example
-        #   # system/container.rb
-        #   class Core < Dry::System::Container
-        #     configure do |config|
-        #       config.root = Pathname("/path/to/app")
-        #       config.auto_register = %w(lib/apis lib/core)
-        #     end
-        #   end
-        #
-        #   # apps/my_app/system/container.rb
-        #   require 'system/container'
-        #
-        #   class MyApp < Dry::System::Container
-        #     configure do |config|
-        #       config.root = Pathname("/path/to/app")
-        #       config.auto_register = %w(lib/apis lib/core)
-        #     end
-        #
-        #     import core: Core
-        #   end
-        #
-        # @param other [Hash, Dry::Container::Namespace]
-        #
-        # @api public
-        def import(other)
-          case other
-          when Hash then importer.register(other)
-          when Dry::Container::Namespace then super
-          else
-            raise ArgumentError, "+other+ must be a hash of names and systems, or a Dry::Container namespace"
-          end
-        end
-
-        # Registers finalization function for a bootable component
-        #
-        # By convention, boot files for components should be placed in
-        # `%{system_dir}/boot` and they will be loaded on demand when components
-        # are loaded in isolation, or during finalization process.
-        #
-        # @example
-        #   # system/container.rb
-        #   class MyApp < Dry::System::Container
-        #     configure do |config|
-        #       config.root = Pathname("/path/to/app")
-        #       config.name = :core
-        #       config.auto_register = %w(lib/apis lib/core)
-        #     end
-        #
-        #   # system/boot/db.rb
-        #   #
-        #   # Simple component registration
-        #   MyApp.boot(:db) do |container|
-        #     require 'db'
-        #
-        #     container.register(:db, DB.new)
-        #   end
-        #
-        #   # system/boot/db.rb
-        #   #
-        #   # Component registration with lifecycle triggers
-        #   MyApp.boot(:db) do |container|
-        #     init do
-        #       require 'db'
-        #       DB.configure(ENV['DB_URL'])
-        #       container.register(:db, DB.new)
-        #     end
-        #
-        #     start do
-        #       db.establish_connection
-        #     end
-        #
-        #     stop do
-        #       db.close_connection
-        #     end
-        #   end
-        #
-        #   # system/boot/db.rb
-        #   #
-        #   # Component registration which uses another bootable component
-        #   MyApp.boot(:db) do |container|
-        #     use :logger
-        #
-        #     start do
-        #       require 'db'
-        #       DB.configure(ENV['DB_URL'], logger: logger)
-        #       container.register(:db, DB.new)
-        #     end
-        #   end
-        #
-        #   # system/boot/db.rb
-        #   #
-        #   # Component registration under a namespace. This will register the
-        #   # db object under `persistence.db` key
-        #   MyApp.namespace(:persistence) do |persistence|
-        #     require 'db'
-        #     DB.configure(ENV['DB_URL'], logger: logger)
-        #     persistence.register(:db, DB.new)
-        #   end
-        #
-        # @param name [Symbol] a unique identifier for a bootable component
-        #
-        # @see Lifecycle
-        #
-        # @return [self]
-        #
-        # @api public
-        def boot(name, opts = {}, &block)
-          if components.key?(name)
-            raise DuplicatedComponentKeyError, "Bootable component #{name.inspect} was already registered"
-          end
-
-          component =
-            if opts[:from]
-              boot_external(name, opts, &block)
-            else
-              boot_local(name, opts, &block)
-            end
-          self
-
-          components[name] = component
-        end
-        deprecate :finalize, :boot
-
-        # @api private
-        def boot_external(identifier, from:, key: nil, namespace: nil, &block)
-          component = System.providers[from].component(
-            identifier, key: key, namespace: namespace, finalize: block, container: self
-          )
-
-          booter.register_component(component)
-
-          component
-        end
-
-        # @api private
-        def boot_local(identifier, namespace: nil, &block)
-          component = Components::Bootable.new(identifier, container: self, namespace: namespace, &block)
-
-          booter.register_component(component)
-
-          component
-        end
-
-        # Return if a container was finalized
-        #
-        # @return [TrueClass, FalseClass]
-        #
-        # @api public
-        def finalized?
-          @__finalized__.equal?(true)
-        end
-
-        # Finalizes the container
-        #
-        # This triggers importing components from other containers, booting
-        # registered components and auto-registering components. It should be
-        # called only in places where you want to finalize your system as a
-        # whole, ie when booting a web application
-        #
-        # @example
-        #   # system/container.rb
-        #   class MyApp < Dry::System::Container
-        #     configure do |config|
-        #       config.root = Pathname("/path/to/app")
-        #       config.name = :my_app
-        #       config.auto_register = %w(lib/apis lib/core)
-        #     end
-        #   end
-        #
-        #   # You can put finalization file anywhere you want, ie system/boot.rb
-        #   MyApp.finalize!
-        #
-        #   # If you need last-moment adjustments just before the finalization
-        #   # you can pass a block and do it there
-        #   MyApp.finalize! do |container|
-        #     # stuff that only needs to happen for finalization
-        #   end
-        #
-        # @return [self] frozen container
-        #
-        # @api public
-        def finalize!(freeze: true, &block)
-          return self if finalized?
-
-          yield(self) if block
-
-          importer.finalize!
-          booter.finalize!
-          manual_registrar.finalize!
-          auto_registrar.finalize!
-
-          @__finalized__ = true
-
-          self.freeze if freeze
-        end
-
-        # Boots a specific component
-        #
-        # As a result, `init` and `start` lifecycle triggers are called
-        #
-        # @example
-        #   MyApp.start(:persistence)
-        #
-        # @param name [Symbol] the name of a registered bootable component
-        #
-        # @return [self]
-        #
-        # @api public
-        def start(name)
-          booter.start(name)
-          self
-        end
-
-        # Boots a specific component but calls only `init` lifecycle trigger
-        #
-        # This way of booting is useful in places where a heavy dependency is
-        # needed but its started environment is not required
-        #
-        # @example
-        #   MyApp.init(:persistence)
-        #
-        # @param [Symbol] name The name of a registered bootable component
-        #
-        # @return [self]
-        #
-        # @api public
-        def init(name)
-          booter.init(name)
-          self
-        end
-
-        # Stop a specific component but calls only `stop` lifecycle trigger
-        #
-        # @example
-        #   MyApp.stop(:persistence)
-        #
-        # @param [Symbol] name The name of a registered bootable component
-        #
-        # @return [self]
-        #
-        # @api public
-        def stop(name)
-          booter.stop(name)
-          self
-        end
-
-        # Sets load paths relative to the container's root dir
-        #
-        # @example
-        #   class MyApp < Dry::System::Container
-        #     configure do |config|
-        #       # ...
-        #     end
-        #
-        #     load_paths!('lib')
-        #   end
-        #
-        # @param [Array<String>] dirs
-        #
-        # @return [self]
-        #
-        # @api public
-        def load_paths!(*dirs)
-          dirs.map(&root.method(:join)).each do |path|
-            next if load_paths.include?(path)
-            load_paths << path
-            $LOAD_PATH.unshift(path.to_s)
-          end
-          self
-        end
-
-        # @api public
-        def load_registrations!(name)
-          manual_registrar.(name)
-          self
-        end
-
-        # Auto-registers components from the provided directory
-        #
-        # Typically you want to configure auto_register directories, and it will
-        # work automatically. Use this method in cases where you want to have an
-        # explicit way where some components are auto-registered, or if you want
-        # to exclude some components from being auto-registered
-        #
-        # @example
-        #   class MyApp < Dry::System::Container
-        #     configure do |config|
-        #       # ...
-        #     end
-        #
-        #     # with a dir
-        #     auto_register!('lib/core')
-        #
-        #     # with a dir and a custom registration block
-        #     auto_register!('lib/core') do |config|
-        #       config.instance do |component|
-        #         # custom way of initializing a component
-        #       end
-        #
-        #       config.exclude do |component|
-        #         # return true to exclude component from auto-registration
-        #       end
-        #     end
-        #   end
-        #
-        # @param [String] dir The dir name relative to the root dir
-        #
-        # @yield AutoRegistrar::Configuration
-        # @see AutoRegistrar::Configuration
-        #
-        # @return [self]
-        #
-        # @api public
-        def auto_register!(dir, &block)
-          auto_registrar.(dir, &block)
-          self
-        end
-
-        # Builds injector for this container
-        #
-        # An injector is a useful mixin which injects dependencies into
-        # automatically defined constructor.
-        #
-        # @example
-        #   # Define an injection mixin
-        #   #
-        #   # system/import.rb
-        #   Import = MyApp.injector
-        #
-        #   # Use it in your auto-registered classes
-        #   #
-        #   # lib/user_repo.rb
-        #   require 'import'
-        #
-        #   class UserRepo
-        #     include Import['persistence.db']
-        #   end
-        #
-        #   MyApp['user_repo].db # instance under 'persistence.db' key
-        #
-        # @param options [Hash] injector options
-        #
-        # @api public
-        def injector(options = {})
-          Dry::AutoInject(self, options)
-        end
-
-        # Requires one or more files relative to the container's root
-        #
-        # @example
-        #   # single file
-        #   MyApp.require_from_root('lib/core')
-        #
-        #   # glob
-        #   MyApp.require_from_root('lib/**/*')
-        #
-        # @param paths [Array<String>] one or more paths, supports globs too
-        #
-        # @api public
-        def require_from_root(*paths)
-          paths.flat_map { |path|
-            path.to_s.include?('*') ? Dir[root.join(path)] : root.join(path)
-          }.each { |path|
-            require path.to_s
-          }
-        end
-
-        # Returns container's root path
-        #
-        # @example
-        #   class MyApp < Dry::System::Container
-        #     configure do |config|
-        #       config.root = Pathname('/my/app')
-        #     end
-        #   end
-        #
-        #   MyApp.root # returns '/my/app' pathname
-        #
-        # @return [Pathname]
-        #
-        # @api public
-        def root
-          config.root
-        end
-
-        # @api public
-        def resolve(key)
-          load_component(key) unless finalized?
-
-          super
-        end
-
-        # @api private
-        def load_paths
-          @load_paths ||= []
-        end
-
-        # @api private
-        def booter
-          @booter ||= config.booter.new(boot_path)
-        end
-
-        # @api private
-        def boot_path
-          root.join("#{config.system_dir}/boot")
-        end
-
-        # @api private
-        def auto_registrar
-          @auto_registrar ||= config.auto_registrar.new(self)
-        end
-
-        # @api private
-        def manual_registrar
-          @manual_registrar ||= config.manual_registrar.new(self)
-        end
-
-        # @api private
-        def importer
-          @importer ||= config.importer.new(self)
-        end
-
-        # @api private
-        def component(identifier, **options)
-          if (component = booter.components.detect { |c| c.identifier == identifier })
-            component
-          else
-            Component.new(
-              identifier,
-              loader: config.loader,
-              namespace: config.default_namespace,
-              separator: config.namespace_separator,
-              inflector: config.inflector,
-              **options,
-            )
-          end
-        end
-
-        # @api private
-        def require_component(component)
-          return if key?(component.identifier)
-
-          unless component.file_exists?(load_paths)
-            raise FileNotFoundError, component
-          end
-
-          require component.path
-
-          yield
-        end
-
-        # @api private
-        def load_component(key)
-          puts "load_component #{key}"
-          return self if key?(key)
-
-          component(key).tap do |component|
-            if component.boot?
-              booter.start(component)
-            else
-              root_key = component.root_key
-
-              puts "root key:"
-              p root_key
-
-              # byebug
-
-
-              # if (bootable_dep = component(root_key)).boot?
-              #   booter.start(bootable_dep)
-
-              if importer.key?(root_key)
-                load_imported_component(component.namespaced(root_key))
-              else
-                # Feels like we don't even need this if load_local_component gets involved with booting?
-                booter.start(root_key) if booter.bootable?(root_key)
-
-
-                load_local_component(component)
-              end
-
-
-
-              # if booter.bootable?(root_key)
-              #   booter.start(root_key)
-              # elsif importer.key?(root_key)
-              #   load_imported_component(component.namespaced(root_key))
-              # else
-              #   load_local_component(component)
-              # end
-            end
-          end
-
-          self
-        end
-
-        # @api private
-        def after(event, &block)
-          hooks[event] << block
-        end
-
-        # @api private
-        def hooks
-          @__hooks__ ||= Hash.new { |h, k| h[k] = [] }
-        end
-
-        # @api private
-        def inherited(klass)
-          new_hooks = Container.hooks.dup
-
-          hooks.each do |event, blocks|
-            new_hooks[event].concat(blocks)
-            new_hooks[event].concat(klass.hooks[event])
-          end
-
-          klass.instance_variable_set(:@__hooks__, new_hooks)
-          super
-        end
-
-        private
-
-        # @api private
-        def load_local_component(component, default_namespace_fallback = false)
-          # byebug
-
-          # if booter.bootable?(component)
-          #   booter.boot_dependency(component) unless finalized?
-          # end
-
-          if component.file_exists?(load_paths)
-            require_component(component) do
-              register(component.identifier) { component.instance }
-            end
-          elsif !default_namespace_fallback
-            load_local_component(component.prepend(config.default_namespace), true)
-          elsif manual_registrar.file_exists?(component)
-            manual_registrar.(component)
-          else
-            raise ComponentLoadError, component
-          end
-        end
-
-        # @api private
-        def load_imported_component(component)
-          container = importer[component.namespace]
-          container.load_component(component.identifier)
-          importer.(component.namespace, container)
-        end
-      end
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-module Dry
-  module System
-    module Plugins
-      # @api public
-      module Decorate
-        # @api public
-        def decorate(key, decorator:)
-          original = _container.delete(key.to_s)
-
-          if original.is_a?(Dry::Container::Item) && original.options[:call] && decorator.is_a?(Class)
-            register(key) do
-              decorator.new(original.call)
-            end
-          else
-            decorated = decorator.is_a?(Class) ? decorator.new(original) : decorator
-            register(key, decorated)
-          end
-        end
-      end
-    end
-  end
-end