dry-system 0.7.3 → 0.8.0

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

@@ -0,0 +1,33 @@
+module Dry
+  module System
+    module Components
+      class Config
+        def self.new(&block)
+          config = super
+          yield(config) if block_given?
+          config
+        end
+
+        def initialize
+          @settings = {}
+        end
+
+        def to_hash
+          @settings
+        end
+
+        private
+
+        def method_missing(meth, value = nil)
+          if meth.to_s.end_with?('=')
+            @settings[meth.to_s.gsub('=', '').to_sym] = value
+          elsif @settings.key?(meth)
+            @settings[meth]
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/system/constants.rb

@@ -6,5 +6,7 @@ module Dry
     PATH_SEPARATOR = '/'.freeze
     DEFAULT_SEPARATOR = '.'.freeze
     WORD_REGEX = /\w+/.freeze
+
+    DuplicatedComponentKeyError = Class.new(ArgumentError)
   end
 end

data/lib/dry/system/container.rb

@@ -6,6 +6,7 @@ require 'dry-container'
 
 require 'dry/core/deprecations'
 
+require 'dry/system'
 require 'dry/system/errors'
 require 'dry/system/loader'
 require 'dry/system/booter'
@@ -77,6 +78,7 @@ 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 }
 
       class << self
         extend Dry::Core::Deprecations['Dry::System::Container']
@@ -154,7 +156,7 @@ module Dry
         #   # system/boot/db.rb
         #   #
         #   # Simple component registration
-        #   MyApp.finalize(:db) do |container|
+        #   MyApp.boot(:db) do |container|
         #     require 'db'
         #
         #     container.register(:db, DB.new)
@@ -163,7 +165,7 @@ module Dry
         #   # system/boot/db.rb
         #   #
         #   # Component registration with lifecycle triggers
-        #   MyApp.finalize(:db) do |container|
+        #   MyApp.boot(:db) do |container|
         #     init do
         #       require 'db'
         #       DB.configure(ENV['DB_URL'])
@@ -182,7 +184,7 @@ module Dry
         #   # system/boot/db.rb
         #   #
         #   # Component registration which uses another bootable component
-        #   MyApp.finalize(:db) do |container|
+        #   MyApp.boot(:db) do |container|
         #     use :logger
         #
         #     start do
@@ -209,9 +211,41 @@ module Dry
         # @return [self]
         #
         # @api public
-        def finalize(name, &block)
-          booter[name] = [self, block]
+        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(
+            key || identifier, key: identifier, namespace: namespace, finalize: block, container: self
+          )
+
+          booter.register_component(component)
+
+          component
+        end
+
+        # @api private
+        def boot_local(name, namespace: nil, &block)
+          component = Components::Bootable.new(name, container: self, namespace: namespace, &block)
+
+          booter.register_component(component)
+
+          component
         end
 
         # Return if a container was finalized
@@ -283,7 +317,6 @@ module Dry
           booter.start(name)
           self
         end
-        deprecate :boot!, :start
 
         # Boots a specific component but calls only `init` lifecycle trigger
         #
@@ -302,7 +335,6 @@ module Dry
           booter.init(name)
           self
         end
-        deprecate :boot, :init
 
         # Sets load paths relative to the container's root dir
         #
@@ -457,7 +489,12 @@ module Dry
 
         # @api private
         def booter
-          @booter ||= config.booter.new(root.join("#{config.system_dir}/boot"))
+          @booter ||= config.booter.new(boot_path)
+        end
+
+        # @api private
+        def boot_path
+          root.join("#{config.system_dir}/boot")
         end
 
         # @api private
@@ -476,14 +513,18 @@ module Dry
         end
 
         # @api private
-        def component(key, **options)
-          Component.new(
-            key,
-            loader: config.loader,
-            namespace: config.default_namespace,
-            separator: config.namespace_separator,
-            **options,
-          )
+        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,
+              **options,
+            )
+          end
         end
 
         # @api private
@@ -504,12 +545,18 @@ module Dry
           return self if key?(key)
 
           component(key).tap do |component|
-            root_key = component.root_key
-
-            if importer.key?(root_key)
-              load_external_component(component.namespaced(root_key))
+            if component.boot?
+              booter.start(component)
             else
-              load_local_component(component)
+              root_key = component.root_key
+
+              if (bootable_dep = component(root_key)).boot?
+                booter.start(bootable_dep)
+              elsif importer.key?(root_key)
+                load_imported_component(component.namespaced(root_key))
+              else
+                load_local_component(component)
+              end
             end
           end
 
@@ -536,7 +583,7 @@ module Dry
         end
 
         # @api private
-        def load_external_component(component)
+        def load_imported_component(component)
           container = importer[component.namespace]
           container.load_component(component.identifier)
           importer.(component.namespace, container)

data/lib/dry/system/errors.rb

@@ -14,8 +14,8 @@ module Dry
     #
     # @api public
     ComponentFileMismatchError = Class.new(StandardError) do
-      def initialize(filename, registered_booted_keys)
-        super("Mismatch between filename +#{filename}+ and registered components +#{registered_booted_keys}+")
+      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}")
       end
     end
 

data/lib/dry/system/lifecycle.rb

@@ -1,5 +1,7 @@
 require 'concurrent/map'
 
+require 'dry/system/settings'
+
 module Dry
   module System
     # Lifecycle booting DSL
@@ -23,9 +25,11 @@ module Dry
 
       attr_reader :triggers
 
+      attr_reader :opts
+
       # @api private
-      def self.new(container, &block)
-        cache.fetch_or_store([container, block].hash) do
+      def self.new(container, opts = {}, &block)
+        cache.fetch_or_store([container, opts, block].hash) do
           super
         end
       end
@@ -36,11 +40,13 @@ module Dry
       end
 
       # @api private
-      def initialize(container, &block)
+      def initialize(container, opts, &block)
         @container = container
+        @settings = nil
         @statuses = []
         @triggers = {}
-        instance_exec(container, &block)
+        @opts = opts
+        instance_exec(target, &block)
       end
 
       # @api private
@@ -53,6 +59,21 @@ module Dry
         end
       end
 
+      # @api private
+      def settings(&block)
+        component.settings(&block)
+      end
+
+      # @api private
+      def configure(&block)
+        component.configure(&block)
+      end
+
+      # @api private
+      def config
+        component.config
+      end
+
       # @api private
       def init(&block)
         trigger!(:init, &block)
@@ -71,7 +92,7 @@ module Dry
       # @api private
       def use(*names)
         names.each do |name|
-          container.start(name)
+          target.start(name)
         end
       end
 
@@ -80,12 +101,22 @@ module Dry
         container.register(*args, &block)
       end
 
+      # @api private
+      def component
+        opts[:component]
+      end
+
+      # @api private
+      def target
+        component.container
+      end
+
       private
 
       # @api private
       def trigger!(name, &block)
         if triggers.key?(name)
-          triggers[name].()
+          triggers[name].(target)
         elsif block
           triggers[name] = block
         end
@@ -93,7 +124,9 @@ module Dry
 
       # @api private
       def method_missing(meth, *args, &block)
-        if container.key?(meth)
+        if target.key?(meth)
+          target[meth]
+        elsif container.key?(meth)
           container[meth]
         elsif ::Kernel.respond_to?(meth)
           ::Kernel.public_send(meth, *args, &block)

data/lib/dry/system/provider.rb

@@ -0,0 +1,46 @@
+require 'concurrent/map'
+require 'dry/system/components/bootable'
+
+module Dry
+  module System
+    class Provider
+      attr_reader :identifier
+
+      attr_reader :options
+
+      attr_reader :components
+
+      def initialize(identifier, options)
+        @identifier = identifier
+        @options = options
+        @components = Concurrent::Map.new
+      end
+
+      def boot_path
+        options.fetch(:boot_path)
+      end
+
+      def boot_files
+        Dir[boot_path.join('**/*.rb')]
+      end
+
+      def register_component(name, fn)
+        components[name] = Components::Bootable.new(name, &fn)
+      end
+
+      def boot_file(name)
+        boot_files.detect { |path| Pathname(path).basename('.rb').to_s == name.to_s }
+      end
+
+      def component(name, options = {})
+        components.fetch(name).with(options)
+      end
+
+      def load_components
+        boot_files.each { |f| require f }
+        freeze
+        self
+      end
+    end
+  end
+end

data/lib/dry/system/provider_registry.rb

@@ -0,0 +1,25 @@
+module Dry
+  module System
+    class ProviderRegistry
+      include Enumerable
+
+      attr_reader :items
+
+      def initialize
+        @items = []
+      end
+
+      def each(&block)
+        items.each(&block)
+      end
+
+      def register(identifier, options)
+        items << Provider.new(identifier, options)
+      end
+
+      def [](identifier)
+        detect { |provider| provider.identifier == identifier }
+      end
+    end
+  end
+end

data/lib/dry/system/settings.rb

@@ -0,0 +1,59 @@
+require "dry/core/class_builder"
+require "dry/types"
+require "dry/struct"
+
+require "dry/system/settings/file_loader"
+
+module Dry
+  module System
+    module Settings
+      class DSL < BasicObject
+        attr_reader :identifier
+
+        attr_reader :schema
+
+        def initialize(identifier, &block)
+          @identifier = identifier
+          @schema = {}
+          instance_eval(&block)
+        end
+
+        def call
+          Core::ClassBuilder.new(name: 'Configuration', parent: Settings::Configuration).call do |klass|
+            schema.each do |key, type|
+              klass.setting(key, type)
+            end
+          end
+        end
+
+        def key(name, type)
+          schema[name] = type
+        end
+      end
+
+      class Configuration < Dry::Struct
+        constructor_type :strict_with_defaults
+
+        def self.setting(*args)
+          attribute(*args)
+        end
+
+        def self.load(root, env)
+          env_data = load_files(root, env)
+
+          attributes = schema.each_with_object({}) do |(key, type), h|
+            value = ENV.fetch(key.to_s.upcase) { env_data[key.to_s.upcase] }
+            h[key] = value
+          end
+
+          new(attributes)
+        end
+
+        def self.load_files(root, env)
+          FileLoader.new.(root, env)
+        end
+        private_class_method :load_files
+      end
+    end
+  end
+end