dry-component 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee78e672954f38457a8469c522b169caff7433ae
-  data.tar.gz: 8b649eed1db04abef81ac6d0512f38bbafd26cb3
+  metadata.gz: 6fd0b3400c225e2c1f856aff61cf4e554b8f9fc5
+  data.tar.gz: b9ead2e64ad32dee264b29973c932a1394dc6775
 SHA512:
-  metadata.gz: a0bf880fd5c645e2fa85c40061f66a9a8da31be70f0fadff877b15cccede26560215b52895fa9e1a443609f8db9dc587b00c821e1d75d0768675f98d28d978cd
-  data.tar.gz: 4ac3f8c0f089975e808736577bfb0e8fc3fcafebfeb6ca8ed440d4a060d9c2ef8eaadfc8801c3609e6991926bbd08fafc8fd4a9ce5aa4a55232f626f33a00843
+  metadata.gz: 6b38cbe04c32bd241421fe438551c8fc3d51ca9e23332f222f93f14c1afe33a4574848418298db8eeec621a679000d5eea01e42e2f389e5cfe43b1dcba339460
+  data.tar.gz: 06af0944d5af7614a50e381b2ceb5efd850ae10519f1deb8487e9ed7f19b3a6ec413446f2ec32f52983b11a3e718b3f22c9b3189c4ce95a70f6aac97a9ed42a7

data/.travis.yml

@@ -8,7 +8,8 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - rbx-2
+  - 2.3.1
+  - rbx
   - jruby-9000
   - ruby-head
   - jruby-head

data/CHANGELOG.md

@@ -1,3 +1,39 @@
-# v0.0.1 2015-12-24
+# 0.1.0 - 2016-06-07
+
+## Added
+
+* Provide a dependency injector as an `Inject` constant inside any subclass of `Dry::Component::Container`. This injector supports all of `dry-auto_inject`'s default injection strategies, and will lazily load any dependencies as they are injected. It also supports arbitrarily switching strategies, so they can be used in different classes as required (e.g. `include MyComponent::Inject.args["dep"]`) (timriley)
+* Support aliased dependency names when calling the injector object (e.g. `MyComponent::Inject[foo: "my_app.foo", bar: "another.thing"]`) (timriley)
+* Allow a custom dependency loader to be set on a container via its config (AMHOL)
+    ```ruby
+    class MyContainer < Dry::Component::Container
+      configure do |config|
+        # other config
+        config.loader = MyLoader
+      end
+    end
+    ```
+
+## Changed
+
+* `Container.boot` now only makes a simple `require` for the boot file (solnic)
+* Container object is passed to `Container.finalize` blocks (solnic)
+* Allow `Pathname` objects passed to `Container.require` (solnic)
+* Support lazily loading missing dependencies from imported containers (solnic)
+* `Container.import_module` renamed to `.injector` (timriley)
+* Default injection strategy is now `kwargs`, courtesy of the new dry-auto_inject default (timriley)
+
+# 0.0.2 - 2015-12-24
+
+## Added
+
+* Containers have a `name` setting (solnic)
+* Containers can be imported into one another (solnic)
+
+## Changed
+
+* Container name is used to determine the name of its config file (solnic)
+
+# 0.0.1 - 2015-12-24
 
 First public release, extracted from rodakase project

data/README.md

@@ -1,217 +1,14 @@
-# dry-component <a href="https://gitter.im/dryrb/chat" target="_blank">![Join the chat at https://gitter.im/dryrb/chat](https://badges.gitter.im/Join%20Chat.svg)</a>
+# dry-component <a href="https://gitter.im/dry-rb/chat" target="_blank">![Join the chat at https://gitter.im/dry-rb/chat](https://badges.gitter.im/Join%20Chat.svg)</a>
 
 <a href="https://rubygems.org/gems/dry-component" target="_blank">![Gem Version](https://badge.fury.io/rb/dry-component.svg)</a>
-<a href="https://travis-ci.org/dryrb/dry-component" target="_blank">![Build Status](https://travis-ci.org/dryrb/dry-component.svg?branch=master)</a>
-<a href="https://gemnasium.com/dryrb/dry-component" target="_blank">![Dependency Status](https://gemnasium.com/dryrb/dry-component.svg)</a>
-<a href="https://codeclimate.com/github/dryrb/dry-component" target="_blank">![Code Climate](https://codeclimate.com/github/dryrb/dry-component/badges/gpa.svg)</a>
-<a href="http://inch-ci.org/github/dryrb/dry-component" target="_blank">![Documentation Status](http://inch-ci.org/github/dryrb/dry-component.svg?branch=master&style=flat)</a>
+<a href="https://travis-ci.org/dry-rb/dry-component" target="_blank">![Build Status](https://travis-ci.org/dry-rb/dry-component.svg?branch=master)</a>
+<a href="https://gemnasium.com/dry-rb/dry-component" target="_blank">![Dependency Status](https://gemnasium.com/dry-rb/dry-component.svg)</a>
+<a href="https://codeclimate.com/github/dry-rb/dry-component" target="_blank">![Code Climate](https://codeclimate.com/github/dry-rb/dry-component/badges/gpa.svg)</a>
+<a href="http://inch-ci.org/github/dry-rb/dry-component" target="_blank">![Documentation Status](http://inch-ci.org/github/dry-rb/dry-component.svg?branch=master&style=flat)</a>
 
-Sane dependency management system allowing you to configure reusable components
-in any environment, set up their load-paths, require needed files and instantiate
-objects automatically with the ability to have them injected as dependencies.
+## Links
 
-Originally built for [rodakase](https://github.com/solnic/rodakase) stack, now as
-a standalone, small library.
-
-This is a simple system that relies on very basic mechanisms provided by Ruby,
-specifically `require` and managing `$LOAD_PATH`. It does not rely on any magic
-like automatic const resolution, it's pretty much the opposite and forces you to
-be explicit about dependencies in your applications.
-
-It does a couple of things for you that are really not something you want to do
-yourself:
-
-* Provides an abstract dependency container implementation
-* Handles `$LOAD_PATH` configuration
-* Loads needed files using `require`
-* Resolves dependencies automatically
-* Supports auto-registration of dependencies via file/dir naming conventions
-* Provides support for custom configuration loaded from external sources (ie YAML)
-
-To put it all together, this allows you to configure your system in a way where
-you have full control over dependencies and it's very easy to draw the boundaries
-between individual components.
-
-This comes with a bunch of nice benefits:
-
-* Your system relies on abstractions rather than concrete classes and modules
-* It helps in decoupling your code from 3rd party code
-* It makes it possible to load components in complete isolation. In example you
-  can run a single test for a single component and only required files will be
-  loaded, or you can run a rake task and it will only load the things it needs.
-* It opens up doors for better instrumentation and debugging tools
-
-## Container
-
-Main API is the abstract container that you inherit from. It allows you to configure
-basic settings and exposes APIs for requiring files easily.
-
-Let's say you want to define an application container that will provide a logger:
-
-``` ruby
-require 'dry/component/container'
-
-class Application < Dry::Component::Container
-  configure do |config|
-    config.root = '/my/app'
-  end
-end
-
-# now you can register a logger
-require 'logger'
-Application.register('utils.logger', Logger.new($stdout))
-
-# and access it
-Application['utils.logger']
-```
-
-## Auto-Registration
-
-By using simple naming conventions we can automatically register objects within
-our container.
-
-Let's provide a custom logger object and put it under a custom load-path that we
-will configure:
-
-``` ruby
-require 'dry/component/container'
-
-class Application < Dry::Component::Container
-  configure do |config|
-    config.root = '/my/app'
-
-    # we set 'lib' relative to `root` as a path which contains class definitions
-    # that can be auto-registered
-    config.auto_register = 'lib'
-  end
-
-  # this alters $LOAD_PATH hence the `!`
-  load_paths!('lib')
-end
-
-# under /my/app/lib/logger.rb we put
-class Logger
-  # some neat logger implementation
-end
-
-# we can finalize the container which triggers auto-registration
-Application.finalize!
-
-# the logger becomes available
-Application['logger']
-```
-
-## Auto-Import Mechanism
-
-After defining a container, we can use its import module that will inject object
-dependencies automatically.
-
-Let's say we have an object that will need a logger:
-
-``` ruby
-# let's define an import module
-Import = Application.import_module
-
-# in a class definition you simply specify what it needs
-class PostPublisher
-  include Import['utils.logger']
-
-  def call(post)
-    # some stuff
-    logger.debug("post published: #{post}")
-  end
-end
-```
-
-## Directory Structure
-
-You need to provide a specific directory/file structure but names of directories
-are configurable. The default is as follows:
-
-```
-#{root}
-  |- core
-    |- boot
-      # arbitrary files that are automatically loaded on finalization
-```
-
-## Booting a Dependency
-
-In some cases a dependency can be huge, so huge it needs to load some additional
-files (often 3rd party code) and it may rely on custom configuration.
-
-Because of this reason `dry-component` has the concept of booting a dependency.
-
-The convention is pretty simple. You put files under `boot` directory and use
-your container to register dependencies with the ability to postpone finalization.
-This gives us a way to define what's needed but load it and boot it on demand.
-
-Here's a simple example:
-
-``` ruby
-# under /my/app/boot/heavy_dep.rb
-
-Application.finalize(:persistence) do
-  # some 3rd-party dependency
-  require '3rd-party/database'
-
-  container.register('database') do
-    # some code which initializes this thing
-  end
-end
-```
-
-After defining the finalization block our container will not call it until its
-own finalization. This means we can require file that defines our container
-and ask it to boot *just that one :persistence dependency*:
-
-``` ruby
-# under /my/app/boot/container.rb
-class Application < Dry::Component::Container
-  configure do |config|
-    config.root = '/my/app'
-  end
-end
-
-Application.boot!(:persistence)
-
-# and now `database` becomes available
-Application['database']
-```
-
-## Environment & Providing Arbitrary Options
-
-In most of the systems you need some kind of options for your runtime. Typically
-it's provided via ENV vars or a yaml file in development mode. `dry-component`
-has a built-in support for this.
-
-You can simply put a file under `#{root}/config/application.yml` and it will be
-loaded:
-
-``` yaml
-# /my/app/config/application.yml
-development:
-  foo: 'bar'
-```
-
-Now let's configure our container for a specific env:
-
-``` ruby
-class Application < Dry::Component::Container
-  configure('development') do |config|
-    config.root = '/my/app'
-  end
-end
-
-# now our application options are available
-Application.options.foo # => "bar"
-```
-
-## Underlying Tools
-
-`dry-component` uses [dry-container](https://github.com/dryrb/dry-container) and
-[dry-auto_inject](https://github.com/dryrb/dry-auto_inject) under the hood. These
-gems are very small and simple with a total 254LOC. Just saying.
+* [Documentation](http://dry-rb.org/gems/dry-component)
 
 ## LICENSE
 

data/dry-component.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'memoizable', '~> 0.4'
   spec.add_runtime_dependency 'inflecto', '>= 0.0.2'
-  spec.add_runtime_dependency 'dry-container', '~> 0.2', '>= 0.2.7'
-  spec.add_runtime_dependency 'dry-auto_inject', '~> 0.1'
+  spec.add_runtime_dependency 'dry-container', '~> 0.3', '>= 0.3.4'
+  spec.add_runtime_dependency 'dry-auto_inject', '~> 0.3'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
 
   spec.add_development_dependency 'bundler'

data/lib/dry/component/config.rb

@@ -3,20 +3,20 @@ require 'yaml'
 module Dry
   module Component
     class Config
-      extend Dry::Configurable
-
-      def self.load(root, env)
-        path = root.join('config').join('application.yml')
+      def self.load(root, name, env)
+        path = root.join('config').join("#{name}.yml")
 
         return {} unless File.exist?(path)
 
         yaml = YAML.load_file(path)
 
-        yaml.fetch(env.to_s).each do |key, value|
-          setting key.downcase.to_sym, ENV.fetch(key, value)
-        end
+        Class.new do
+          extend Dry::Configurable
 
-        config
+          yaml.fetch(env.to_s).each do |key, value|
+            setting key.downcase.to_sym, ENV.fetch(key, value)
+          end
+        end.config
       end
     end
   end

data/lib/dry/component/container.rb

@@ -1,7 +1,9 @@
+require 'pathname'
 require 'inflecto'
+
 require 'dry-container'
-require 'dry-auto_inject'
 
+require 'dry/component/injector'
 require 'dry/component/loader'
 require 'dry/component/config'
 
@@ -11,17 +13,24 @@ module Dry
       extend Dry::Container::Mixin
 
       setting :env
+      setting :name
       setting :root, Pathname.pwd.freeze
       setting :core_dir, 'core'.freeze
       setting :auto_register
       setting :options
+      setting :loader, Dry::Component::Loader
+
+      def self.inherited(subclass)
+        super
+        subclass.const_set :Inject, subclass.injector
+      end
 
       def self.configure(env = config.env, &block)
         return self if configured?
 
         super() do |config|
           yield(config) if block
-          config.options = Config.load(root, env)
+          config.options = Config.load(root, config.name, env)
         end
 
         load_paths!(config.core_dir)
@@ -31,12 +40,23 @@ module Dry
         self
       end
 
+      def self.import(other)
+        case other
+        when Dry::Container::Namespace then super
+        when Hash then imports.update(other)
+        else
+          if other < Component::Container
+            imports.update(other.config.name => other)
+          end
+        end
+      end
+
       def self.options
         config.options
       end
 
       def self.finalize(name, &block)
-        finalizers[name] = block
+        finalizers[name] = proc { block.(self) }
       end
 
       def self.configured?
@@ -46,6 +66,10 @@ module Dry
       def self.finalize!(&_block)
         yield(self) if block_given?
 
+        imports.each do |ns, container|
+          import_container(ns, container.finalize!)
+        end
+
         Dir[root.join("#{config.core_dir}/boot/**/*.rb")].each do |path|
           boot!(File.basename(path, '.rb').to_sym)
         end
@@ -55,13 +79,8 @@ module Dry
         freeze
       end
 
-      def self.import_module
-        auto_inject = Dry::AutoInject(self)
-
-        -> *keys {
-          keys.each { |key| load_component(key) unless key?(key) }
-          auto_inject[*keys]
-        }
+      def self.injector
+        Injector.new(self)
       end
 
       def self.auto_register!(dir, &_block)
@@ -69,7 +88,7 @@ module Dry
 
         Dir["#{root}/#{dir}/**/*.rb"].each do |path|
           component_path = path.to_s.gsub("#{dir_root}/", '').gsub('.rb', '')
-          Component.Loader(component_path).tap do |component|
+          config.loader.new(component_path).tap do |component|
             next if key?(component.identifier)
 
             Kernel.require component.path
@@ -87,19 +106,22 @@ module Dry
 
       def self.boot!(name)
         check_component_identifier!(name)
+
         return self unless booted?(name)
-        boot(name)
-        self
-      end
 
-      def self.boot(name)
-        require "#{config.core_dir}/boot/#{name}.rb"
+        boot(name)
 
         finalizers[name].tap do |finalizer|
           finalizer.() if finalizer
         end
 
         booted[name] = true
+
+        self
+      end
+
+      def self.boot(name)
+        require "#{config.core_dir}/boot/#{name}"
       end
 
       def self.booted?(name)
@@ -108,25 +130,37 @@ module Dry
 
       def self.require(*paths)
         paths.flat_map { |path|
-          path.include?('*') ? Dir[root.join(path)] : root.join(path)
+          path.to_s.include?('*') ? Dir[root.join(path)] : root.join(path)
         }.each { |path|
           Kernel.require path.to_s
         }
       end
 
       def self.load_component(key)
-        require_component(key) { |klass| register(key) { klass.new } }
+        component = config.loader.new(key)
+        src_key = component.namespaces[0]
+
+        if imports.key?(src_key)
+          src_container = imports[src_key]
+
+          src_container.load_component(
+            (component.namespaces - [src_key]).map(&:to_s).join('.')
+          )
+
+          import_container(src_key, src_container)
+        else
+          require_component(component) { |klass| register(key) { klass.new } }
+        end
       end
 
-      def self.require_component(key, &block)
-        component = Component.Loader(key)
+      def self.require_component(component, &block)
         path = load_paths.detect { |p| p.join(component.file).exist? }
 
         if path
           Kernel.require component.path
           yield(component.constant) if block
         else
-          fail ArgumentError, "could not resolve require file for #{key}"
+          fail ArgumentError, "could not resolve require file for #{component.identifier}"
         end
       end
 
@@ -155,8 +189,20 @@ module Dry
         @finalizers ||= {}
       end
 
+      def self.imports
+        @imports ||= {}
+      end
+
       private
 
+      def self.import_container(ns, container)
+        items = container._container.each_with_object({}) { |(key, item), res|
+          res[[ns, key].join(config.namespace_separator)] = item
+        }
+
+        _container.update(items)
+      end
+
       def self.auto_register
         Array(config.auto_register)
       end

data/lib/dry/component/injector.rb

@@ -0,0 +1,63 @@
+require "dry-auto_inject"
+
+module Dry
+  module Component
+    class Injector
+      # @api private
+      attr_reader :container
+
+      # @api private
+      attr_reader :injector
+
+      # @api private
+      def initialize(container, strategy: :args, strategies_cache: nil)
+        @container = container
+        @strategies = strategies_cache
+
+        @injector = if strategy == :args
+          Dry::AutoInject(container)
+        else
+          Dry::AutoInject(container).send(strategy)
+        end
+      end
+
+      # @api public
+      def [](*deps)
+        load_components(*deps)
+        injector[*deps]
+      end
+
+      # @api public
+      def args
+        strategies[:args]
+      end
+
+      # @api public
+      def hash
+        strategies[:hash]
+      end
+
+      # @api public
+      def kwargs
+        strategies[:kwargs]
+      end
+
+      private
+
+      def load_components(*components)
+        components = components.dup
+        aliases = components.last.is_a?(Hash) ? components.pop : {}
+
+        (components + aliases.values).each do |key|
+          container.load_component(key) unless container.key?(key)
+        end
+      end
+
+      def strategies
+        @strategies ||= Hash.new do |cache, strategy|
+          cache[strategy] = self.class.new(container, strategy: strategy, strategies_cache: cache)
+        end
+      end
+    end
+  end
+end

data/lib/dry/component/loader.rb

@@ -1,47 +1,36 @@
-require 'memoizable'
 require 'inflecto'
 
 module Dry
   module Component
-    def self.Loader(input)
-      Loader.new(Loader.identifier(input), Loader.path(input))
-    end
-
     class Loader
-      include Memoizable
-
       IDENTIFIER_SEPARATOR = '.'.freeze
       PATH_SEPARATOR = '/'.freeze
 
       attr_reader :identifier, :path, :file
 
-      def self.identifier(input)
-        input.to_s.gsub(PATH_SEPARATOR, IDENTIFIER_SEPARATOR)
-      end
-
-      def self.path(input)
-        input.to_s.gsub(IDENTIFIER_SEPARATOR, PATH_SEPARATOR)
-      end
-
-      def initialize(identifier, path)
-        @identifier = identifier
-        @path = path
+      def initialize(input)
+        @identifier = input.to_s.gsub(PATH_SEPARATOR, IDENTIFIER_SEPARATOR)
+        @path = input.to_s.gsub(IDENTIFIER_SEPARATOR, PATH_SEPARATOR)
         @file = "#{path}.rb"
       end
 
-      def name
-        Inflecto.camelize(path)
+      def namespaces
+        identifier.split(IDENTIFIER_SEPARATOR).map(&:to_sym)
       end
-      memoize :name
 
       def constant
         Inflecto.constantize(name)
       end
-      memoize :constant
 
       def instance(*args)
         constant.new(*args)
       end
+
+      private
+
+      def name
+        Inflecto.camelize(path)
+      end
     end
   end
 end

data/lib/dry/component/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Component
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/spec/fixtures/components/bar.rb

@@ -0,0 +1,5 @@
+class Bar
+  def self.call
+    "Welcome to my Moe's Tavern!"
+  end
+end

data/spec/fixtures/components/bar/baz.rb

@@ -0,0 +1,4 @@
+class Bar
+  class Baz
+  end
+end

data/spec/fixtures/components/foo.rb

@@ -0,0 +1,2 @@
+class Foo
+end

data/spec/fixtures/import_test/config/application.yml

@@ -0,0 +1,2 @@
+test:
+  foo: 'bar'

data/spec/fixtures/import_test/core/boot/bar.rb

@@ -0,0 +1,11 @@
+Test::Container.namespace(:test) do |container|
+  module Test
+    module Bar
+      # I shall be booted
+    end
+  end
+
+  container.finalize(:bar) do
+    container.register(:bar, 'I was finalized')
+  end
+end

data/spec/fixtures/import_test/lib/test/bar.rb

@@ -0,0 +1,4 @@
+module Test
+  class Bar
+  end
+end

data/spec/fixtures/import_test/lib/test/foo.rb

@@ -0,0 +1,5 @@
+module Test
+  class Foo
+    include Import['test.bar']
+  end
+end

data/spec/fixtures/lazytest/config/application.yml

@@ -0,0 +1,2 @@
+test:
+  foo: 'bar'

data/spec/fixtures/lazytest/core/boot/bar.rb

@@ -0,0 +1,11 @@
+Test::Container.namespace(:test) do |container|
+  module Test
+    module Bar
+      # I shall be booted
+    end
+  end
+
+  container.finalize(:bar) do
+    container.register(:bar, 'I was finalized')
+  end
+end

data/spec/fixtures/lazytest/lib/test/dep.rb

@@ -0,0 +1,4 @@
+module Test
+  class Dep
+  end
+end

data/spec/fixtures/lazytest/lib/test/foo.rb

@@ -0,0 +1,5 @@
+module Test
+  class Foo
+    include Import['test.dep']
+  end
+end

data/spec/fixtures/lazytest/lib/test/models.rb

@@ -0,0 +1,4 @@
+module Test
+  module Models
+  end
+end

data/spec/fixtures/lazytest/lib/test/models/book.rb

@@ -0,0 +1,6 @@
+module Test
+  module Models
+    class Book
+    end
+  end
+end

data/spec/fixtures/lazytest/lib/test/models/user.rb

@@ -0,0 +1,6 @@
+module Test
+  module Models
+    class User
+    end
+  end
+end

data/spec/fixtures/test/config/subapp.yml

@@ -0,0 +1,2 @@
+test:
+  bar: 'baz'

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ RSpec.configure do |config|
 
   config.before do
     @load_paths = $LOAD_PATH.dup
+    @loaded_features = $LOADED_FEATURES.dup
     Object.const_set(:Test, Module.new { |m| m.extend(TestNamespace) })
   end
 
@@ -40,6 +41,10 @@ RSpec.configure do |config|
     ($LOAD_PATH - @load_paths).each do |path|
       $LOAD_PATH.delete(path)
     end
+    ($LOADED_FEATURES - @loaded_features).each do |file|
+      $LOADED_FEATURES.delete(file)
+    end
+
     Test.remove_constants
     Object.send(:remove_const, :Test)
   end

data/spec/unit/config_spec.rb

@@ -4,6 +4,14 @@ RSpec.describe Dry::Component::Config do
   before do
     class Test::App < Dry::Component::Container
       configure do |config|
+        config.name = :application
+        config.root = SPEC_ROOT.join('fixtures/test').realpath
+      end
+    end
+
+    class Test::SubApp < Dry::Component::Container
+      configure do |config|
+        config.name = :subapp
         config.root = SPEC_ROOT.join('fixtures/test').realpath
       end
     end
@@ -12,4 +20,8 @@ RSpec.describe Dry::Component::Config do
   it 'loads config under component name' do
     expect(Test::App.options.foo).to eql('bar')
   end
+
+  it 'allows different components to have different configurations' do
+    expect(Test::SubApp.options.bar).to eql('baz')
+  end
 end

data/spec/unit/container/auto_register_spec.rb

@@ -0,0 +1,50 @@
+require 'dry/component/container'
+
+RSpec.describe Dry::Component::Container, '.auto_register!' do
+  context 'with the standard loader' do
+    before do
+      class Test::Container < Dry::Component::Container
+        configure do |config|
+          config.root = SPEC_ROOT.join('fixtures').realpath
+        end
+
+        load_paths!('components')
+        auto_register!('components')
+      end
+    end
+
+    it { expect(Test::Container['foo']).to be_an_instance_of(Foo) }
+    it { expect(Test::Container['bar']).to be_an_instance_of(Bar) }
+    it { expect(Test::Container['bar.baz']).to be_an_instance_of(Bar::Baz) }
+  end
+
+  context 'with a custom loader' do
+    before do
+      class Test::Loader < Dry::Component::Loader
+        def identifier
+          super.gsub('.', '-')
+        end
+
+        def instance(*args)
+          constant.respond_to?(:call) ? constant : constant.new(*args)
+        end
+      end
+
+      class Test::Container < Dry::Component::Container
+        configure do |config|
+          config.root = SPEC_ROOT.join('fixtures').realpath
+          config.loader = ::Test::Loader
+        end
+
+        load_paths!('components')
+        auto_register!('components')
+      end
+    end
+    
+    it { expect(Test::Container['foo']).to be_an_instance_of(Foo) }
+    it { expect(Test::Container['bar']).to eq(Bar) }
+    it { expect(Test::Container['bar'].call).to eq("Welcome to my Moe's Tavern!") }
+    it { expect(Test::Container['bar-baz']).to be_an_instance_of(Bar::Baz) }
+  end
+
+end

data/spec/unit/container/import_spec.rb

@@ -0,0 +1,70 @@
+require 'dry/component/container'
+
+RSpec.describe Dry::Component::Container, '.import' do
+  subject(:app) { Class.new(Dry::Component::Container) }
+
+  let(:db) do
+    Class.new(Dry::Component::Container) do
+      register(:users, %w(jane joe))
+    end
+  end
+
+  shared_examples_for 'an extended container' do
+    it 'imports one container into another' do
+      expect(app.key?('persistence.users')).to be(false)
+
+      app.finalize!
+
+      expect(app['persistence.users']).to eql(%w(jane joe))
+    end
+  end
+
+  context 'when a container has a name' do
+    before do
+      db.configure { |c| c.name = :persistence }
+      app.import(db)
+    end
+
+    it_behaves_like 'an extended container'
+  end
+
+  context 'when container does not have a name' do
+    before do
+      app.import(persistence: db)
+    end
+
+    it_behaves_like 'an extended container'
+  end
+
+  describe 'import module' do
+    it 'loads component when it was not loaded in the imported container yet' do
+      class Test::Other < Dry::Component::Container
+        configure do |config|
+          config.root = SPEC_ROOT.join('fixtures/import_test').realpath
+        end
+
+        load_paths!('lib')
+      end
+
+      class Test::Container < Dry::Component::Container
+        configure do |config|
+          config.root = SPEC_ROOT.join('fixtures/test').realpath
+        end
+
+        load_paths!('lib')
+
+        import other: Test::Other
+      end
+
+      module Test
+        Import = Container::Inject
+      end
+
+      class Test::Foo
+        include Test::Import['other.test.bar']
+      end
+
+      expect(Test::Foo.new.bar).to be_instance_of(Test::Bar)
+    end
+  end
+end

data/spec/unit/container_spec.rb

@@ -14,28 +14,28 @@ RSpec.describe Dry::Component::Container do
       end
 
       module Test
-        Import = Container.import_module
+        Import = Container::Inject
       end
     end
 
     describe '.require' do
       it 'requires a single file' do
-        container.require('lib/test/models')
+        container.require(Pathname('lib/test/models'))
 
         expect(Test.const_defined?(:Models)).to be(true)
       end
 
       it 'requires many files when glob pattern is passed' do
-        container.require('lib/test/models/*.rb')
+        container.require(Pathname('lib/test/models/*.rb'))
 
         expect(Test::Models.const_defined?(:User)).to be(true)
         expect(Test::Models.const_defined?(:Book)).to be(true)
       end
     end
 
-    describe '.require_component' do
-      it 'requires components from configured load paths' do
-        container.require_component('test.foo')
+    describe '.load_component' do
+      it 'loads and registers components 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)
@@ -45,6 +45,25 @@ RSpec.describe Dry::Component::Container do
     end
   end
 
+  describe '.boot' do
+    before do
+      class Test::Container < Dry::Component::Container
+        configure do |config|
+          config.root = SPEC_ROOT.join('fixtures/lazytest').realpath
+        end
+
+        load_paths!('lib')
+      end
+    end
+
+    it 'lazy-boot a given component' do
+      container.boot(:bar)
+
+      expect(Test.const_defined?(:Bar)).to be(true)
+      expect(container.key?('test.bar')).to be(false)
+    end
+  end
+
   describe '.boot!' do
     shared_examples_for 'a booted component' do
       it 'boots a given component and finalizes it' do
@@ -98,5 +117,19 @@ RSpec.describe Dry::Component::Container do
         end
       end
     end
+
+    it 'passes container to the finalizer block' do
+      class Test::Container < Dry::Component::Container
+        configure { |c| c.env = :awesome }
+
+        finalize(:foo) do |container|
+          register(:w00t, container.config.env)
+        end
+      end
+
+      Test::Container.finalizers[:foo].()
+
+      expect(Test::Container[:w00t]).to be(:awesome)
+    end
   end
 end

data/spec/unit/injector_spec.rb

@@ -0,0 +1,59 @@
+RSpec.describe Dry::Component::Injector do
+  before do
+    class Test::Container < Dry::Component::Container
+      configure do |config|
+        config.root = SPEC_ROOT.join("fixtures/test").realpath
+      end
+
+      load_paths! "lib"
+    end
+  end
+
+  it "supports args injection by default" do
+    obj = Class.new do
+      include Test::Container::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::Container::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::Container::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::Container::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::Container::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::Container::Inject[foo: "test.dep"]
+    end.new
+
+    expect(obj.foo).to be_a Test::Dep
+  end
+end

data/spec/unit/loader_spec.rb

@@ -9,12 +9,6 @@ RSpec.describe Dry::Component::Loader do
   end
 
   shared_examples_for 'a valid component' do
-    describe '#name' do
-      it 'returns name of the constant' do
-        expect(component.name).to eql('Test::Bar')
-      end
-    end
-
     describe '#constant' do
       it 'returns the constant' do
         expect(component.constant).to be(Test::Bar)
@@ -47,19 +41,19 @@ RSpec.describe Dry::Component::Loader do
   end
 
   context 'from identifier as a symbol' do
-    subject(:component) { Dry::Component::Loader(:'test.bar') }
+    subject(:component) { Dry::Component::Loader.new(:'test.bar') }
 
     it_behaves_like 'a valid component'
   end
 
   context 'from identifier as a string' do
-    subject(:component) { Dry::Component::Loader('test.bar') }
+    subject(:component) { Dry::Component::Loader.new('test.bar') }
 
     it_behaves_like 'a valid component'
   end
 
   context 'from path' do
-    subject(:component) { Dry::Component::Loader('test/bar') }
+    subject(:component) { Dry::Component::Loader.new('test/bar') }
 
     it_behaves_like 'a valid component'
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dry-component
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: memoizable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -44,34 +30,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -150,8 +136,23 @@ files:
 - lib/dry/component.rb
 - lib/dry/component/config.rb
 - lib/dry/component/container.rb
+- lib/dry/component/injector.rb
 - lib/dry/component/loader.rb
 - lib/dry/component/version.rb
+- spec/fixtures/components/bar.rb
+- spec/fixtures/components/bar/baz.rb
+- spec/fixtures/components/foo.rb
+- spec/fixtures/import_test/config/application.yml
+- spec/fixtures/import_test/core/boot/bar.rb
+- spec/fixtures/import_test/lib/test/bar.rb
+- spec/fixtures/import_test/lib/test/foo.rb
+- spec/fixtures/lazytest/config/application.yml
+- spec/fixtures/lazytest/core/boot/bar.rb
+- spec/fixtures/lazytest/lib/test/dep.rb
+- spec/fixtures/lazytest/lib/test/foo.rb
+- spec/fixtures/lazytest/lib/test/models.rb
+- spec/fixtures/lazytest/lib/test/models/book.rb
+- spec/fixtures/lazytest/lib/test/models/user.rb
 - spec/fixtures/other/config/boot/bar.rb
 - spec/fixtures/other/lib/test/dep.rb
 - spec/fixtures/other/lib/test/foo.rb
@@ -159,6 +160,7 @@ files:
 - spec/fixtures/other/lib/test/models/book.rb
 - spec/fixtures/other/lib/test/models/user.rb
 - spec/fixtures/test/config/application.yml
+- spec/fixtures/test/config/subapp.yml
 - spec/fixtures/test/core/boot/bar.rb
 - spec/fixtures/test/lib/test/dep.rb
 - spec/fixtures/test/lib/test/foo.rb
@@ -167,7 +169,10 @@ files:
 - spec/fixtures/test/lib/test/models/user.rb
 - spec/spec_helper.rb
 - spec/unit/config_spec.rb
+- spec/unit/container/auto_register_spec.rb
+- spec/unit/container/import_spec.rb
 - spec/unit/container_spec.rb
+- spec/unit/injector_spec.rb
 - spec/unit/loader_spec.rb
 homepage: https://github.com/dryrb/dry-component
 licenses:
@@ -189,11 +194,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components
 test_files:
+- spec/fixtures/components/bar.rb
+- spec/fixtures/components/bar/baz.rb
+- spec/fixtures/components/foo.rb
+- spec/fixtures/import_test/config/application.yml
+- spec/fixtures/import_test/core/boot/bar.rb
+- spec/fixtures/import_test/lib/test/bar.rb
+- spec/fixtures/import_test/lib/test/foo.rb
+- spec/fixtures/lazytest/config/application.yml
+- spec/fixtures/lazytest/core/boot/bar.rb
+- spec/fixtures/lazytest/lib/test/dep.rb
+- spec/fixtures/lazytest/lib/test/foo.rb
+- spec/fixtures/lazytest/lib/test/models.rb
+- spec/fixtures/lazytest/lib/test/models/book.rb
+- spec/fixtures/lazytest/lib/test/models/user.rb
 - spec/fixtures/other/config/boot/bar.rb
 - spec/fixtures/other/lib/test/dep.rb
 - spec/fixtures/other/lib/test/foo.rb
@@ -201,6 +220,7 @@ test_files:
 - spec/fixtures/other/lib/test/models/book.rb
 - spec/fixtures/other/lib/test/models/user.rb
 - spec/fixtures/test/config/application.yml
+- spec/fixtures/test/config/subapp.yml
 - spec/fixtures/test/core/boot/bar.rb
 - spec/fixtures/test/lib/test/dep.rb
 - spec/fixtures/test/lib/test/foo.rb
@@ -209,5 +229,8 @@ test_files:
 - spec/fixtures/test/lib/test/models/user.rb
 - spec/spec_helper.rb
 - spec/unit/config_spec.rb
+- spec/unit/container/auto_register_spec.rb
+- spec/unit/container/import_spec.rb
 - spec/unit/container_spec.rb
+- spec/unit/injector_spec.rb
 - spec/unit/loader_spec.rb