dry-system 0.19.1 → 0.22.0

data/lib/dry/system/indirect_component.rb

@@ -0,0 +1,65 @@
+# 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
+    # directly managed by the container. It may be component that needs to be loaded
+    # indirectly, either via a manual registration file or an imported container
+    #
+    # Indirect components are an internal abstraction and, unlike ordinary components, are
+    # not exposed to users via component dir configuration hooks.
+    #
+    # @see Container#load_component
+    # @see Container#find_component
+    #
+    # @api private
+    class IndirectComponent
+      include Dry::Equalizer(:identifier)
+
+      # @!attribute [r] identifier
+      #   @return [String] the component's unique identifier
+      attr_reader :identifier
+
+      # @api private
+      def initialize(identifier)
+        @identifier = identifier
+      end
+
+      # Returns false, indicating that the component is not directly loadable from the
+      # files managed by the container
+      #
+      # This is the inverse of {Component#loadable?}
+      #
+      # @return [FalseClass]
+      #
+      # @api private
+      def loadable?
+        false
+      end
+
+      # Returns the component's unique key
+      #
+      # @return [String] the key
+      #
+      # @see Identifier#key
+      #
+      # @api private
+      def key
+        identifier.to_s
+      end
+
+      # Returns the root namespace segment of the component's key, as a symbol
+      #
+      # @see Identifier#root_key
+      #
+      # @return [Symbol] the root key
+      #
+      # @api private
+      def root_key
+        identifier.root_key
+      end
+    end
+  end
+end

data/lib/dry/system/loader.rb

@@ -17,7 +17,7 @@ module Dry
     #   class MyApp < Dry::System::Container
     #     configure do |config|
     #       # ...
-    #       config.loader MyLoader
+    #       config.component_dirs.loader = MyLoader
     #     end
     #   end
     #
@@ -28,7 +28,7 @@ module Dry
         #
         # @api public
         def require!(component)
-          require(component.path) if component.file_exists?
+          require(component.require_path)
           self
         end
 
@@ -61,8 +61,7 @@ module Dry
         # @api public
         def constant(component)
           inflector = component.inflector
-
-          inflector.constantize(inflector.camelize(component.path))
+          inflector.constantize(inflector.camelize(component.const_path))
         end
 
         private

data/lib/dry/system/manual_registrar.rb

@@ -30,16 +30,12 @@ module Dry
       end
 
       # @api private
-      def call(name)
-        name = name.respond_to?(:root_key) ? name.root_key.to_s : name
-
-        require(root.join(config.registrations_dir, name))
+      def call(component)
+        require(root.join(config.registrations_dir, component.root_key.to_s))
       end
 
-      def file_exists?(name)
-        name = name.respond_to?(:root_key) ? name.root_key.to_s : name
-
-        File.exist?(File.join(registrations_dir, "#{name}#{RB_EXT}"))
+      def file_exists?(component)
+        File.exist?(File.join(registrations_dir, "#{component.root_key}#{RB_EXT}"))
       end
 
       private

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

@@ -16,7 +16,7 @@ module Dry
         def self.extended(system)
           super
           system.use(:env)
-          system.before(:configure) { setting :bootsnap, DEFAULT_OPTIONS }
+          system.before(:configure) { setting :bootsnap, default: DEFAULT_OPTIONS }
           system.after(:configure, &:setup_bootsnap)
         end
 
@@ -36,7 +36,7 @@ module Dry
 
         # @api private
         def bootsnap_available?
-          RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.3.0" && RUBY_VERSION < "2.5.0"
+          RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.3.0" && RUBY_VERSION < "3.1.0"
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Dry
           system.use(:notifications)
 
           system.before(:configure) do
-            setting :ignored_dependencies, []
+            setting :ignored_dependencies, default: []
           end
 
           system.after(:configure) do
@@ -34,10 +34,10 @@ module Dry
         # @api private
         def register(key, contents = nil, options = {}, &block)
           super
-
-          unless config.ignored_dependencies.include?(key.to_sym)
+          dependency_key = key.to_s
+          unless config.ignored_dependencies.include?(dependency_key)
             self[:notifications].instrument(
-              :registered_dependency, key: key, class: self[key].class
+              :registered_dependency, key: dependency_key, class: self[dependency_key].class
             )
           end
 

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

@@ -20,7 +20,7 @@ module Dry
 
         # @api private
         def extended(system)
-          system.setting :env, inferrer.(), reader: true
+          system.setting :env, default: inferrer.(), reader: true
           super
         end
       end

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

@@ -11,14 +11,15 @@ module Dry
           system.before(:configure) do
             setting :logger, reader: true
 
-            setting :log_dir, "log"
+            setting :log_dir, default: "log"
 
-            setting :log_levels,
-                    development: Logger::DEBUG,
-                    test: Logger::DEBUG,
-                    production: Logger::ERROR
+            setting :log_levels, default: {
+              development: Logger::DEBUG,
+              test: Logger::DEBUG,
+              production: Logger::ERROR
+            }
 
-            setting :logger_class, ::Logger, reader: true
+            setting :logger_class, default: ::Logger, reader: true
           end
 
           system.after(:configure, &:register_logger)

data/lib/dry/system/plugins.rb

@@ -84,9 +84,7 @@ module Dry
       # Enables a plugin if not already enabled.
       # Raises error if plugin cannot be found in the plugin registry.
       #
-      # Plugin identifier
-      #
-      # @param [Symbol] name The plugin identifier
+      # @param [Symbol] name The plugin name
       # @param [Hash] options Plugin options
       #
       # @return [self]

data/lib/dry/system/provider.rb

@@ -7,14 +7,14 @@ require "dry/system/components/bootable"
 module Dry
   module System
     class Provider
-      attr_reader :identifier
+      attr_reader :name
 
       attr_reader :options
 
       attr_reader :components
 
-      def initialize(identifier, options)
-        @identifier = identifier
+      def initialize(name, options)
+        @name = name
         @options = options
         @components = Concurrent::Map.new
       end
@@ -35,9 +35,9 @@ module Dry
         boot_files.detect { |path| Pathname(path).basename(RB_EXT).to_s == name.to_s }
       end
 
-      def component(name, options = {})
-        identifier = options[:key] || name
-        components.fetch(identifier).new(name, options)
+      def component(component_name, options = {})
+        component_key = options[:key] || component_name
+        components.fetch(component_key).new(component_name, options)
       end
 
       def load_components

data/lib/dry/system/provider_registry.rb

@@ -15,12 +15,12 @@ module Dry
         items.each(&block)
       end
 
-      def register(identifier, options)
-        items << Provider.new(identifier, options)
+      def register(name, options)
+        items << Provider.new(name, options)
       end
 
-      def [](identifier)
-        detect { |provider| provider.identifier == identifier }
+      def [](name)
+        detect { |provider| provider.name == name }
       end
     end
   end

data/lib/dry/system/settings.rb

@@ -11,12 +11,9 @@ module Dry
   module System
     module Settings
       class DSL < BasicObject
-        attr_reader :identifier
-
         attr_reader :schema
 
-        def initialize(identifier, &block)
-          @identifier = identifier
+        def initialize(&block)
           @schema = {}
           instance_eval(&block)
         end

data/lib/dry/system/stubs.rb

@@ -7,7 +7,7 @@ module Dry
     class Container
       # @api private
       module Stubs
-        def finalize!(&block)
+        def finalize!(freeze: true, &block)
           super(freeze: false, &block)
         end
       end

data/lib/dry/system/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module System
-    VERSION = "0.19.1"
+    VERSION = "0.22.0"
   end
 end

data/lib/dry/system.rb

@@ -8,17 +8,17 @@ module Dry
     # Register external component provider
     #
     # @api public
-    def self.register_provider(identifier, options)
-      providers.register(identifier, options)
-      providers[identifier].load_components
+    def self.register_provider(name, options)
+      providers.register(name, options)
+      providers[name].load_components
       self
     end
 
     # Register an external component that can be booted within other systems
     #
     # @api public
-    def self.register_component(identifier, provider:, &block)
-      providers[provider].register_component(identifier, block)
+    def self.register_component(name, provider:, &block)
+      providers[provider].register_component(name, block)
       self
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -44,40 +44,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -197,11 +197,14 @@ files:
 - lib/dry/system/components/config.rb
 - lib/dry/system/config/component_dir.rb
 - lib/dry/system/config/component_dirs.rb
+- lib/dry/system/config/namespace.rb
+- lib/dry/system/config/namespaces.rb
 - lib/dry/system/constants.rb
 - lib/dry/system/container.rb
 - lib/dry/system/errors.rb
 - lib/dry/system/identifier.rb
 - lib/dry/system/importer.rb
+- lib/dry/system/indirect_component.rb
 - lib/dry/system/lifecycle.rb
 - lib/dry/system/loader.rb
 - lib/dry/system/loader/autoloading.rb
@@ -240,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="