dry-system 0.12.0 → 0.13.0

data/lib/dry/system/booter/component_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     class Booter
@@ -25,11 +27,7 @@ module Dry
         def [](name)
           component = components.detect { |component| component.identifier == name }
 
-          if component
-            component
-          else
-            raise InvalidComponentIdentifierError, name
-          end
+          component || raise(InvalidComponentIdentifierError, name)
         end
       end
     end

data/lib/dry/system/component.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'concurrent/map'
 
 require 'dry-equalizer'
@@ -83,9 +85,10 @@ module Dry
 
       # @api private
       def initialize(identifier, path, options)
-        @identifier, @path = identifier, path
+        @identifier = identifier
+        @path = path
         @options = options
-        @file = "#{path}#{RB_EXT}".freeze
+        @file = "#{path}#{RB_EXT}"
         @loader = options.fetch(:loader)
         freeze
       end

data/lib/dry/system/components.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/system'
 
 Dry::System.register_provider(

data/lib/dry/system/components/bootable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/system/lifecycle'
 require 'dry/system/settings'
 require 'dry/system/components/config'
@@ -65,10 +67,12 @@ module Dry
         #   @return [Symbol,String] default namespace for the container keys
         attr_reader :namespace
 
+        TRIGGER_MAP = Hash.new { |h, k| h[k] = [] }.freeze
+
         # @api private
         def initialize(identifier, options = {}, &block)
           @identifier = identifier
-          @triggers = { before: Hash.new { |h, k| h[k] = [] }, after: Hash.new { |h, k| h[k] = [] } }
+          @triggers = { before: TRIGGER_MAP.dup, after: TRIGGER_MAP.dup }
           @options = block ? options.merge(block: block) : options
           @namespace = options[:namespace]
           finalize = options[:finalize] || DEFAULT_FINALIZE
@@ -159,11 +163,7 @@ module Dry
         #
         # @api public
         def config
-          if @config
-            @config
-          else
-            configure!
-          end
+          @config || configure!
         end
 
         # Return a list of lifecycle steps that were executed
@@ -191,7 +191,7 @@ module Dry
         # @api private
         def finalize
           lifecycle.container.each do |key, item|
-            container.register(key, item) unless container.key?(key)
+            container.register(key, item) unless container.registered?(key)
           end
           self
         end
@@ -241,8 +241,8 @@ module Dry
         #
         # @api private
         def boot_file
-          container_boot_files.
-            detect { |path| Pathname(path).basename(RB_EXT).to_s == identifier.to_s }
+          container_boot_files
+            .detect { |path| Pathname(path).basename(RB_EXT).to_s == identifier.to_s }
         end
 
         # Return path to boot dir
@@ -260,7 +260,7 @@ module Dry
         #
         # @api private
         def container_boot_files
-          Dir[container.boot_path.join("**/#{RB_GLOB}")]
+          ::Dir[container.boot_path.join("**/#{RB_GLOB}")].sort
         end
 
         private
@@ -290,7 +290,9 @@ module Dry
           when nil
             container
           else
-            raise RuntimeError, "+namespace+ boot option must be true, string or symbol #{namespace.inspect} given."
+            raise <<-STR
+              +namespace+ boot option must be true, string or symbol #{namespace.inspect} given.
+            STR
           end
         end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     module Components

data/lib/dry/system/constants.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 require 'dry/core/constants'
 
 module Dry
   module System
     include Dry::Core::Constants
 
-    RB_EXT = '.rb'.freeze
-    RB_GLOB = '*.rb'.freeze
-    PATH_SEPARATOR = '/'.freeze
-    DEFAULT_SEPARATOR = '.'.freeze
+    RB_EXT = '.rb'
+    RB_GLOB = '*.rb'
+    PATH_SEPARATOR = '/'
+    DEFAULT_SEPARATOR = '.'
     WORD_REGEX = /\w+/.freeze
 
     DuplicatedComponentKeyError = Class.new(ArgumentError)
     InvalidSettingsError = Class.new(ArgumentError) do
       # @api private
       def initialize(attributes)
-        message = <<~EOF
+        message = <<~STR
           Could not initialize settings. The following settings were invalid:
 
           #{attributes_errors(attributes).join("\n")}
-        EOF
+        STR
         super(message)
       end
 
@@ -38,6 +40,5 @@ module Dry
         super("dry-system plugin #{plugin.inspect} failed to load its dependencies: #{message}")
       end
     end
-
   end
 end

data/lib/dry/system/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 require 'dry-auto_inject'
@@ -73,8 +75,8 @@ module Dry
       setting :name
       setting :default_namespace
       setting(:root, Pathname.pwd.freeze) { |path| Pathname(path) }
-      setting :system_dir, 'system'.freeze
-      setting :registrations_dir, 'container'.freeze
+      setting :system_dir, 'system'
+      setting :registrations_dir, 'container'
       setting :auto_register, []
       setting :inflector, Dry::Inflector.new
       setting :loader, Dry::System::Loader
@@ -82,9 +84,17 @@ module Dry
       setting :auto_registrar, Dry::System::AutoRegistrar
       setting :manual_registrar, Dry::System::ManualRegistrar
       setting :importer, Dry::System::Importer
-      setting(:components, {}, reader: true) { |v| v.dup }
+      setting(:components, {}, reader: true, &:dup)
 
       class << self
+        def strategies(value = nil)
+          if value
+            @strategies = value
+          else
+            @strategies ||= Dry::AutoInject::Strategies
+          end
+        end
+
         extend Dry::Core::Deprecations['Dry::System::Container']
 
         # Configures the container
@@ -139,7 +149,9 @@ module Dry
           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"
+            raise ArgumentError, <<-STR
+              +other+ must be a hash of names and systems, or a Dry::Container namespace
+            STR
           end
         end
 
@@ -218,7 +230,9 @@ module Dry
         # @api public
         def boot(name, opts = {}, &block)
           if components.key?(name)
-            raise DuplicatedComponentKeyError, "Bootable component #{name.inspect} was already registered"
+            raise DuplicatedComponentKeyError, <<-STR
+              Bootable component #{name.inspect} was already registered
+            STR
           end
 
           component =
@@ -227,7 +241,6 @@ module Dry
             else
               boot_local(name, opts, &block)
             end
-          self
 
           components[name] = component
         end
@@ -246,7 +259,9 @@ module Dry
 
         # @api private
         def boot_local(identifier, namespace: nil, &block)
-          component = Components::Bootable.new(identifier, container: self, namespace: namespace, &block)
+          component = Components::Bootable.new(
+            identifier, container: self, namespace: namespace, &block
+          )
 
           booter.register_component(component)
 
@@ -381,6 +396,7 @@ module Dry
         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
@@ -459,7 +475,7 @@ module Dry
         # @param options [Hash] injector options
         #
         # @api public
-        def injector(options = {})
+        def injector(options = { strategies: strategies })
           Dry::AutoInject(self, options)
         end
 
@@ -477,7 +493,7 @@ module Dry
         # @api public
         def require_from_root(*paths)
           paths.flat_map { |path|
-            path.to_s.include?('*') ? Dir[root.join(path)] : root.join(path)
+            path.to_s.include?('*') ? ::Dir[root.join(path)].sort : root.join(path)
           }.each { |path|
             require path.to_s
           }
@@ -502,12 +518,37 @@ module Dry
         end
 
         # @api public
-        def resolve(key)
-          load_component(key) unless finalized?
+        def resolve(key, &block)
+          load_component(key, &block) unless finalized?
 
           super
         end
 
+        alias_method :registered?, :key?
+        #
+        # @!method registered?(key)
+        #   Whether a +key+ is registered (doesn't trigger loading)
+        #   @param [String,Symbol] key Identifier
+        #   @return [Boolean]
+        #   @api public
+        #
+
+        # Check if identifier is registered.
+        # If not, try to load the component
+        #
+        # @param [String,Symbol] key Identifier
+        # @return [Boolean]
+        #
+        # @api public
+        def key?(key)
+          if finalized?
+            registered?(key)
+          else
+            registered?(key) || resolve(key) { return false }
+            true
+          end
+        end
+
         # @api private
         def load_paths
           @load_paths ||= []
@@ -549,18 +590,16 @@ module Dry
               namespace: config.default_namespace,
               separator: config.namespace_separator,
               inflector: config.inflector,
-              **options,
+              **options
             )
           end
         end
 
         # @api private
         def require_component(component)
-          return if key?(component.identifier)
+          return if registered?(component.identifier)
 
-          unless component.file_exists?(load_paths)
-            raise FileNotFoundError, component
-          end
+          raise FileNotFoundError, component unless component.file_exists?(load_paths)
 
           require_path(component.path)
 
@@ -579,8 +618,8 @@ module Dry
         end
 
         # @api private
-        def load_component(key)
-          return self if key?(key)
+        def load_component(key, &block)
+          return self if registered?(key)
 
           component(key).tap do |component|
             if component.boot?
@@ -594,9 +633,7 @@ module Dry
                 load_imported_component(component.namespaced(root_key))
               end
 
-              if !key?(key)
-                load_local_component(component)
-              end
+              load_local_component(component, &block) unless registered?(key)
             end
           end
 
@@ -610,7 +647,7 @@ module Dry
 
         # @api private
         def hooks
-          @__hooks__ ||= Hash.new { |h, k| h[k] = [] }
+          @hooks ||= Hash.new { |h, k| h[k] = [] }
         end
 
         # @api private
@@ -622,14 +659,14 @@ module Dry
             new_hooks[event].concat(klass.hooks[event])
           end
 
-          klass.instance_variable_set(:@__hooks__, new_hooks)
+          klass.instance_variable_set(:@hooks, new_hooks)
           super
         end
 
         private
 
         # @api private
-        def load_local_component(component, default_namespace_fallback = false)
+        def load_local_component(component, default_namespace_fallback = false, &block)
           if booter.bootable?(component) || component.file_exists?(load_paths)
             booter.boot_dependency(component) unless finalized?
 
@@ -637,9 +674,11 @@ module Dry
               register(component.identifier) { component.instance }
             end
           elsif !default_namespace_fallback
-            load_local_component(component.prepend(config.default_namespace), true)
+            load_local_component(component.prepend(config.default_namespace), true, &block)
           elsif manual_registrar.file_exists?(component)
             manual_registrar.(component)
+          elsif block_given?
+            yield
           else
             raise ComponentLoadError, component
           end

data/lib/dry/system/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     # Error raised when the container tries to load a component with missing
@@ -15,7 +17,13 @@ module Dry
     # @api public
     ComponentFileMismatchError = Class.new(StandardError) do
       def initialize(component)
-        super("Boot file for component #{component.identifier.inspect} not found. Container boot files under #{component.boot_path}: #{component.container_boot_files.inspect}")
+        path = component.boot_path
+        files = component.container_boot_files
+
+        super(<<-STR)
+          Boot file for component #{component.identifier.inspect} not found.
+          Container boot files under #{path}: #{files.inspect}")
+        STR
       end
     end
 

data/lib/dry/system/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     # Default importer implementation

data/lib/dry/system/lifecycle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'concurrent/map'
 
 require 'dry/system/settings'
@@ -124,7 +126,7 @@ module Dry
 
       # @api private
       def method_missing(meth, *args, &block)
-        if target.key?(meth)
+        if target.registered?(meth)
           target[meth]
         elsif container.key?(meth)
           container[meth]

data/lib/dry/system/loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/inflector'
 
 module Dry

data/lib/dry/system/magic_comments_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     class MagicCommentsParser
@@ -6,7 +8,7 @@ module Dry
 
       COERCIONS = {
         'true' => true,
-        'false' => false,
+        'false' => false
       }.freeze
 
       def self.call(file_name)
@@ -21,8 +23,6 @@ module Dry
         end
       end
 
-      private
-
       def self.coerce(value)
         COERCIONS.fetch(value) { value }
       end