dry-container 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d052fd82bb7597ea5b8c8b35a2c26b4900f16b02
-  data.tar.gz: 47681932e60338aa93f70417de441d8bc21f52d7
+  metadata.gz: 18b93873ebbb6d027bc713b5f3af823f1db50800
+  data.tar.gz: 07c73e06100d4b7c8cde5d2d6bc4446b46ff552f
 SHA512:
-  metadata.gz: 6ae27a601b7e9ff4574761c43de2328d9ce58c467cd121ef9509b66977a1e171894f3694a4bb8e0308428fc6d33b37519b03ccdac598d9f9b1c142e2fa5409e3
-  data.tar.gz: ff561063839573816a19f1a96a813dda03bb2eea833c7d964c9b2725e79f2047994f72fe1cb05638c0b9c53e9faba56762e78345667eaa2c1331f42354dc1035
+  metadata.gz: 0c8a18232ff3e895eefa1e6b3fe046f255d9add144a7aa302f431e92d81cceae292cc6b90a3d9157b202b6bd50eb1bfc37686920731a626204f3b49792183852
+  data.tar.gz: b5376428867106db4b3b70cd33e07a035be1a46ce2ae5be7fc93085e5b08efbae06dd7f6db1dac33fcd743cb23c81169f86360c3ec6397725fabd8e45a950282

data/lib/dry/container/mixin.rb

@@ -35,7 +35,7 @@ module Dry
           setting :resolver, ::Dry::Container::Resolver.new
           setting :namespace_separator, '.'
 
-          @_container = ::ThreadSafe::Cache.new
+          @_container = ::ThreadSafe::Hash.new
 
           def self.inherited(subclass)
             subclass.instance_variable_set(:@_container, @_container)
@@ -56,7 +56,7 @@ module Dry
           attr_reader :_container
 
           def initialize(*args, &block)
-            @_container = ::ThreadSafe::Cache.new
+            @_container = ::ThreadSafe::Hash.new
             super(*args, &block)
           end
 
@@ -107,6 +107,19 @@ module Dry
       end
       alias_method :[], :resolve
 
+      # Merge in the items of the other container
+      #
+      # @param [Dry::Container] other
+      #   The other container to merge in
+      #
+      # @return [Dry::Container::Mixin] self
+      #
+      # @api public
+      def merge(other)
+        _container.merge!(other._container)
+        self
+      end
+
       # Check whether an items is registered under the given key
       #
       # @param [Mixed] key

data/lib/dry/container/version.rb

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

data/spec/support/shared_examples/container.rb

@@ -214,6 +214,21 @@ shared_examples 'a container' do
       end
     end
 
+    describe '#merge' do
+      let(:key) { :key }
+      let(:other) { Dry::Container.new }
+
+      before do
+        other.register(key) { :item }
+      end
+
+      subject! { container.merge(other) }
+
+      it { expect(container.key?(key)).to be true }
+      it { expect(container.resolve(key)).to be(:item) }
+      it { expect(container[key]).to be(:item) }
+    end
+
     describe 'namespace' do
       context 'when block does not take arguments' do
         before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-container
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe