dry-system 0.18.2 → 0.20.0

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative "../loader"
+
+module Dry
+  module System
+    class Loader
+      # Component loader for autoloading-enabled applications
+      #
+      # This behaves like the default loader, except instead of requiring the given path,
+      # it loads the respective constant, allowing the autoloader to load the
+      # corresponding file per its own configuration.
+      #
+      # @see Loader
+      # @api public
+      class Autoloading < Loader
+        class << self
+          def require!(component)
+            constant(component)
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/system/loader.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/inflector"
-
 module Dry
   module System
     # Default component loader implementation
@@ -19,58 +17,59 @@ module Dry
     #   class MyApp < Dry::System::Container
     #     configure do |config|
     #       # ...
-    #       config.loader MyLoader
+    #       config.component_dirs.loader = MyLoader
     #     end
     #   end
     #
     # @api public
     class Loader
-      # @!attribute [r] path
-      #   @return [String] Path to component's file
-      attr_reader :path
+      class << self
+        # Requires the component's source file
+        #
+        # @api public
+        def require!(component)
+          require(component.path) if component.file_exists?
+          self
+        end
 
-      # @!attribute [r] inflector
-      #   @return [Object] Inflector backend
-      attr_reader :inflector
+        # Returns an instance of the component
+        #
+        # Provided optional args are passed to object's constructor
+        #
+        # @param [Array] args Optional constructor args
+        #
+        # @return [Object]
+        #
+        # @api public
+        def call(component, *args)
+          require!(component)
 
-      # @api private
-      def initialize(path, inflector = Dry::Inflector.new)
-        @path = path
-        @inflector = inflector
-      end
+          constant = self.constant(component)
 
-      # Returns component's instance
-      #
-      # Provided optional args are passed to object's constructor
-      #
-      # @param [Array] args Optional constructor args
-      #
-      # @return [Object]
-      #
-      # @api public
-      def call(*args)
-        if singleton?(constant)
-          constant.instance(*args)
-        else
-          constant.new(*args)
+          if singleton?(constant)
+            constant.instance(*args)
+          else
+            constant.new(*args)
+          end
         end
-      end
-      ruby2_keywords(:call) if respond_to?(:ruby2_keywords, true)
+        ruby2_keywords(:call) if respond_to?(:ruby2_keywords, true)
 
-      # Return component's class constant
-      #
-      # @return [Class]
-      #
-      # @api public
-      def constant
-        inflector.constantize(inflector.camelize(path))
-      end
+        # Returns the component's class constant
+        #
+        # @return [Class]
+        #
+        # @api public
+        def constant(component)
+          inflector = component.inflector
+
+          inflector.constantize(inflector.camelize(component.path))
+        end
 
-      private
+        private
 
-      # @api private
-      def singleton?(constant)
-        constant.respond_to?(:instance) && !constant.respond_to?(:new)
+        def singleton?(constant)
+          constant.respond_to?(:instance) && !constant.respond_to?(:new)
+        end
       end
     end
   end

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
 

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,11 +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/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.18.2"
+    VERSION = "0.20.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -44,74 +44,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: dry-equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -202,19 +188,23 @@ files:
 - lib/dry-system.rb
 - lib/dry/system.rb
 - lib/dry/system/auto_registrar.rb
-- lib/dry/system/auto_registrar/configuration.rb
 - lib/dry/system/booter.rb
 - lib/dry/system/booter/component_registry.rb
 - lib/dry/system/component.rb
+- lib/dry/system/component_dir.rb
 - lib/dry/system/components.rb
 - lib/dry/system/components/bootable.rb
 - lib/dry/system/components/config.rb
+- lib/dry/system/config/component_dir.rb
+- lib/dry/system/config/component_dirs.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/lifecycle.rb
 - lib/dry/system/loader.rb
+- lib/dry/system/loader/autoloading.rb
 - lib/dry/system/magic_comments_parser.rb
 - lib/dry/system/manual_registrar.rb
 - lib/dry/system/plugins.rb
@@ -250,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Dry
-  module System
-    class AutoRegistrar
-      # Default auto_registrar configuration
-      #
-      # This is currently configured by default for every System::Container.
-      # Configuration allows to define custom initialization as well as exclusion
-      # logic, for each component that is being registered by Dry::System
-      # auto-registration.
-      #
-      # @api private
-      class Configuration
-        DEFAULT_INSTANCE = -> component { component.instance }.freeze
-        FALSE_PROC = -> * { false }.freeze
-
-        def self.setting(name)
-          define_method(name) do |&block|
-            ivar = "@#{name}"
-            if block
-              instance_variable_set(ivar, block)
-            else
-              instance_variable_get(ivar)
-            end
-          end
-        end
-
-        setting :exclude
-        setting :instance
-
-        attr_accessor :memoize
-
-        # @api private
-        def initialize
-          @instance = DEFAULT_INSTANCE
-          @exclude = FALSE_PROC
-          @memoize = false
-        end
-      end
-    end
-  end
-end