dry-system 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ae890ec18500bc5f87881eba9be29608959591
-  data.tar.gz: fea3ad84ab881aa0d9f134f007b81ca265268cd1
+  metadata.gz: '085640c18c734b66700738f731ea66d0001cdc83'
+  data.tar.gz: a6c6835df5df05045cddbc41615a581c11c4ea1d
 SHA512:
-  metadata.gz: 77ddf89e868fa4b6791d9d7dd56f03f2f6bfd2d062fbe59f08a29bb04d4416bd0fce3d45e351500e72460ca9814d6fe7faf42afdb6741a0eae23c907473b66bd
-  data.tar.gz: 7d97e7c5435d6ca7e7fb25f3f86bb4f10ce386b42b218e9abf998a495e9a6a858847b8ff53fd06d7c0bad7c6bd720c1f346e71d1229956019d76ce9d6af4a37f
+  metadata.gz: 415e4f12b22eeb6e7f7b9f6f856b21953f1126b634d82cc17e9c3da3eab1f6aff30c261fddde7401495d6bccd1092fa7185a772031abf886732d913b1182aeee
+  data.tar.gz: 3082441096b4e4208f1db30d817a816a809026b3cd07886b417edfc77be235167c54cdd9e5de4336109b88daa2633cca1c122a3f8fcbac8cea6421a099a0c633

data/.travis.yml

@@ -4,18 +4,17 @@ cache: bundler
 bundler_args: --without tools
 script:
   - bundle exec rake spec
+after_success:
+  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
 rvm:
   - 2.1
   - 2.2
   - 2.3.1
   - rbx
-  - jruby-9000
-  - ruby-head
-  - jruby-head
+  - jruby-9.1.5.0
 matrix:
   allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: rbx
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,15 +1,24 @@
+# 0.6.0 2016-02-02
+
+### Changed
+
+* Lazy load components as they are resolved, rather than on injection (timriley)
+* Perform registration even though component already required (blelump)
+
+[Compare v0.5.0...v0.6.0](https://github.com/dry-rb/dry-system/compare/v0.5.1...v0.6.0)
+
 # 0.5.1 2016-08-23
 
 ### Fixed
 
 - Undefined locals or method calls will raise proper exceptions in Lifecycle DSL (aradunovic)
 
-[Compare v0.5.0...v0.5.1](https://github.com/dry-rb/dry-component/compare/v0.5.0...v0.5.1)
+[Compare v0.5.0...v0.5.1](https://github.com/dry-rb/dry-system/compare/v0.5.0...v0.5.1)
 
 # 0.5.0 2016-08-15
 
 This is a major refactoring with better internal APIs and improved support
-for multi-container setups. As part of this release `dry-component` has been renamed to `dry-system`.
+for multi-container setups. As part of this release `dry-system` has been renamed to `dry-system`.
 
 ### Added
 
@@ -32,15 +41,15 @@ for multi-container setups. As part of this release `dry-component` has been ren
 - Booting is now handled by `System::Booter` object configured in a container (solnic)
 - Importing containers is now handled by `System::Importer` object configured in a container (solnic)
 
-[Compare v0.4.3...v0.5.0](https://github.com/dry-rb/dry-component/compare/v0.4.3...v0.5.0)
+[Compare v0.4.3...v0.5.0](https://github.com/dry-rb/dry-system/compare/v0.4.3...v0.5.0)
 
 # 0.4.3 - 2016-08-01
 
 ### Fixed
 
-- Return immediately from `Container.load_component` if the requested component key already exists in the container. This fixes a crash when requesting to load a manually registered component with a name that doesn't map to a filename (timriley in [#24](https://github.com/dry-rb/dry-component/pull/24))
+- Return immediately from `Container.load_component` if the requested component key already exists in the container. This fixes a crash when requesting to load a manually registered component with a name that doesn't map to a filename (timriley in [#24](https://github.com/dry-rb/dry-system/pull/24))
 
-[Compare v0.4.2...v0.4.3](https://github.com/dry-rb/dry-component/compare/v0.4.2...v0.4.3)
+[Compare v0.4.2...v0.4.3](https://github.com/dry-rb/dry-system/compare/v0.4.2...v0.4.3)
 
 # 0.4.2 - 2016-07-26
 
@@ -48,7 +57,7 @@ for multi-container setups. As part of this release `dry-component` has been ren
 
 - Ensure file components can be loaded when they're requested for the first time using their shorthand container identifier (i.e. with the container's default namespace removed) (timriley)
 
-[Compare v0.4.1...v0.4.2](https://github.com/dry-rb/dry-component/compare/v0.4.1...v0.4.2)
+[Compare v0.4.1...v0.4.2](https://github.com/dry-rb/dry-system/compare/v0.4.1...v0.4.2)
 
 # 0.4.1 - 2016-07-26 [YANKED]
 
@@ -56,13 +65,13 @@ for multi-container setups. As part of this release `dry-component` has been ren
 
 - Require the 0.4.0 release of dry-auto_inject for the features below (in 0.4.0) to work properly (timriley)
 
-[Compare v0.4.0...v0.4.1](https://github.com/dry-rb/dry-component/compare/v0.4.0...v0.4.1)
+[Compare v0.4.0...v0.4.1](https://github.com/dry-rb/dry-system/compare/v0.4.0...v0.4.1)
 
 # 0.4.0 - 2016-07-26 [YANKED]
 
 ### Added
 
-- Support for supplying a default namespace to a container, which is passed to the container's injector to allow for convenient shorthand access to registered objects in the same namespace (timriley in [#20](https://github.com/dry-rb/dry-component/pull/20))
+- Support for supplying a default namespace to a container, which is passed to the container's injector to allow for convenient shorthand access to registered objects in the same namespace (timriley in [#20](https://github.com/dry-rb/dry-system/pull/20))
 
     ```ruby
     # Set up container with default namespace
@@ -86,14 +95,14 @@ for multi-container setups. As part of this release `dry-component` has been ren
     end
     ```
 
-- Support for supplying to options directly to dry-auto_inject's `Builder` via `Dry::Component::Container#injector(options)`. This allows you to provide dry-auto_inject customizations like your own container of injection strategies (timriley in [#20](https://github.com/dry-rb/dry-component/pull/20))
-- Support for accessing all available injector strategies, not just the defaults (e.g. `MyContainer.injector.some_custom_strategy`) (timriley in [#19](https://github.com/dry-rb/dry-component/pull/19))
+- Support for supplying to options directly to dry-auto_inject's `Builder` via `Dry::Component::Container#injector(options)`. This allows you to provide dry-auto_inject customizations like your own container of injection strategies (timriley in [#20](https://github.com/dry-rb/dry-system/pull/20))
+- Support for accessing all available injector strategies, not just the defaults (e.g. `MyContainer.injector.some_custom_strategy`) (timriley in [#19](https://github.com/dry-rb/dry-system/pull/19))
 
 ### Changed
 
-- Subclasses of `Dry::Component::Container` no longer have an `Injector` constant automatically defined within them. The recommended approach is to save your own injector object to a constant, which allows you to pass options to it at the same time, e.g. `MyApp::Import = MyApp::Container.injector(my_options)` (timriley in [#19](https://github.com/dry-rb/dry-component/pull/19))
+- Subclasses of `Dry::Component::Container` no longer have an `Injector` constant automatically defined within them. The recommended approach is to save your own injector object to a constant, which allows you to pass options to it at the same time, e.g. `MyApp::Import = MyApp::Container.injector(my_options)` (timriley in [#19](https://github.com/dry-rb/dry-system/pull/19))
 
-[Compare v0.3.0...v0.4.0](https://github.com/dry-rb/dry-component/compare/v0.3.0...v0.4.0)
+[Compare v0.3.0...v0.4.0](https://github.com/dry-rb/dry-system/compare/v0.3.0...v0.4.0)
 
 # 0.3.0 - 2016-06-18
 
@@ -105,20 +114,20 @@ Removed two pieces that are moving to dry-web:
 - Removed `Dry::Component::Config` and `options` setting from `Container` (timriley)
 - Changed `Component#configure` behavior so it can be run multiple times for configuration to be applied in multiple passes (timriley)
 
-[Compare v0.2.0...v0.3.0](https://github.com/dry-rb/dry-component/compare/v0.2.0...v0.3.0)
+[Compare v0.2.0...v0.3.0](https://github.com/dry-rb/dry-system/compare/v0.2.0...v0.3.0)
 
 # 0.2.0 - 2016-06-13
 
 ### Changed
 
 - Component core directory is now `component/` by default (timriley)
-- Injector default stragegy is now whatever dry-auto_inject's default is (rather than hard-coding a particular default strategy for dry-component) (timriley)
+- Injector default stragegy is now whatever dry-auto_inject's default is (rather than hard-coding a particular default strategy for dry-system) (timriley)
 
 ### Fixed
 
 - Fixed bug where specified auto-inject strategies were not respected (timriley)
 
-[Compare v0.1.0...v0.2.0](https://github.com/dry-rb/dry-component/compare/v0.1.0...v0.2.0)
+[Compare v0.1.0...v0.2.0](https://github.com/dry-rb/dry-system/compare/v0.1.0...v0.2.0)
 
 # 0.1.0 - 2016-06-07
 
@@ -146,7 +155,7 @@ Removed two pieces that are moving to dry-web:
 * `Container.import_module` renamed to `.injector` (timriley)
 * Default injection strategy is now `kwargs`, courtesy of the new dry-auto_inject default (timriley)
 
-[Compare v0.0.2...v0.1.0](https://github.com/dry-rb/dry-component/compare/v0.0.2...v0.1.0)
+[Compare v0.0.2...v0.1.0](https://github.com/dry-rb/dry-system/compare/v0.0.2...v0.1.0)
 
 # 0.0.2 - 2015-12-24
 
@@ -159,7 +168,7 @@ Removed two pieces that are moving to dry-web:
 
 * Container name is used to determine the name of its config file (solnic)
 
-[Compare v0.0.1...v0.0.2](https://github.com/dry-rb/dry-component/compare/v0.0.1...v0.0.2)
+[Compare v0.0.1...v0.0.2](https://github.com/dry-rb/dry-system/compare/v0.0.1...v0.0.2)
 
 # 0.0.1 - 2015-12-24
 

data/dry-system.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'inflecto', '>= 0.0.2'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-container', '~> 0.4'
+  spec.add_runtime_dependency 'dry-container', '~> 0.6'
   spec.add_runtime_dependency 'dry-auto_inject', '>= 0.4.0'
-  spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
+  spec.add_runtime_dependency 'dry-configurable', '~> 0.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/dry/system/container.rb

@@ -1,10 +1,10 @@
 require 'pathname'
 
+require 'dry-auto_inject'
 require 'dry-configurable'
 require 'dry-container'
 
 require 'dry/system/errors'
-require 'dry/system/injector'
 require 'dry/system/loader'
 require 'dry/system/booter'
 require 'dry/system/auto_registrar'
@@ -41,7 +41,7 @@ module Dry
     # * `:name` - a unique container identifier
     # * `:root` - a system root directory (defaults to `pwd`)
     # * `:system_dir` - directory name relative to root, where bootable components
-    #                 can be defined in `boot` dir this defaults to `component`
+    #                 can be defined in `boot` dir this defaults to `system`
     #
     # @example
     #   class MyApp < Dry::System::Container
@@ -372,7 +372,7 @@ module Dry
         #
         # @api public
         def injector(options = {})
-          Injector.new(self, options: options)
+          Dry::AutoInject(self, options)
         end
 
         # Requires one or more files relative to the container's root
@@ -413,6 +413,13 @@ module Dry
           config.root
         end
 
+        # @api public
+        def resolve(key)
+          load_component(key) unless frozen?
+
+          super
+        end
+
         # @api private
         def load_paths
           @load_paths ||= []
@@ -451,7 +458,9 @@ module Dry
             raise FileNotFoundError, component
           end
 
-          Kernel.require(component.path) && yield
+          Kernel.require(component.path)
+
+          yield
         end
 
         # @api private

data/lib/dry/system/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module System
-    VERSION = '0.5.1'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.3'
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+  require 'simplecov'
+  SimpleCov.start
 end
 
 begin

data/spec/unit/container_spec.rb

@@ -34,13 +34,26 @@ RSpec.describe Dry::System::Container do
     end
 
     describe '.require_component' do
-      it 'requires component file' do
-        component = container.component('test/foo')
-        required = false
-        container.require_component(component) do
-          required = true
+
+      shared_examples_for 'requireable' do
+        it 'requires component file' do
+          component = container.component('test/foo')
+          required = false
+          container.require_component(component) do
+            required = true
+          end
+          expect(required).to be(true)
+        end
+      end
+
+      it_behaves_like 'requireable'
+
+      context 'when already required' do
+        before do
+          Kernel.require('test/foo')
         end
-        expect(required).to be(true)
+
+        it_behaves_like 'requireable'
       end
 
       it 'raises when file does not exist' do
@@ -49,15 +62,27 @@ RSpec.describe Dry::System::Container do
           Dry::System::FileNotFoundError, /test\.missing/
         )
       end
+
+      it 'returns for already registered components' do
+        component = container.component('test/foo')
+
+        registrar = -> {
+          container.register(component.identifier) { component.instance }
+        }
+
+        container.require_component(component, &registrar)
+
+        required = false
+        registrar = -> { required = true }
+        container.require_component(component, &registrar)
+        expect(required).to be(false)
+      end
     end
 
     describe '.load_component' do
       it 'loads and registers systems from configured load paths' do
         container.load_component('test.foo')
 
-        expect(Test.const_defined?(:Foo)).to be(true)
-        expect(Test.const_defined?(:Dep)).to be(true)
-
         expect(Test::Foo.new.dep).to be_instance_of(Test::Dep)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +170,6 @@ files:
 - lib/dry/system/container.rb
 - lib/dry/system/errors.rb
 - lib/dry/system/importer.rb
-- lib/dry/system/injector.rb
 - lib/dry/system/lifecycle.rb
 - lib/dry/system/loader.rb
 - lib/dry/system/version.rb
@@ -219,7 +218,6 @@ files:
 - spec/unit/container/import_spec.rb
 - spec/unit/container/injector_spec.rb
 - spec/unit/container_spec.rb
-- spec/unit/injector_spec.rb
 - spec/unit/loader_spec.rb
 homepage: http://dry-rb.org/gems/dry-system
 licenses:
@@ -241,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components
@@ -291,5 +289,4 @@ test_files:
 - spec/unit/container/import_spec.rb
 - spec/unit/container/injector_spec.rb
 - spec/unit/container_spec.rb
-- spec/unit/injector_spec.rb
 - spec/unit/loader_spec.rb

data/lib/dry/system/injector.rb

@@ -1,68 +0,0 @@
-require "dry-auto_inject"
-
-module Dry
-  module System
-    # Injection mixin builder
-    #
-    # Injector objects are created by containers and can be used to automatically
-    # define object constructors where depedencies will be injected in.
-    #
-    # Main purpose of this object is to provide injection along with lazy-loading
-    # of components on demand. This gives us a way to load components in
-    # isolation from the rest of the system.
-    #
-    # @see [Container.injector]
-    #
-    # @api public
-    class Injector < BasicObject
-      # @api private
-      attr_reader :container
-
-      # @api private
-      attr_reader :options
-
-      # @api private
-      attr_reader :injector
-
-      # @api private
-      def initialize(container, options: {}, strategy: :default)
-        @container = container
-        @options = options
-        @injector = ::Dry::AutoInject(container, options).__send__(strategy)
-      end
-
-      # Create injection mixin for specified dependencies
-      #
-      # @example
-      #   require 'system/import'
-      #
-      #   class UserRepo
-      #     include Import['persistence.db']
-      #   end
-      #
-      # @param [Array<String>] *deps Keys under which dependencies are registered
-      #
-      # @return [Dry::AutoInject::Injector]
-      #
-      # @api public
-      def [](*deps)
-        load_components(*deps)
-        injector[*deps]
-      end
-
-      private
-
-      # @api private
-      def method_missing(name, *args, &block)
-        ::Dry::System::Injector.new(container, options: options, strategy: name)
-      end
-
-      # @api private
-      def load_components(*keys, **aliases)
-        (keys + aliases.values).each do |key|
-          container.load_component(key)
-        end
-      end
-    end
-  end
-end

data/spec/unit/injector_spec.rb

@@ -1,72 +0,0 @@
-RSpec.describe Dry::System::Injector do
-  before do
-    class Test::Container < Dry::System::Container
-      configure do |config|
-        config.root = SPEC_ROOT.join('fixtures/test').realpath
-      end
-
-      load_paths! 'lib'
-    end
-
-    Test::Inject = Test::Container.injector
-  end
-
-  it 'supports args injection by default' do
-    obj = Class.new do
-      include Test::Inject['test.dep']
-    end.new
-
-    expect(obj.dep).to be_a Test::Dep
-  end
-
-  it 'supports args injection with explicit method' do
-    obj = Class.new do
-      include Test::Inject.args['test.dep']
-    end.new
-
-    expect(obj.dep).to be_a Test::Dep
-  end
-
-  it 'supports hash injection' do
-    obj = Class.new do
-      include Test::Inject.hash['test.dep']
-    end.new
-
-    expect(obj.dep).to be_a Test::Dep
-  end
-
-  it 'support kwargs injection' do
-    obj = Class.new do
-      include Test::Inject.kwargs['test.dep']
-    end.new
-
-    expect(obj.dep).to be_a Test::Dep
-  end
-
-  it 'allows injection strategies to be swapped' do
-    obj = Class.new do
-      include Test::Inject.kwargs.hash['test.dep']
-    end.new
-
-    expect(obj.dep).to be_a Test::Dep
-  end
-
-  it 'supports aliases' do
-    obj = Class.new do
-      include Test::Inject['test.dep', foo: 'test.dep']
-    end.new
-
-    expect(obj.dep).to be_a Test::Dep
-    expect(obj.foo).to be_a Test::Dep
-  end
-
-  context 'singleton' do
-    it 'supports injection' do
-      obj = Class.new do
-        include Test::Inject[foo: 'test.singleton_dep']
-      end.new
-
-      expect(obj.foo).to be_a Test::SingletonDep
-    end
-  end
-end