dry-container 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89386cb5792215d73c4b754921c1f5df7111f7d76a87f4fe7ad2777fd8c71abf
-  data.tar.gz: 24008af254d6531e665d49292f20c7ae7b483d67f97838b5c460df1d203f9987
+  metadata.gz: ac1a656d67e37d72da3265e2f092e507460cba4615db8f3727ee1acbca41584c
+  data.tar.gz: be191bd45d43147d12c858d8683463be5e59a66ef2f473e8c19d7010bda0794c
 SHA512:
-  metadata.gz: 89350f42cdabd64616241d100c760c385f53bc0a9ba3baf662b575b34beaed06ca33d4fce40f8497a72505b0fda28ee9cc9874dbed3ee91df02363517d0a8f13
-  data.tar.gz: af233252c5c04f68650c89ed65079028bc4a7a8636134c132379c60af13d1b2719fd77784931204864b3ce9e43b49bdc905034f84e59d90f7d885afc69638919
+  metadata.gz: c95deccc6ad3f976d31949d1a39e1bc4d6f5797604045aed3f7254d3a1e88ca35c76ee0483ad14bbc6abe0aed8fb13d157cd793c6eb1ff417343a0037a56358f
+  data.tar.gz: a6bac7cb3f1819b6bb89a2989de1fe0c3d9a182144a556394cec1f8a1d48bf848589c57ffc7b4daaac106cb0a5673b086f901f2b1deba81c64796a6a1038c6c0

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## v0.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
+  ```
+* `.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'>"
+  ```
+
+[Compare v0.7.1...0.7.2](https://github.com/dry-rb/dry-container/compare/v0.7.1...v0.7.2)
+
 ## v0.7.1 - 2019-06-07
 
 ## Fixed

data/lib/dry/container/item.rb

@@ -23,6 +23,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/item/callable.rb

@@ -14,13 +14,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/memoizable.rb

@@ -21,7 +21,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

data/lib/dry/container/mixin.rb

@@ -6,6 +6,9 @@ module Dry
     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
@@ -90,7 +93,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 +110,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,23 +211,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
-        memoize = original.is_a?(Item::Memoizable)
-
-        if decorator.is_a?(Class)
-          decorated = -> { decorator.new(original.call) }
-        elsif decorator.respond_to?(:call)
-          decorated = -> { decorator.call(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
-          raise Error, "Decorator needs to be a Class or responds to the `call` method"
+          decorator = with || block
         end
 
-        register(key, memoize: memoize, &decorated)
+        _container[key] = original.map(decorator)
+        self
       end
 
       # Evaluate block and register items in namespace

data/lib/dry/container/resolver.rb

@@ -10,16 +10,24 @@ module Dry
       #   The container
       # @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
       #
       # @raise [Dry::Conainer::Error]
-      #   If the given key is not registered with the container
+      #   If the given key is not registered with the container (and no block provided)
+      #
       #
       # @return [Mixed]
       #
       # @api public
       def call(container, key)
         item = container.fetch(key.to_s) do
-          raise Error, "Nothing registered with the key #{key.inspect}"
+          if block_given?
+            return yield(key)
+          else
+            raise Error, "Nothing registered with the key #{key.inspect}"
+          end
         end
 
         item.call

data/lib/dry/container/version.rb

@@ -1,6 +1,6 @@
 module Dry
   class Container
     # @api public
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.7.2'.freeze
   end
 end

data/spec/support/shared_examples/container.rb

@@ -426,14 +426,34 @@ RSpec.shared_examples 'a container' do
       end
 
       context 'for not callable item' do
-        before do
-          container.register(key, call: false) { "value" }
-          container.decorate(key, with: SimpleDelegator)
+        describe 'wrapping' do
+          before do
+            container.register(key, call: false) { "value" }
+            container.decorate(key, with: SimpleDelegator)
+          end
+
+          it 'expected to be an instance of SimpleDelegator' do
+            expect(container.resolve(key)).to be_instance_of(SimpleDelegator)
+            expect(container.resolve(key).__getobj__.call).to eql("value")
+          end
         end
 
-        it 'expected to be an instance of SimpleDelegator' do
-          expect(container.resolve(key)).to be_instance_of(SimpleDelegator)
-          expect(container.resolve(key).__getobj__.call).to eql("value")
+        describe 'memoization' do
+          before do
+            @called = 0
+            container.register(key, 'value')
+
+            container.decorate(key) do |value|
+              @called += 1
+              "<#{value}>"
+            end
+          end
+
+          it 'decorates static value only once' do
+            expect(container.resolve(key)).to eql('<value>')
+            expect(container.resolve(key)).to eql('<value>')
+            expect(@called).to be(1)
+          end
         end
       end
 
@@ -635,4 +655,10 @@ RSpec.shared_examples 'a container' do
       expect(container.clone._container).to be(container._container)
     end
   end
+
+  describe '.resolve' do
+    it 'accepts a fallback block' do
+      expect(container.resolve('missing') { :fallback }).to be(:fallback)
+    end
+  end
 end

metadata

@@ -1,31 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: dry-container
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Andy Holland
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
+  name: concurrent-ruby
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -34,8 +33,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
-  type: :runtime
+  name: dry-configurable
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,48 +45,48 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - andyholland1991@aol.com
 executables: []
@@ -129,7 +129,7 @@ homepage: https://github.com/dry-rb/dry-container
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +144,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.9
+signing_key:
 specification_version: 4
 summary: A simple container intended for use as an IoC container
 test_files: