|
18 | 18 | require "dry/system/identifier" |
19 | 19 | require "dry/system/importer" |
20 | 20 | require "dry/system/indirect_component" |
21 | | -require "dry/system/manual_registrar" |
| 21 | +require "dry/system/manifest_registrar" |
22 | 22 | require "dry/system/plugins" |
23 | 23 | require "dry/system/provider_registrar" |
24 | 24 | require "dry/system/provider" |
@@ -81,11 +81,11 @@ class Container |
81 | 81 | setting :root, default: Pathname.pwd.freeze, constructor: -> path { Pathname(path) } |
82 | 82 | setting :provider_dirs, default: ["system/providers"] |
83 | 83 | setting :bootable_dirs # Deprecated for provider_dirs, see .provider_paths below |
84 | | - setting :registrations_dir, default: "container" |
| 84 | + setting :registrations_dir, default: "system/registrations" |
85 | 85 | setting :component_dirs, default: Config::ComponentDirs.new, cloneable: true |
86 | 86 | setting :inflector, default: Dry::Inflector.new |
87 | 87 | setting :auto_registrar, default: Dry::System::AutoRegistrar |
88 | | - setting :manual_registrar, default: Dry::System::ManualRegistrar |
| 88 | + setting :manifest_registrar, default: Dry::System::ManifestRegistrar |
89 | 89 | setting :provider_registrar, default: Dry::System::ProviderRegistrar |
90 | 90 | setting :importer, default: Dry::System::Importer |
91 | 91 |
|
@@ -321,7 +321,7 @@ def finalize!(freeze: true, &block) |
321 | 321 |
|
322 | 322 | importer.finalize! |
323 | 323 | providers.finalize! |
324 | | - manual_registrar.finalize! |
| 324 | + manifest_registrar.finalize! |
325 | 325 | auto_registrar.finalize! |
326 | 326 |
|
327 | 327 | @__finalized__ = true |
@@ -412,7 +412,7 @@ def add_to_load_path!(*dirs) |
412 | 412 |
|
413 | 413 | # @api public |
414 | 414 | def load_registrations!(name) |
415 | | - manual_registrar.(name) |
| 415 | + manifest_registrar.(name) |
416 | 416 | self |
417 | 417 | end |
418 | 418 |
|
@@ -563,8 +563,8 @@ def auto_registrar |
563 | 563 | end |
564 | 564 |
|
565 | 565 | # @api private |
566 | | - def manual_registrar |
567 | | - @manual_registrar ||= config.manual_registrar.new(self) |
| 566 | + def manifest_registrar |
| 567 | + @manifest_registrar ||= config.manifest_registrar.new(self) |
568 | 568 | end |
569 | 569 |
|
570 | 570 | # @api private |
@@ -616,8 +616,8 @@ def load_component(key) |
616 | 616 |
|
617 | 617 | if component.loadable? |
618 | 618 | load_local_component(component) |
619 | | - elsif manual_registrar.file_exists?(component) |
620 | | - manual_registrar.(component) |
| 619 | + elsif manifest_registrar.file_exists?(component) |
| 620 | + manifest_registrar.(component) |
621 | 621 | elsif importer.key?(component.identifier.root_key) |
622 | 622 | load_imported_component(component.identifier) |
623 | 623 | end |
@@ -646,8 +646,8 @@ def load_imported_component(identifier) |
646 | 646 | def find_component(key) |
647 | 647 | # Find the first matching component from within the configured component dirs. |
648 | 648 | # If no matching component is found, return a null component; this fallback is |
649 | | - # important because the component may still be loadable via the manual registrar |
650 | | - # or an imported container. |
| 649 | + # important because the component may still be loadable via the manifest |
| 650 | + # registrar or an imported container. |
651 | 651 | component_dirs.detect { |dir| |
652 | 652 | if (component = dir.component_for_key(key)) |
653 | 653 | break component |
|
0 commit comments