carb-inject 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7e8fdd6dec580c4ea33d02cfb2796409c964c9
-  data.tar.gz: 941f73b2350fc7f498d50d09e0dafdb5760a7f2c
+  metadata.gz: ec9c33b40226c4f3d929c3140246ece906a9aa88
+  data.tar.gz: b50a7e143d39e3f4b41a4f979ff21ec6f72044cc
 SHA512:
-  metadata.gz: 0e22b75b3e7d5790ced046f8637ea6bbaa0431a04e18bfaea3a686921dd00685a343e11c38241fa3227300b4101b0f59d5206ab03e38e9df7aa169f31c154c93
-  data.tar.gz: 2d8bfe0487510f41c98f1883e838d395c4c48cc29b1530452ddf359a18fa4410d33cac3be340bff71109c70f545a1f79a19d0972a7553746e57bf9c10504a951
+  metadata.gz: 1a109b1c64627bfb59ae24b026dd1d651e80ce984e04331c379ca28214dfa678d07361c001260b31914f3fe2fd5c5567a65ea062c1cadd1dc937ce2da3575e53
+  data.tar.gz: 68a6d7d6253e959ac084420b757b5ea7d4085868d3a0c596552053659692266ed988b878522ee69eb60e0126137c1b495b0bc3a753bd00c2d8e855039f9243ac

data/README.md

@@ -2,7 +2,9 @@
 
 `carb-inject` is an utility library for automated dependency injection.
 Together with a generic container (even a simple `Hash`!), it will cover all
-the needs for an IoC container.
+the needs for an IoC container. Check out
+[carb-container](https://github.com/Carburetor/carb-container) for more
+advanced ones.
 
 ## Installation
 
@@ -67,10 +69,10 @@ Or install it yourself as:
 ## Usage
 
 First you'll need a container object.
-[dry-container](https://github.com/dry-rb/dry-container) will do the trick,
-otherwise just check the implementation of
-[Carb::SimpleContainer](https://github.com/Carburetor/carb-inject/blob/b3e9fea68672284aff53c8b78ba0064474d94021/spec/support/simple_container.rb) in
-tests
+[carb-container](https://github.com/Carburetor/carb-container) provides a
+simple `RegistryContainer` which you can use.
+Alternatively, you can use a simple ruby hashmap, or use `carb-inject` in an
+entirely [containerless fashion](#passing-lambdas)
 
 ```ruby
 container = { name: "john", age: 30 }
@@ -232,12 +234,11 @@ john.hello # => Hello I'm John Snow, 30 years old
 
 ## Features
 
-- Supports inheritance (as long as you call `super`)
+- Supports inheritance
 - Can write your own injector if you don't like the syntax of the existing one
 - Can alias dependencies
-- Supports any container which responds to `[]`
-- Can write your own initializer with your own arguments (as long as you call
-  `super`)
+- Supports any container which responds to `[]` and `has_key?`
+- Can write your own initializer with your own arguments
 
 ## Development
 

data/carb-inject.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "carb-core", ">= 1.0.0"
+  spec.add_dependency "carb-container", ">= 0.1.0"
+  spec.add_dependency "carb-core",      ">= 1.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake",    "~> 11.0"

data/lib/carb/inject.rb

@@ -3,7 +3,6 @@ require "carb/inject/dependency_list_cache_name"
 require "carb/inject/dependency_list"
 require "carb/inject/injectable"
 require "carb/inject/injector"
-require "carb/inject/dependency_missing_error"
 
 module Carb
   module Inject

data/lib/carb/inject/injector.rb

@@ -1,8 +1,8 @@
 require "carb"
 require "carb/inject/dependency_list"
-require "carb/inject/error_container"
-require "carb/inject/delegate_container"
-require "carb/inject/callable_container"
+require "carb/container/error_container"
+require "carb/container/delegate_container"
+require "carb/container/registry_container"
 
 module Carb::Inject
   # Creates an injector with the specified container
@@ -22,7 +22,7 @@ module Carb::Inject
     #   injects dependencies by including {::Carb::Inject::AutoInjectable},
     #   false by default
     def initialize(container = nil, auto_inject = false)
-      @container   = container || ErrorContainer.new
+      @container   = container || ::Carb::Container::ErrorContainer.new
       @auto_inject = auto_inject
     end
 
@@ -51,8 +51,8 @@ module Carb::Inject
     private
 
     def build_delegate(container, lambdas)
-      callable = CallableContainer.new(lambdas)
-      DelegateContainer.new(callable, container)
+      registry = ::Carb::Container::RegistryContainer.new(lambdas)
+      ::Carb::Container::DelegateContainer.new([registry, container])
     end
 
     def merge_dependencies(dependencies, aliased_dependencies)

data/lib/carb/inject/version.rb

@@ -1,5 +1,5 @@
 module Carb
   module Inject
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: carb-inject
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Fire-Dragon-DoL
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: carb-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: carb-core
   requirement: !ruby/object:Gem::Requirement
@@ -100,12 +114,8 @@ files:
 - lib/carb-inject.rb
 - lib/carb/inject.rb
 - lib/carb/inject/auto_injectable.rb
-- lib/carb/inject/callable_container.rb
-- lib/carb/inject/delegate_container.rb
 - lib/carb/inject/dependency_list.rb
 - lib/carb/inject/dependency_list_cache_name.rb
-- lib/carb/inject/dependency_missing_error.rb
-- lib/carb/inject/error_container.rb
 - lib/carb/inject/injectable.rb
 - lib/carb/inject/injector.rb
 - lib/carb/inject/store_dependencies.rb
@@ -129,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Utility for automatic dependency injection

data/lib/carb/inject/callable_container.rb

@@ -1,35 +0,0 @@
-require "carb"
-require "carb/inject/dependency_missing_error"
-
-module Carb::Inject
-  # Simple container for holding dependency hashmap with Lambda callable values
-  class CallableContainer
-    private
-
-    attr_reader :dependencies
-
-    public
-
-    # @param dependencies [Hash{Object => Proc}] dependency name with proc
-    #   as value, which will be `call`ed to extract the dependency
-    def initialize(dependencies)
-      @dependencies = dependencies
-    end
-
-    # @param name [Object] dependency name
-    # @return [Object] dependency for given name, obtained by calling lambda
-    # @raise [DependencyMissingError]
-    def [](name)
-      return dependencies[name].call if has_key?(name)
-
-      error_class = ::Carb::Inject::DependencyMissingError
-      raise error_class.new(name), format(error_class::MESSAGE, name.to_s)
-    end
-
-    # @param name [Object] dependency name
-    # @return [Boolean] true if dependency is present, false otherwise
-    def has_key?(name)
-      dependencies.has_key?(name)
-    end
-  end
-end

data/lib/carb/inject/delegate_container.rb

@@ -1,44 +0,0 @@
-require "carb"
-require "carb/inject/dependency_missing_error"
-
-module Carb::Inject
-  # Container which requests dependency in sequence to a list of containers
-  # otherwise and if none returns, it raises
-  class DelegateContainer
-    private
-
-    attr_reader :containers
-
-    public
-
-    # @param containers [Array<#[], #has_key?>] Must have at least one
-    #   container
-    def initialize(*containers)
-      @containers = containers
-
-      if containers.size < 1
-        raise ArgumentError, "At least one container is required"
-      end
-    end
-
-    # @param name [Object] dependency name
-    # @return [Object] dependency for given name if present in any container
-    #   (only the first in sequence is returned), otherwise raises
-    # @raise [DependencyMissingError]
-    def [](name)
-      containers.each do |container|
-        return container[name] if container.has_key?(name)
-      end
-
-      error_class = ::Carb::Inject::DependencyMissingError
-      raise error_class.new(name), format(error_class::MESSAGE, name.to_s)
-    end
-
-    # @param name [Object] dependency name
-    # @return [Boolean] true if dependency is present in any container, false
-    #   otherwise
-    def has_key?(name)
-      containers.any? { |container| container.has_key?(name) }
-    end
-  end
-end

data/lib/carb/inject/dependency_missing_error.rb

@@ -1,13 +0,0 @@
-require "carb"
-
-module Carb::Inject
-  class DependencyMissingError < StandardError
-    MESSAGE = "Dependency %s can't be fetched".freeze
-
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-  end
-end

data/lib/carb/inject/error_container.rb

@@ -1,23 +0,0 @@
-require "carb"
-require "carb/inject/dependency_missing_error"
-
-module Carb::Inject
-  # Container which holds no dependency and will raise every time
-  # one is being fetched
-  class ErrorContainer
-    # This method will always raise an error
-    # @param name [Object] dependency name
-    # @raise [::Carb::Inject::DependencyMissingError] raised
-    #   whenever a dependency is being fetched from this container
-    def [](name)
-      error_class = ::Carb::Inject::DependencyMissingError
-      raise error_class.new(name), format(error_class::MESSAGE, name.to_s)
-    end
-
-    # @param name [Object] dependency name
-    # @return [false]
-    def has_key?(name)
-      false
-    end
-  end
-end