dry-container 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9983b02db6de06274a1233f9bfa5c0e8ab2c9df34fc15f2f801619912335265
-  data.tar.gz: d34942c991fcee5e85e67fb7b345105726ed28a3fd0ef04524514b37739b8f4e
+  metadata.gz: a2d2d74bfa80e0afcee1e54dd79e10a7c21548e0c634c99c2c7af17d97f34166
+  data.tar.gz: 62b18ac8bd11c5b56b8637fa4a0bc90da69f61ac84a1b02d01e6b0739d2f166c
 SHA512:
-  metadata.gz: fab850d709bbcc1f22ee2b50c4dc59aa79773ce7bcdec40278aa7ac2a0df4780a3b2f82bb409a711de6a13a69a92a2bf591ff326df992129f9afcd4578403242
-  data.tar.gz: 1f258852df4376546fbf2ce5ee1cabb14d97d6e434c9c94df5568c689aae2debbd4406d2f657703901a0001caa73df1850475fc532579395d1895efb2be3dc76
+  metadata.gz: b0f906601ede92930ad8c12621a5f68ea1ce6a8ce1e126c967632e51b4e79b8d20d49b682d273b6ca32ebdcd87d8201c3edcae007504ef74b5ac888dd4da0cb1
+  data.tar.gz: 92fff5321a53a6e44644f82b56f1cf53a890c6c3b2ab4158bbb2caedbbd0538040165c650cb490e9d204bf585cf7121b61a8361cf895b588989b9e547cece0a4

data/CHANGELOG.md

@@ -1,24 +1,59 @@
-## v0.7.0 - 2019-02-05
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
-## Changed
+## 0.9.0 2021-09-12
 
-* [BREAKING] Now only Ruby 2.3 and above is supported ([flash-gordon](https://github.com/flash-gordon))
 
-## Fixed
+### Changed
 
-* Symbols are now coerced to strings when resolving stubbed dependencies ([cthulhu666](https://github.com/cthulhu666))
-* Stubbing keys not present in container will raise an error ([flash-gordon](https://github.com/flash-gordon))
+- [internal] Upgraded to new `setting` API provided in dry-configurable 0.13.0 (@timriley in #77)
 
-  This means after upgrading you may see errors like this
+[Compare v0.8.0...v0.9.0](https://github.com/dry-rb/dry-container/compare/v0.8.0...v0.9.0)
+
+## 0.8.0 2021-06-06
+
+
+### Changed
+
+- [BREAKING] Support for 2.4 and 2.5 was dropped
+
+[Compare v0.7.2...v0.8.0](https://github.com/dry-rb/dry-container/compare/v0.7.2...v0.8.0)
+
+## 0.7.2 2019-07-09
+
+
+### Added
+
+- `.resolve` accepts an optional fallback block, similar to how `Hash#fetch` works ([flash-gordon](https://github.com/flash-gordon))
+  ```ruby
+  container.resolve('missing_key') { :fallback } # => :fallback
   ```
-  ArgumentError (cannot stub "something" - no such key in container)
+- `.decorate` can (again) work with static values. Also, it can take a block instead of `with` ([flash-gordon](https://github.com/flash-gordon))
+  ```ruby
+  container.register('key', 'value')
+  container.decorate('key') { |v| "<'#{v}'>" }
+  container.resolve('key') # => "<'value'>"
   ```
-  Be sure you register dependencies before using them. The new behavior will likely save quite a bit of time when debugging ill-configured container setups.
 
-## Added
 
-* Namespace DSL resolves keys relative to the current namespace, see the corresponding [changes](https://github.com/dry-rb/dry-container/pull/47) ([yuszuv](https://github.com/yuszuv))
-* Registered objects can be decorated with the following API ([igor-alexandrov](https://github.com/igor-alexandrov))
+[Compare v0.7.1...v0.7.2](https://github.com/dry-rb/dry-container/compare/v0.7.1...v0.7.2)
+
+## 0.7.1 2019-06-07
+
+
+### Fixed
+
+- Added `Mixin#dup` and `Mixin#clone`, now copies don't share underlying containers (flash-gordon)
+
+
+[Compare v0.7.0...v0.7.1](https://github.com/dry-rb/dry-container/compare/v0.7.0...v0.7.1)
+
+## 0.7.0 2019-02-05
+
+
+### Added
+
+- Namespace DSL resolves keys relative to the current namespace, see the corresponding [changes](https://github.com/dry-rb/dry-container/pull/47) ([yuszuv](https://github.com/yuszuv))
+- Registered objects can be decorated with the following API ([igor-alexandrov](https://github.com/igor-alexandrov))
 
   ```ruby
   class CreateUser
@@ -34,34 +69,48 @@
   container.resolve('create_user')
   # => #<ShinyLogger @obj=#<CreateUser:0x...>]>
   ```
-* Freezing a container now prevents further registrations ([flash-gordon](https://github.com/flash-gordon))
+- Freezing a container now prevents further registrations ([flash-gordon](https://github.com/flash-gordon))
+- ## Internal
+- Handling container items was generalized in [#34](https://github.com/dry-rb/dry-container/pull/34) ([GabrielMalakias](https://github.com/GabrielMalakias))
+
+### Fixed
+
+- Symbols are now coerced to strings when resolving stubbed dependencies ([cthulhu666](https://github.com/cthulhu666))
+- Stubbing keys not present in container will raise an error ([flash-gordon](https://github.com/flash-gordon))
+
+  This means after upgrading you may see errors like this
+  ```
+  ArgumentError (cannot stub "something" - no such key in container)
+  ```
+  Be sure you register dependencies before using them. The new behavior will likely save quite a bit of time when debugging ill-configured container setups.
+
+### Changed
+
+- [BREAKING] Now only Ruby 2.3 and above is supported ([flash-gordon](https://github.com/flash-gordon))
 
-## Internal
+[Compare v0.6.0...v0.7.0](https://github.com/dry-rb/dry-container/compare/v0.6.0...v0.7.0)
 
-* Handling container items was generalized in [#34](https://github.com/dry-rb/dry-container/pull/34) ([GabrielMalakias](https://github.com/GabrielMalakias))
+## 0.6.0 2016-12-09
 
-[Compare v0.6.0...HEAD](https://github.com/dry-rb/dry-container/compare/v0.6.0...v0.7.0)
 
-## v0.6.0 - 2019-12-09
+### Added
 
-## Added
+- `Dry::Container::Mixin#each` - provides a means of seeing what all is registered in the container ([jeremyf](https://github.com/jeremyf))
 
-* `Dry::Container::Mixin#each` - provides a means of seeing what all is registered in the container ([jeremyf](https://github.com/jeremyf))
+### Fixed
 
-## Fixed
+- Including mixin into a class with a custom initializer ([maltoe](https://github.com/maltoe))
 
-* Including mixin into a class with a custom initializer ([maltoe](https://github.com/maltoe))
 
 [Compare v0.5.0...v0.6.0](https://github.com/dry-rb/dry-container/compare/v0.5.0...v0.6.0)
 
-## v0.5.0 - 2016-08-31
+## 0.5.0 2016-08-31
 
-## Added
 
-* `memoize` option to `#register` - memoizes items on first resolve ([ivoanjo](https://github.com/ivoanjo))
+### Added
 
-## Fixed
+- `memoize` option to `#register` - memoizes items on first resolve ([ivoanjo](https://github.com/ivoanjo))
 
-* `required_ruby_version` set to `>= 2.0.0` ([artofhuman](https://github.com/artofhuman))
+### Fixed
 
-[Compare v0.4.0...v0.5.0](https://github.com/dry-rb/dry-container/compare/v0.4.0...v0.5.0)
+- `required_ruby_version` set to `>= 2.0.0` ([artofhuman](https://github.com/artofhuman))

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 dry-container
+Copyright (c) 2015-2021 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,23 +1,29 @@
-[gitter]: https://gitter.im/dry-rb/chat
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-container
-[travis]: https://travis-ci.org/dry-rb/dry-container
-[maintainability]: https://codeclimate.com/github/dry-rb/dry-container/maintainability
-[test_coverage]: https://codeclimate.com/github/dry-rb/dry-container/test_coverage
-[inch]: http://inch-ci.org/github/dry-rb/dry-container
+[actions]: https://github.com/dry-rb/dry-container/actions
+[codacy]: https://www.codacy.com/gh/dry-rb/dry-container
+[chat]: https://dry-rb.zulipchat.com
+[inchpages]: http://inch-ci.org/github/dry-rb/dry-container
 
-# dry-container [![Join the Gitter chat](https://badges.gitter.im/Join%20Chat.svg)][gitter]
+# dry-container [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
-[![Gem Version](https://img.shields.io/gem/v/dry-container.svg)][gem]
-[![Build Status](https://img.shields.io/travis/dry-rb/dry-container.svg)][travis]
-[![Maintainability](https://api.codeclimate.com/v1/badges/97faf9446cb5811100e7/maintainability)][maintainability]
-[![Test Coverage](https://api.codeclimate.com/v1/badges/97faf9446cb5811100e7/test_coverage)][test_coverage]
-[![API Documentation Coverage](http://inch-ci.org/github/dry-rb/dry-container.svg)][inch]
-
-A simple, configurable container implemented in Ruby.
+[![Gem Version](https://badge.fury.io/rb/dry-container.svg)][gem]
+[![CI Status](https://github.com/dry-rb/dry-container/workflows/CI/badge.svg)][actions]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/227509c9034340b493f769f6277f4ecb)][codacy]
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/227509c9034340b493f769f6277f4ecb)][codacy]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-container.svg?branch=master)][inchpages]
 
 ## Links
 
-[Documentation](http://dry-rb.org/gems/dry-container/)
+* [User documentation](https://dry-rb.org/gems/dry-container)
+* [API documentation](http://rubydoc.info/gems/dry-container)
+
+## Supported Ruby versions
+
+This library officially supports the following Ruby versions:
+
+* MRI `>= 2.6.0`
+* ~~jruby~~ `>= 9.3` (we are waiting for [2.6 support](https://github.com/jruby/jruby/issues/6161))
 
 ## License
 

data/dry-container.gemspec

@@ -1,25 +1,38 @@
-require File.expand_path('../lib/dry/container/version', __FILE__)
+# frozen_string_literal: true
+
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "dry/container/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-container'
-  spec.version       = ::Dry::Container::VERSION
-  spec.authors       = ['Andy Holland']
-  spec.email         = ['andyholland1991@aol.com']
-  spec.summary       = 'A simple container intended for use as an IoC container'
-  spec.homepage      = 'https://github.com/dry-rb/dry-container'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.required_ruby_version = '>= 2.3.0'
-
-  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_runtime_dependency 'dry-configurable', '~> 0.1', '>= 0.1.3'
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.name          = "dry-container"
+  spec.authors       = ["Andy Holland"]
+  spec.email         = ["andyholland1991@aol.com"]
+  spec.license       = "MIT"
+  spec.version       = Dry::Container::VERSION.dup
+
+  spec.summary       = "A simple, configurable object container implemented in Ruby"
+  spec.description   = spec.summary
+  spec.homepage      = "https://dry-rb.org/gems/dry-container"
+  spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-container.gemspec", "lib/**/*"]
+  spec.bindir        = "bin"
+  spec.executables   = []
+  spec.require_paths = ["lib"]
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-container/blob/master/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-container"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-container/issues"
+
+  spec.required_ruby_version = ">= 2.6.0"
+
+  # to update dependencies edit project.yml
+  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_runtime_dependency "dry-configurable", "~> 0.13", ">= 0.13.0"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/dry/container/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   class Container
     # @api public

data/lib/dry/container/item/callable.rb

@@ -1,4 +1,6 @@
-require 'dry/container/item'
+# frozen_string_literal: true
+
+require "dry/container/item"
 
 module Dry
   class Container
@@ -14,13 +16,6 @@ module Dry
         def call
           callable? ? item.call : item
         end
-
-        private
-
-        # @private
-        def callable?
-          options[:call]
-        end
       end
     end
   end

data/lib/dry/container/item/factory.rb

@@ -1,5 +1,7 @@
-require 'dry/container/item/memoizable'
-require 'dry/container/item/callable'
+# frozen_string_literal: true
+
+require "dry/container/item/memoizable"
+require "dry/container/item/callable"
 
 module Dry
   class Container

data/lib/dry/container/item/memoizable.rb

@@ -1,4 +1,6 @@
-require 'dry/container/item'
+# frozen_string_literal: true
+
+require "dry/container/item"
 
 module Dry
   class Container
@@ -21,7 +23,7 @@ module Dry
         # @return [Dry::Container::Item::Base]
         def initialize(item, options = {})
           super
-          raise_not_supported_error unless item.is_a?(::Proc)
+          raise_not_supported_error unless callable?
 
           @memoize_mutex = ::Mutex.new
         end
@@ -39,11 +41,9 @@ module Dry
 
         # @private
         def raise_not_supported_error
-          raise ::Dry::Container::Error, 'Memoize only supported for a block or a proc'.freeze
+          raise ::Dry::Container::Error, "Memoize only supported for a block or a proc".freeze
         end
       end
     end
   end
 end
-
-

data/lib/dry/container/item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   class Container
     # Base class to abstract Memoizable and Callable implementations
@@ -23,6 +25,27 @@ module Dry
       def call
         raise NotImplementedError
       end
+
+      # @private
+      def value?
+        !callable?
+      end
+
+      # @private
+      def callable?
+        options[:call]
+      end
+
+      # Build a new item with transformation applied
+      #
+      # @private
+      def map(func)
+        if callable?
+          self.class.new(-> { func.(item.call) }, options)
+        else
+          self.class.new(func.(item), options)
+        end
+      end
     end
   end
 end

data/lib/dry/container/mixin.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
 
-require 'concurrent/hash'
+require "concurrent/hash"
 
 module Dry
   class Container
     PREFIX_NAMESPACE = lambda do |namespace, key, config|
       [namespace, key].join(config.namespace_separator)
     end
+
+    EMPTY_HASH = {}.freeze
+
     # Mixin to expose Inversion of Control (IoC) container behaviour
     #
     # @example
@@ -43,9 +47,9 @@ module Dry
           extend ::Dry::Configurable
           extend hooks_mod
 
-          setting :registry, ::Dry::Container::Registry.new
-          setting :resolver, ::Dry::Container::Resolver.new
-          setting :namespace_separator, '.'
+          setting :registry, default: Dry::Container::Registry.new
+          setting :resolver, default: Dry::Container::Resolver.new
+          setting :namespace_separator, default: "."
 
           @_container = ::Concurrent::Hash.new
         end
@@ -65,9 +69,9 @@ module Dry
           extend ::Dry::Configurable
           prepend Initializer
 
-          setting :registry, ::Dry::Container::Registry.new
-          setting :resolver, ::Dry::Container::Resolver.new
-          setting :namespace_separator, '.'
+          setting :registry, default: Dry::Container::Registry.new
+          setting :resolver, default: Dry::Container::Resolver.new
+          setting :namespace_separator, default: "."
 
           def config
             self.class.config
@@ -90,7 +94,7 @@ module Dry
       # @return [Dry::Container::Mixin] self
       #
       # @api public
-      def register(key, contents = nil, options = {}, &block)
+      def register(key, contents = nil, options = EMPTY_HASH, &block)
         if block_given?
           item = block
           options = contents if contents.is_a?(::Hash)
@@ -107,12 +111,15 @@ module Dry
       #
       # @param [Mixed] key
       #   The key for the item you wish to resolve
+      # @yield
+      #   Fallback block to call when a key is missing. Its result will be returned
+      # @yieldparam [Mixed] key Missing key
       #
       # @return [Mixed]
       #
       # @api public
-      def resolve(key)
-        config.resolver.call(_container, key)
+      def resolve(key, &block)
+        config.resolver.call(_container, key, &block)
       end
 
       # Resolve an item from the container
@@ -205,18 +212,22 @@ module Dry
       # @return [Dry::Container::Mixin] self
       #
       # @api public
-      def decorate(key, with:)
-        original = _container.delete(key.to_s) do
+      def decorate(key, with: nil, &block)
+        key = key.to_s
+        original = _container.delete(key) do
           raise Error, "Nothing registered with the key #{key.inspect}"
         end
 
-        decorator = with
-
-        if decorator.is_a?(Class)
-          register(key, decorator.new(original.call))
+        if with.is_a?(Class)
+          decorator = with.method(:new)
+        elsif block.nil? && !with.respond_to?(:call)
+          raise Error, "Decorator needs to be a Class, block, or respond to the `call` method"
         else
-          register(key, decorator)
+          decorator = with || block
         end
+
+        _container[key] = original.map(decorator)
+        self
       end
 
       # Evaluate block and register items in namespace
@@ -265,6 +276,22 @@ module Dry
       def _container
         @_container
       end
+
+      # @api public
+      def dup
+        copy = super
+        copy.instance_variable_set(:@_container, _container.dup)
+        copy
+      end
+
+      # @api public
+      def clone
+        copy = super
+        unless copy.frozen?
+          copy.instance_variable_set(:@_container, _container.dup)
+        end
+        copy
+      end
     end
   end
 end