dry-container 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb7b27d123e0eeca646cadab96b2f4ffb23de85
-  data.tar.gz: da29556aeb02ed91cf5ee90b9cfccbbf21b86514
+  metadata.gz: 674ad0ad74a6d746feaad68d60327231693da1af
+  data.tar.gz: 7f61c7b298cbccb1f0c0b34d7df4a116d0a500ef
 SHA512:
-  metadata.gz: 74e4defaad4bdcbafe10b718f8efd8c76c9e480dc6681546889a762184b732da205e98f3c3cbe4083e474642ecc43cb6308ccf1f57b739ea25218e767e5b892d
-  data.tar.gz: 1335f6b7e9ea69d245b8a51cfd3545a1e915436933a9ef83bfcb57f0bc3a79e5f9f53a6dd87f6244a86b6682fe2656a630c63e00f9e688a6fdc73b194e0bba9c
+  metadata.gz: d794c0b798bb18519f10b7625f351193a3e768c7870d57a95adc76cb1d2e4a2c45a679622349c2c3404922346a3108b6c42cafe9a51b7a51dc34790c98ad9f89
+  data.tar.gz: 5581b7fff68c5eb4e50a8bdd949043b54464f6f103eb6719bc9a6b7ad27a57e077d4b8118d76df8d929bd6d67af2f39fe396505f106263948a74bde96b1bf826

data/dry-container.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/dry/container/version', __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'dry-container'
-  spec.version       = Dry::Container::VERSION
+  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'

data/lib/dry/container.rb

@@ -31,6 +31,6 @@ module Dry
   #
   # @api public
   class Container
-    include Mixin
+    include ::Dry::Container::Mixin
   end
 end

data/lib/dry/container/error.rb

@@ -1,6 +1,6 @@
 module Dry
   class Container
     # @api public
-    class Error < StandardError; end
+    class Error < ::StandardError; end
   end
 end

data/lib/dry/container/mixin.rb

@@ -1,5 +1,8 @@
 module Dry
   class Container
+    PREFIX_NAMESPACE = ->(namespace, key, config) do
+      [namespace, key].compact.join(config.namespace_separator)
+    end
     # Mixin to expose Inversion of Control (IoC) container behaviour
     #
     # @example
@@ -26,7 +29,7 @@ module Dry
     module Mixin
       # @private
       def self.extended(base)
-        hooks_mod = Module.new do
+        hooks_mod = ::Module.new do
           def inherited(subclass)
             subclass.instance_variable_set(:@_container, @_container.dup)
             super
@@ -126,8 +129,12 @@ module Dry
       # @return [Dry::Container::Mixin] self
       #
       # @api public
-      def merge(other)
-        _container.merge!(other._container)
+      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
+        )
         self
       end
 
@@ -152,6 +159,18 @@ module Dry
         config.resolver.keys(_container)
       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.
+      #
+      # @return [Dry::Container::Mixin] self
+      #
+      # @api public
+      def each_key(&block)
+        config.resolver.each_key(_container, &block)
+        self
+      end
+
       # Evaluate block and register items in namespace
       #
       # @param [Mixed] namespace

data/lib/dry/container/resolver.rb

@@ -47,6 +47,18 @@ module Dry
       def keys(container)
         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.
+      #
+      # @return Hash
+      #
+      # @api public
+      def each_key(container, &block)
+        container.each_key(&block)
+      end
     end
   end
 end

data/lib/dry/container/stub.rb

@@ -41,7 +41,7 @@ module Dry
     module Mixin
       # Enable stubbing functionality into the current container
       def enable_stubs!
-        extend Dry::Container::Stub
+        extend ::Dry::Container::Stub
       end
     end
   end

data/lib/dry/container/version.rb

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

data/spec/support/shared_examples/container.rb

@@ -243,11 +243,93 @@ shared_examples 'a container' do
         other.register(key) { :item }
       end
 
-      subject! { container.merge(other) }
+      context 'without namespace argument' do
+        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) }
+        it { expect(container.resolve(key)).to be(:item) }
+        it { expect(container[key]).to be(:item) }
+      end
+
+      context 'with namespace argument' do
+        subject! { container.merge(other, namespace: namespace) }
+
+        context 'when namespace is nil' do
+          let(:namespace) { nil }
+
+          it { expect(container.resolve(key)).to be(:item) }
+          it { expect(container[key]).to be(:item) }
+        end
+
+        context 'when namespace is not nil' do
+          let(:namespace) { 'namespace' }
+
+          it { expect(container.resolve("#{namespace}.#{key}")).to be(:item) }
+          it { expect(container["#{namespace}.#{key}"]).to be(:item) }
+        end
+      end
+    end
+
+    describe '#key?' do
+      let(:key) { :key }
+
+      before do
+        container.register(key) { :item }
+      end
+
+      subject! { container.key?(resolve_key) }
+
+      context 'when key exists in container' do
+        let(:resolve_key) { key }
+
+        it { is_expected.to be true }
+      end
+
+      context 'when key does not exist in container' do
+        let(:resolve_key) { :random }
+
+        it { is_expected.to be false }
+      end
+    end
+
+    describe '#keys' do
+      let(:keys) { [:key_1, :key_2] }
+      let(:expected_keys) { ['key_1', 'key_2'] }
+
+      before do
+        keys.each do |key|
+          container.register(key) { :item }
+        end
+      end
+
+      subject! { container.keys }
+
+      it 'returns stringified versions of all registered keys' do
+        is_expected.to match_array(expected_keys)
+      end
+    end
+
+    describe '#each_key' do
+      let(:keys) { [:key_1, :key_2] }
+      let(:expected_keys) { ['key_1', 'key_2'] }
+      let!(:yielded_keys) { [] }
+
+      before do
+        keys.each do |key|
+          container.register(key) { :item }
+        end
+      end
+
+      subject! do
+        container.each_key { |key| yielded_keys << key }
+      end
+
+      it 'yields stringified versions of all registered keys to the block' do
+        expect(yielded_keys).to match_array(expected_keys)
+      end
+
+      it 'returns the container' do
+        is_expected.to eq(container)
+      end
     end
 
     describe 'namespace' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-container
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -149,3 +149,4 @@ test_files:
 - spec/integration/mixin_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/container.rb
+has_rdoc: