dry-container 0.5.0 → 0.8.0

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "dry/container/item"
+
+module Dry
+  class Container
+    class Item
+      # Callable class to returns a item call
+      #
+      # @api public
+      #
+      class Callable < Item
+        # Returns the result of item call or item
+        #
+        # @return [Mixed]
+        def call
+          callable? ? item.call : item
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "dry/container/item/memoizable"
+require "dry/container/item/callable"
+
+module Dry
+  class Container
+    class Item
+      # Factory for create an Item to register inside of container
+      #
+      # @api public
+      class Factory
+        # Creates an Item Memoizable or Callable
+        # @param [Mixed] item
+        # @param [Hash] options
+        #
+        # @raise [Dry::Container::Error]
+        #
+        # @return [Dry::Container::Item::Base]
+        def call(item, options = {})
+          options[:memoize] ? Memoizable.new(item, options) : Callable.new(item, options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "dry/container/item"
+
+module Dry
+  class Container
+    class Item
+      # Memoizable class to store and execute item calls
+      #
+      # @api public
+      #
+      class Memoizable < Item
+        # @return [Mutex] the stored mutex
+        attr_reader :memoize_mutex
+
+        # Returns a new Memoizable instance
+        #
+        # @param [Mixed] item
+        # @param [Hash] options
+        #
+        # @raise [Dry::Container::Error]
+        #
+        # @return [Dry::Container::Item::Base]
+        def initialize(item, options = {})
+          super
+          raise_not_supported_error unless callable?
+
+          @memoize_mutex = ::Mutex.new
+        end
+
+        # Returns the result of item call using a syncronized mutex
+        #
+        # @return [Dry::Container::Item::Base]
+        def call
+          memoize_mutex.synchronize do
+            @memoized_item ||= item.call
+          end
+        end
+
+        private
+
+        # @private
+        def raise_not_supported_error
+          raise ::Dry::Container::Error, "Memoize only supported for a block or a proc".freeze
+        end
+      end
+    end
+  end
+end

data/lib/dry/container/mixin.rb

@@ -1,8 +1,15 @@
+# frozen_string_literal: true
+
+require "concurrent/hash"
+
 module Dry
   class Container
-    PREFIX_NAMESPACE = ->(namespace, key, config) do
+    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
@@ -42,9 +49,17 @@ module Dry
 
           setting :registry, ::Dry::Container::Registry.new
           setting :resolver, ::Dry::Container::Resolver.new
-          setting :namespace_separator, '.'
+          setting :namespace_separator, "."
+
+          @_container = ::Concurrent::Hash.new
+        end
+      end
 
+      # @private
+      module Initializer
+        def initialize(*args, &block)
           @_container = ::Concurrent::Hash.new
+          super
         end
       end
 
@@ -52,15 +67,11 @@ module Dry
       def self.included(base)
         base.class_eval do
           extend ::Dry::Configurable
+          prepend Initializer
 
           setting :registry, ::Dry::Container::Registry.new
           setting :resolver, ::Dry::Container::Resolver.new
-          setting :namespace_separator, '.'
-
-          def initialize(*args, &block)
-            @_container = ::Concurrent::Hash.new
-            super(*args, &block)
-          end
+          setting :namespace_separator, "."
 
           def config
             self.class.config
@@ -83,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)
@@ -100,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
@@ -125,8 +139,7 @@ module Dry
       #
       # @param [Dry::Container] other
       #   The other container to merge in
-      # @param [Hash] options
-      # @option options [Symbol] :namespace
+      # @param [Symbol, nil] namespace
       #   Namespace to prefix other container items with, defaults to nil
       #
       # @return [Dry::Container::Mixin] self
@@ -146,7 +159,7 @@ module Dry
         self
       end
 
-      # Check whether an items is registered under the given key
+      # Check whether an item is registered under the given key
       #
       # @param [Mixed] key
       #   The key you wish to check for registration with
@@ -179,6 +192,44 @@ module Dry
         self
       end
 
+      # Calls block once for each key/value pair in the container, passing the key and the registered item parameters.
+      #
+      # If no block is given, an enumerator is returned instead.
+      #
+      # @return [Enumerator]
+      #
+      # @api public
+      #
+      # @note In discussions with other developers, it was felt that being able to iterate over not just
+      #       the registered keys, but to see what was registered would be very helpful. This is a step
+      #       toward doing that.
+      def each(&block)
+        config.resolver.each(_container, &block)
+      end
+
+      # Decorates an item from the container with specified decorator
+      #
+      # @return [Dry::Container::Mixin] self
+      #
+      # @api public
+      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
+
+        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
+          decorator = with || block
+        end
+
+        _container[key] = original.map(decorator)
+        self
+      end
+
       # Evaluate block and register items in namespace
       #
       # @param [Mixed] namespace
@@ -212,10 +263,35 @@ module Dry
         self
       end
 
+      # Freeze the container. Nothing can be registered after freezing
+      #
+      # @api public
+      def freeze
+        super
+        _container.freeze
+        self
+      end
+
       # @private no, really
       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

data/lib/dry/container/namespace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   class Container
     # Create a namespace to be imported

data/lib/dry/container/namespace_dsl.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "delegate"
+
 module Dry
   class Container
     # @api private
@@ -43,6 +47,10 @@ module Dry
         self
       end
 
+      def resolve(key)
+        super(namespaced(key))
+      end
+
       private
 
       def namespaced(key)

data/lib/dry/container/registry.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "dry/container/item/factory"
+
 module Dry
   class Container
     # Default registry for registering items with the container
@@ -34,9 +38,13 @@ module Dry
             raise Error, "There is already an item registered with the key #{key.inspect}"
           end
 
-          container[key] = ::Dry::Container::Item.new(item, options)
+          container[key] = factory.call(item, options)
         end
       end
+
+      def factory
+        @factory ||= ::Dry::Container::Item::Factory.new
+      end
     end
   end
 end

data/lib/dry/container/resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   class Container
     # Default resolver for resolving items from container
@@ -10,16 +12,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::Container::Error]
+      #   If the given key is not registered with the container (and no block provided)
       #
-      # @raise [Dry::Conainer::Error]
-      #   If the given key is not registered with the container
       #
       # @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
@@ -48,7 +58,6 @@ module Dry
         container.keys
       end
 
-
       # Calls block once for each key in container, passing the key as a parameter.
       #
       # If no block is given, an enumerator is returned instead.
@@ -59,6 +68,20 @@ module Dry
       def each_key(container, &block)
         container.each_key(&block)
       end
+
+      # Calls block once for each key in container, passing the key and the registered item parameters.
+      #
+      # If no block is given, an enumerator is returned instead.
+      #
+      # @return Key, Value
+      #
+      # @api public
+      # @note In discussions with other developers, it was felt that being able to iterate over not just
+      #       the registered keys, but to see what was registered would be very helpful. This is a step
+      #       toward doing that.
+      def each(container, &block)
+        container.map { |key, value| [key, value.call] }.each(&block)
+      end
     end
   end
 end

data/lib/dry/container/stub.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   class Container
     module Stub
@@ -5,12 +7,16 @@ module Dry
       #
       # @api public
       def resolve(key)
-        _stubs.fetch(key) { super }
+        _stubs.fetch(key.to_s) { super }
       end
 
       # Add a stub to the container
       def stub(key, value, &block)
-        _stubs[key] = value
+        unless key?(key)
+          raise ArgumentError, "cannot stub #{key.to_s.inspect} - no such key in container"
+        end
+
+        _stubs[key.to_s] = value
 
         if block
           yield
@@ -23,11 +29,12 @@ module Dry
       # Remove stubbed keys from the container
       def unstub(*keys)
         keys = _stubs.keys if keys.empty?
-        keys.each { |key| _stubs.delete(key) }
+        keys.each { |key| _stubs.delete(key.to_s) }
       end
 
       # Stubs have already been enabled turning this into a noop
       def enable_stubs!
+        # DO NOTHING
       end
 
       private

data/lib/dry/container/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Dry
   class Container
     # @api public
-    VERSION = '0.5.0'.freeze
+    VERSION = "0.8.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-container
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -86,29 +86,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: A simple, configurable object container implemented in Ruby
 email:
 - andyholland1991@aol.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - dry-container.gemspec
 - lib/dry-container.rb
 - lib/dry/container.rb
 - lib/dry/container/error.rb
 - lib/dry/container/item.rb
+- lib/dry/container/item/callable.rb
+- lib/dry/container/item/factory.rb
+- lib/dry/container/item/memoizable.rb
 - lib/dry/container/mixin.rb
 - lib/dry/container/namespace.rb
 - lib/dry/container/namespace_dsl.rb
@@ -116,15 +111,14 @@ files:
 - lib/dry/container/resolver.rb
 - lib/dry/container/stub.rb
 - lib/dry/container/version.rb
-- rakelib/rubocop.rake
-- spec/integration/container_spec.rb
-- spec/integration/mixin_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples/container.rb
-homepage: https://github.com/dryrb/dry-container
+homepage: https://dry-rb.org/gems/dry-container
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-container/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-container
+  bug_tracker_uri: https://github.com/dry-rb/dry-container/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -133,20 +127,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: A simple container intended for use as an IoC container
-test_files:
-- spec/integration/container_spec.rb
-- spec/integration/mixin_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples/container.rb
+summary: A simple, configurable object container implemented in Ruby
+test_files: []