dry-system 0.12.0 → 0.13.0

data/lib/dry/system/manual_registrar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/system/constants'
 
 module Dry
@@ -22,7 +24,7 @@ module Dry
 
       # @api private
       def finalize!
-        Dir[registrations_dir.join(RB_GLOB)].each do |file|
+        ::Dir[registrations_dir.join(RB_GLOB)].sort.each do |file|
           call(File.basename(file, RB_EXT))
         end
       end

data/lib/dry/system/plugins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/system/constants'
 
 module Dry
@@ -62,12 +64,12 @@ module Dry
 
       # @api private
       def self.registry
-        @__registry__ ||= {}
+        @registry ||= {}
       end
 
       # @api private
       def self.loaded_dependencies
-        @__loaded_dependencies__ ||= []
+        @loaded_dependencies ||= []
       end
 
       # Enable a plugin
@@ -93,13 +95,13 @@ module Dry
 
       # @api private
       def inherited(klass)
-        klass.instance_variable_set(:@__enabled_plugins__, enabled_plugins.dup)
+        klass.instance_variable_set(:@enabled_plugins, enabled_plugins.dup)
         super
       end
 
       # @api private
       def enabled_plugins
-        @__enabled_plugins__ ||= []
+        @enabled_plugins ||= []
       end
 
       require 'dry/system/plugins/bootsnap'
@@ -116,6 +118,9 @@ module Dry
 
       require 'dry/system/plugins/monitoring'
       register(:monitoring, Plugins::Monitoring)
+
+      require 'dry/system/plugins/dependency_graph'
+      register(:dependency_graph, Plugins::DependencyGraph)
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     module Plugins
@@ -28,12 +30,13 @@ module Dry
         # @api public
         def setup_bootsnap
           return unless bootsnap_available?
+
           ::Bootsnap.setup(config.bootsnap.merge(cache_dir: root.join('tmp/cache').to_s))
         end
 
         # @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 < '2.5.0'
         end
       end
     end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'dry/system/constants'
+require 'dry/system/plugins/dependency_graph/strategies'
+
+module Dry
+  module System
+    module Plugins
+      # @api public
+      module DependencyGraph
+        # @api private
+        def self.extended(system)
+          super
+
+          system.use(:notifications)
+
+          system.setting :ignored_dependencies, []
+
+          system.after(:configure) do
+            self[:notifications].register_event(:resolved_dependency)
+            self[:notifications].register_event(:registered_dependency)
+
+            strategies(Strategies)
+          end
+        end
+
+        # @api private
+        def self.dependencies
+          'dry/events/publisher'
+        end
+
+        # @api private
+        def register(key, contents = nil, options = {}, &block)
+          super
+
+          unless config.ignored_dependencies.include?(key.to_sym)
+            self[:notifications].instrument(
+              :registered_dependency, key: key, class: self[key].class
+            )
+          end
+
+          self
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Dry
+  module System
+    module Plugins
+      module DependencyGraph
+        # @api private
+        class Strategies
+          extend Dry::Container::Mixin
+
+          # @api private
+          class Kwargs < Dry::AutoInject::Strategies::Kwargs
+            private
+
+            # @api private
+            def define_initialize(klass)
+              @container['notifications'].instrument(
+                :resolved_dependency, dependency_map: dependency_map.to_h, target_class: klass
+              )
+              super(klass)
+            end
+          end
+
+          register :kwargs, Kwargs
+          register :default, Kwargs
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Dry
@@ -8,13 +10,12 @@ module Dry
         def self.extended(system)
           system.setting :logger, reader: true
 
-          system.setting :log_dir, 'log'.freeze
+          system.setting :log_dir, 'log'
 
-          system.setting :log_levels, {
-                           development: Logger::DEBUG,
-                           test: Logger::DEBUG,
-                           production: Logger::ERROR
-                         }
+          system.setting :log_levels,
+            development: Logger::DEBUG,
+            test: Logger::DEBUG,
+            production: Logger::ERROR
 
           system.setting :logger_class, ::Logger, reader: true
 
@@ -31,7 +32,7 @@ module Dry
         #
         # @api private
         def register_logger
-          if key?(:logger)
+          if registered?(:logger)
             self
           elsif config.logger
             register(:logger, config.logger)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/system/constants'
 require 'dry/system/plugins/monitoring/proxy'
 
@@ -35,7 +37,7 @@ module Dry
               end
             end
 
-            decorate(key, with: proxy.new(target, notifications))
+            decorate(key, with: -> target { proxy.new(target, notifications) })
           end
         end
       end

data/lib/dry/system/plugins/monitoring/proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 
 module Dry

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     module Plugins
@@ -15,7 +17,8 @@ module Dry
 
         # @api private
         def register_notifications
-          return self if key?(:notifications)
+          return self if registered?(:notifications)
+
           register(:notifications, Monitor::Notifications.new(config.name))
         end
       end

data/lib/dry/system/provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'concurrent/map'
 require 'dry/system/constants'
 require 'dry/system/components/bootable'
@@ -22,7 +24,7 @@ module Dry
       end
 
       def boot_files
-        Dir[boot_path.join("**/#{RB_GLOB}")]
+        ::Dir[boot_path.join("**/#{RB_GLOB}")].sort
       end
 
       def register_component(name, fn)

data/lib/dry/system/provider_registry.rb

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

data/lib/dry/system/settings.rb

@@ -1,9 +1,11 @@
-require "dry/core/class_builder"
-require "dry/types"
-require "dry/struct"
+# frozen_string_literal: true
 
-require "dry/system/settings/file_loader"
-require "dry/system/constants"
+require 'dry/core/class_builder'
+require 'dry/types'
+require 'dry/struct'
+
+require 'dry/system/settings/file_loader'
+require 'dry/system/constants'
 
 module Dry
   module System
@@ -20,7 +22,7 @@ module Dry
         end
 
         def call
-          Core::ClassBuilder.new(name: 'Configuration', parent: Settings::Configuration).call do |klass|
+          Core::ClassBuilder.new(name: 'Configuration', parent: Configuration).call do |klass|
             schema.each do |key, type|
               klass.setting(key, type)
             end
@@ -50,7 +52,7 @@ module Dry
             errors[key] = type_check if type_check.failure?
           end
 
-          raise InvalidSettingsError.new(errors) unless errors.empty?
+          raise InvalidSettingsError, errors unless errors.empty?
 
           new(attributes)
         end

data/lib/dry/system/settings/file_loader.rb

@@ -1,4 +1,6 @@
-require "dry/system/settings/file_parser"
+# frozen_string_literal: true
+
+require 'dry/system/settings/file_parser'
 
 module Dry
   module System
@@ -18,7 +20,7 @@ module Dry
 
         def files(root, env)
           [
-            root.join(".env"),
+            root.join('.env'),
             root.join(".env.#{env}")
           ].compact
         end

data/lib/dry/system/settings/file_parser.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Dry
   module System
     module Settings
       class FileParser
         # Regex extracted from dotenv gem
         # https://github.com/bkeepers/dotenv/blob/master/lib/dotenv/parser.rb#L14
-        LINE = %r(
+        LINE = /
           \A
           \s*
           (?:export\s+)?    # optional export
@@ -20,7 +22,7 @@ module Dry
           \s*
           (?:\#.*)?         # optional comment
           \z
-        )x
+        /x.freeze
 
         def call(file)
           File.readlines(file).each_with_object({}) do |line, hash|
@@ -35,7 +37,7 @@ module Dry
         def parse_line(line, hash)
           if (match = line.match(LINE))
             key, value = match.captures
-            hash[key] = parse_value(value || "")
+            hash[key] = parse_value(value || '')
           end
           hash
         end

data/lib/dry/system/stubs.rb

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

data/lib/dry/system/system_components/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dry::System.register_component(:settings, provider: :system) do
   init do
     require 'dry/system/settings'

data/lib/dry/system/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dry
   module System
-    VERSION = '0.12.0'.freeze
+    VERSION = '0.13.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: dry-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,6 +75,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +212,8 @@ files:
 - lib/dry/system/manual_registrar.rb
 - lib/dry/system/plugins.rb
 - lib/dry/system/plugins/bootsnap.rb
+- lib/dry/system/plugins/dependency_graph.rb
+- lib/dry/system/plugins/dependency_graph/strategies.rb
 - lib/dry/system/plugins/env.rb
 - lib/dry/system/plugins/logging.rb
 - lib/dry/system/plugins/monitoring.rb
@@ -238,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components