dry-system 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c694492a1df5aacafb821e345e815e27510e7a83b348cbe5a88d0bfdda7403e8
-  data.tar.gz: 00f59ee5248183a9d3f05de29ecee93f43ca728bea4208508249a3f6a577ff3e
+SHA1:
+  metadata.gz: 6f74621f9df179cc163f2123f1626838e5aea843
+  data.tar.gz: acaf7f52e6d2580317626dd186b526e21527e740
 SHA512:
-  metadata.gz: c0c4feafffa05af7d60c5b8bad601337622e8deb3b7387d08f54343c95092718c3a3222d190c26d6bc1909613938317ec6a7fab4366095ef0f7cbf945f3752da
-  data.tar.gz: 4acaf75291aa2f229ad8fc14d617cef887e60b1a2178861445f6cd25dff23a9d7ace71f6a3ce20467f27656189723f10041bd7587420236c3421577c203cd618
+  metadata.gz: b49d31d905663157e7a94689eb9184d59fe7f707a1d8dedc3c51e9263f8448b34437f22338cfb77de459f100172a7588e05fc4662ca1cc8fe2e9614a0f42e723
+  data.tar.gz: 4b4c198657712158d242167946d30a12daf381561967d044fe17cb65e50597751a6d2ea605b7cf475bd628bdb1774415bc05f7ff63e983fc5ff61b277746c335

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.9.1 - 2018-01-03
+
+### Fixed
+
+* Plugin dependencies are now auto-required and a meaningful error is raised when a dep failed to load (solnic)
+
+[Compare v0.9.0...v0.9.1](https://github.com/dry-rb/dry-system/compare/v0.9.0...v0.9.1)
+
 # 0.9.0 - 2018-01-02
 
 ### Added

data/lib/dry/system/constants.rb

@@ -11,5 +11,16 @@ module Dry
     WORD_REGEX = /\w+/.freeze
 
     DuplicatedComponentKeyError = Class.new(ArgumentError)
+
+    # Exception raise when a plugin dependency failed to load
+    #
+    # @api public
+    PluginDependencyMissing = Class.new(StandardError) do
+      # @api private
+      def initialize(plugin, message)
+        super("dry-system plugin #{plugin.inspect} failed to load its dependencies: #{message}")
+      end
+    end
+
   end
 end

data/lib/dry/system/plugins.rb

@@ -1,3 +1,5 @@
+require 'dry/system/constants'
+
 module Dry
   module System
     module Plugins
@@ -23,10 +25,27 @@ module Dry
           system
         end
 
+        # @api private
+        def load_dependencies
+          Array(dependencies).each do |f|
+            begin
+              require f unless Plugins.loaded_dependencies.include?(f)
+              Plugins.loaded_dependencies << f
+            rescue LoadError => e
+              raise PluginDependencyMissing.new(name, e.message)
+            end
+          end
+        end
+
         # @api private
         def stateful?
           mod < Module
         end
+
+        # @api private
+        def dependencies
+          mod.respond_to?(:dependencies) ? Array(mod.dependencies) : EMPTY_ARRAY
+        end
       end
 
       # Register a plugin
@@ -46,6 +65,11 @@ module Dry
         @__registry__ ||= {}
       end
 
+      # @api private
+      def self.loaded_dependencies
+        @__loaded_dependencies__ ||= []
+      end
+
       # Enable a plugin
       #
       # Plugin identifier
@@ -58,7 +82,10 @@ module Dry
       # @api public
       def use(name, options = {})
         unless enabled_plugins.include?(name)
-          Plugins.registry[name].apply_to(self, options)
+          plugin = Plugins.registry[name]
+          plugin.load_dependencies
+          plugin.apply_to(self, options)
+
           enabled_plugins << name
         end
         self

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

@@ -18,12 +18,16 @@ module Dry
           system.after(:configure, &:setup_bootsnap)
         end
 
+        # @api private
+        def self.dependencies
+          'bootsnap'
+        end
+
         # Set up bootsnap for faster booting
         #
         # @api public
         def setup_bootsnap
           return unless bootsnap_available?
-          require 'bootsnap' unless Object.const_defined?(:Bootsnap)
           ::Bootsnap.setup(config.bootsnap.merge(cache_dir: root.join('tmp/cache').to_s))
         end
 

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

@@ -1,51 +1,11 @@
-require 'delegate'
 require 'dry/system/constants'
-require 'dry/events/publisher'
+require 'dry/system/plugins/monitoring/proxy'
 
 module Dry
   module System
     module Plugins
       # @api public
       module Monitoring
-        class Proxy < SimpleDelegator
-          # @api private
-          def self.for(target, key:, methods: [], &block)
-            monitored_methods =
-              if methods.empty?
-                target.public_methods - Object.public_instance_methods
-              else
-                methods
-              end
-
-            Class.new(self) do
-              extend Dry::Core::ClassAttributes
-              include Dry::Events::Publisher[target.class.name]
-
-              defines :monitored_methods
-
-              attr_reader :__notifications__
-
-              monitored_methods(methods.empty? ? target.public_methods - Object.public_instance_methods : methods)
-
-              monitored_methods.each do |meth|
-                define_method(meth) do |*args, &block|
-                  object = __getobj__
-                  opts = { target: key, object: object, method: meth, args: args }
-
-                  __notifications__.instrument(:monitoring, opts) do
-                    object.public_send(meth, *args, &block)
-                  end
-                end
-              end
-            end
-          end
-
-          def initialize(target, notifications)
-            super(target)
-            @__notifications__ = notifications
-          end
-        end
-
         # @api private
         def self.extended(system)
           super
@@ -58,6 +18,11 @@ module Dry
           end
         end
 
+        # @api private
+        def self.dependencies
+          'dry/events/publisher'
+        end
+
         # @api private
         def monitor(key, options = EMPTY_HASH, &block)
           notifications = self[:notifications]

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

@@ -0,0 +1,49 @@
+require 'delegate'
+
+module Dry
+  module System
+    module Plugins
+      module Monitoring
+        # @api private
+        class Proxy < SimpleDelegator
+          # @api private
+          def self.for(target, key:, methods: [], &block)
+            monitored_methods =
+              if methods.empty?
+                target.public_methods - Object.public_instance_methods
+              else
+                methods
+              end
+
+            Class.new(self) do
+              extend Dry::Core::ClassAttributes
+              include Dry::Events::Publisher[target.class.name]
+
+              defines :monitored_methods
+
+              attr_reader :__notifications__
+
+              monitored_methods(methods.empty? ? target.public_methods - Object.public_instance_methods : methods)
+
+              monitored_methods.each do |meth|
+                define_method(meth) do |*args, &block|
+                  object = __getobj__
+                  opts = { target: key, object: object, method: meth, args: args }
+
+                  __notifications__.instrument(:monitoring, opts) do
+                    object.public_send(meth, *args, &block)
+                  end
+                end
+              end
+            end
+          end
+
+          def initialize(target, notifications)
+            super(target)
+            @__notifications__ = notifications
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,10 +8,14 @@ module Dry
           system.after(:configure, &:register_notifications)
         end
 
+        # @api private
+        def self.dependencies
+          'dry/monitor/notifications'
+        end
+
         # @api private
         def register_notifications
           return self if key?(:notifications)
-          require 'dry/monitor/notifications' unless Object.const_defined?('Dry::Monitor::Notifications')
           register(:notifications, Monitor::Notifications.new(config.name))
         end
       end

data/lib/dry/system/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module System
-    VERSION = '0.9.0'.freeze
+    VERSION = '0.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -204,6 +204,7 @@ files:
 - lib/dry/system/plugins/env.rb
 - lib/dry/system/plugins/logging.rb
 - lib/dry/system/plugins/monitoring.rb
+- lib/dry/system/plugins/monitoring/proxy.rb
 - lib/dry/system/plugins/notifications.rb
 - lib/dry/system/provider.rb
 - lib/dry/system/provider_registry.rb
@@ -233,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components