dry-container 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 674ad0ad74a6d746feaad68d60327231693da1af
-  data.tar.gz: 7f61c7b298cbccb1f0c0b34d7df4a116d0a500ef
+  metadata.gz: 2f11ec3380a6ff086362780a67b687935cff8ddf
+  data.tar.gz: 15db84953170fdc3f249d852d01d106f7a904f23
 SHA512:
-  metadata.gz: d794c0b798bb18519f10b7625f351193a3e768c7870d57a95adc76cb1d2e4a2c45a679622349c2c3404922346a3108b6c42cafe9a51b7a51dc34790c98ad9f89
-  data.tar.gz: 5581b7fff68c5eb4e50a8bdd949043b54464f6f103eb6719bc9a6b7ad27a57e077d4b8118d76df8d929bd6d67af2f39fe396505f106263948a74bde96b1bf826
+  metadata.gz: f36ffd98d0c80ffd158e1554a09dd89919aeb7c780010a276118ad217db89d9ace865746c18b97321b6022d75dc5a4e46523d27927cd01ee182d0bb3b6b105b8
+  data.tar.gz: 7b52ee74e85b40edad15d082ad5fc64a20a00947a8d97d472be013f4f98fe363be5c25f007cd6d089582d0302034b35ed0041ce843e276c896100a9775a2a14a

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## v0.5.0
+
+## Added
+
+* `memoize` option to `#register` - memoizes items on first resolve ([ivoanjo](https://github.com/ivoanjo))
+
+## Fixed
+
+* `required_ruby_version` set to `>= 2.0.0` ([artofhuman](https://github.com/artofhuman))
+
+[Compare v0.4.0...HEAD](https://github.com/dry-rb/dry-container/compare/v0.4.0...HEAD)

data/README.md

@@ -91,6 +91,29 @@ end
 container.import(ns)
 container.resolve('repositories.authentication.users')
 # => []
+
+# You can also register a block that is used to initialize a dependency and
+# then memoize it, allowing several dependencies to be added without
+# enforcing an instantiation order
+class MessagePrinter
+  def initialize(container)
+    @message = container.resolve(:message)
+    @time = Time.now
+  end
+
+  def print
+    puts "#{@message} at #{@time}"
+  end
+end
+
+container.register(:message_printer, -> { MessagePrinter.new(container) }, memoize: true)
+container.register(:message, 'Hello, world!')
+container.resolve(:message_printer).print
+# => Hello, world! at 2016-08-30 05:32:12 -0700
+
+# Same instance is reused next time
+container.resolve(:message_printer).print
+# => Hello, world! at 2016-08-30 05:32:12 -0700
 ```
 
 You can also get container behaviour at both the class and instance level via the mixin:

data/dry-container.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = ">= 2.0.0"
+
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1', '>= 0.1.3'
 

data/lib/dry/container/item.rb

@@ -4,22 +4,41 @@ module Dry
     #
     # @private
     class Item
-      attr_reader :item, :options
+      attr_reader :item, :options, :memoize, :memoize_mutex
 
       def initialize(item, options = {})
         @item = item
         @options = {
           call: item.is_a?(::Proc) && item.parameters.empty?
         }.merge(options)
+
+        if options[:memoize] == true
+          raise(
+            ::Dry::Container::Error,
+            'Memoize only supported for a block or a proc'
+          ) unless item.is_a?(::Proc)
+          @memoize = true
+          @memoize_mutex = ::Mutex.new
+        end
       end
 
       def call
+        return memoized_item if memoize
+
         if options[:call] == true
           item.call
         else
           item
         end
       end
+
+      private
+
+      def memoized_item
+        memoize_mutex.synchronize do
+          @memoized_item ||= item.call
+        end
+      end
     end
   end
 end

data/lib/dry/container/mixin.rb

@@ -1,7 +1,7 @@
 module Dry
   class Container
     PREFIX_NAMESPACE = ->(namespace, key, config) do
-      [namespace, key].compact.join(config.namespace_separator)
+      [namespace, key].join(config.namespace_separator)
     end
     # Mixin to expose Inversion of Control (IoC) container behaviour
     #
@@ -125,16 +125,24 @@ module Dry
       #
       # @param [Dry::Container] other
       #   The other container to merge in
+      # @param [Hash] options
+      # @option options [Symbol] :namespace
+      #   Namespace to prefix other container items with, defaults to nil
       #
       # @return [Dry::Container::Mixin] self
       #
       # @api public
       def merge(other, namespace: nil)
-        _container.merge!(
-          other._container.each_with_object(::Concurrent::Hash.new) do |a, h|
-            h[PREFIX_NAMESPACE.call(namespace, a.first, config)] = a.last
-          end
-        )
+        if namespace
+          _container.merge!(
+            other._container.each_with_object(::Concurrent::Hash.new) do |a, h|
+              h[PREFIX_NAMESPACE.call(namespace, a.first, config)] = a.last
+            end
+          )
+        else
+          _container.merge!(other._container)
+        end
+
         self
       end
 

data/lib/dry/container/registry.rb

@@ -21,7 +21,7 @@ module Dry
       # @option options [Symbol] :call
       #   Whether the item should be called when resolved
       #
-      # @raise [Dry::Conainer::Error]
+      # @raise [Dry::Container::Error]
       #   If an item is already registered with the given key
       #
       # @return [Mixed]

data/lib/dry/container/version.rb

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

data/spec/support/shared_examples/container.rb

@@ -185,6 +185,33 @@ shared_examples 'a container' do
           expect(container[:item].call).to eq('item')
         end
       end
+
+      context 'with option memoize: true' do
+        it 'registers and resolves a proc' do
+          container.register(:item, proc { 'item' }, memoize: true)
+
+          expect(container[:item]).to be container[:item]
+          expect(container.keys).to eq(['item'])
+          expect(container.key?(:item)).to be true
+          expect(container.resolve(:item)).to eq('item')
+          expect(container[:item]).to eq('item')
+        end
+
+        it 'only resolves the proc once' do
+          resolved_times = 0
+
+          container.register(:item, proc { resolved_times += 1 }, memoize: true)
+
+          expect(container.resolve(:item)).to be 1
+          expect(container.resolve(:item)).to be 1
+        end
+
+        context 'when receiving something other than a proc' do
+          it do
+            expect { container.register(:item, 'Hello!', memoize: true) }.to raise_error(Dry::Container::Error)
+          end
+        end
+      end
     end
 
     describe 'registering an object' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-container
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -99,6 +99,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -132,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -149,4 +150,3 @@ test_files:
 - spec/integration/mixin_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/container.rb
-has_rdoc: