dry-container 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9983b02db6de06274a1233f9bfa5c0e8ab2c9df34fc15f2f801619912335265
-  data.tar.gz: d34942c991fcee5e85e67fb7b345105726ed28a3fd0ef04524514b37739b8f4e
+  metadata.gz: 89386cb5792215d73c4b754921c1f5df7111f7d76a87f4fe7ad2777fd8c71abf
+  data.tar.gz: 24008af254d6531e665d49292f20c7ae7b483d67f97838b5c460df1d203f9987
 SHA512:
-  metadata.gz: fab850d709bbcc1f22ee2b50c4dc59aa79773ce7bcdec40278aa7ac2a0df4780a3b2f82bb409a711de6a13a69a92a2bf591ff326df992129f9afcd4578403242
-  data.tar.gz: 1f258852df4376546fbf2ce5ee1cabb14d97d6e434c9c94df5568c689aae2debbd4406d2f657703901a0001caa73df1850475fc532579395d1895efb2be3dc76
+  metadata.gz: 89350f42cdabd64616241d100c760c385f53bc0a9ba3baf662b575b34beaed06ca33d4fce40f8497a72505b0fda28ee9cc9874dbed3ee91df02363517d0a8f13
+  data.tar.gz: af233252c5c04f68650c89ed65079028bc4a7a8636134c132379c60af13d1b2719fd77784931204864b3ce9e43b49bdc905034f84e59d90f7d885afc69638919

data/.gitignore

@@ -7,3 +7,4 @@ tmp/
 .idea/
 Gemfile.lock
 spec/examples.txt
+pkg/

data/.travis.yml

@@ -8,11 +8,14 @@ script:
 after_success:
   - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
-  - jruby-9.2.5.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - jruby-9.2.7.0
+  - truffleruby
+matrix:
+  allow_failures:
+    - rvm: truffleruby
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.7.1 - 2019-06-07
+
+## Fixed
+
+* Added `Mixin#dup` and `Mixin#clone`, now copies don't share underlying containers (flash-gordon)
+
+[Compare v0.7.0...0.7.1](https://github.com/dry-rb/dry-container/compare/v0.7.0...v0.7.1)
+
 ## v0.7.0 - 2019-02-05
 
 ## Changed
@@ -40,9 +48,9 @@
 
 * Handling container items was generalized in [#34](https://github.com/dry-rb/dry-container/pull/34) ([GabrielMalakias](https://github.com/GabrielMalakias))
 
-[Compare v0.6.0...HEAD](https://github.com/dry-rb/dry-container/compare/v0.6.0...v0.7.0)
+[Compare v0.6.0...0.7.0](https://github.com/dry-rb/dry-container/compare/v0.6.0...v0.7.0)
 
-## v0.6.0 - 2019-12-09
+## v0.6.0 - 2016-12-09
 
 ## Added
 

data/README.md

@@ -1,11 +1,11 @@
-[gitter]: https://gitter.im/dry-rb/chat
 [gem]: https://rubygems.org/gems/dry-container
 [travis]: https://travis-ci.org/dry-rb/dry-container
 [maintainability]: https://codeclimate.com/github/dry-rb/dry-container/maintainability
 [test_coverage]: https://codeclimate.com/github/dry-rb/dry-container/test_coverage
 [inch]: http://inch-ci.org/github/dry-rb/dry-container
+[chat]: https://dry-rb.zulipchat.com
 
-# dry-container [![Join the Gitter chat](https://badges.gitter.im/Join%20Chat.svg)][gitter]
+# dry-container [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://img.shields.io/gem/v/dry-container.svg)][gem]
 [![Build Status](https://img.shields.io/travis/dry-rb/dry-container.svg)][travis]

data/lib/dry/container/mixin.rb

@@ -211,12 +211,17 @@ module Dry
         end
 
         decorator = with
+        memoize = original.is_a?(Item::Memoizable)
 
         if decorator.is_a?(Class)
-          register(key, decorator.new(original.call))
+          decorated = -> { decorator.new(original.call) }
+        elsif decorator.respond_to?(:call)
+          decorated = -> { decorator.call(original.call) }
         else
-          register(key, decorator)
+          raise Error, "Decorator needs to be a Class or responds to the `call` method"
         end
+
+        register(key, memoize: memoize, &decorated)
       end
 
       # Evaluate block and register items in namespace
@@ -265,6 +270,22 @@ module Dry
       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/version.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# require 'pathname'
+
 if RUBY_ENGINE == 'ruby' && ENV['COVERAGE'] == 'true'
   require 'yaml'
   rubies = YAML.load(File.read(File.join(__dir__, '..', '.travis.yml')))['rvm']

data/spec/support/shared_examples/container.rb

@@ -387,16 +387,41 @@ RSpec.shared_examples 'a container' do
       require 'delegate'
 
       let(:key) { :key }
+      let(:decorated_class_spy) { spy(:decorated_class_spy) }
+      let(:decorated_class) { Class.new }
 
       context 'for callable item' do
         before do
-          container.register(key) { "value" }
+          allow(decorated_class_spy).to receive(:new) { decorated_class.new }
+          container.register(key, memoize: memoize) { decorated_class_spy.new }
           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__).to eql("value")
+        context 'memoize false' do
+          let(:memoize) { false }
+
+          it 'does not call the block until the key is resolved' do
+            expect(decorated_class_spy).not_to have_received(:new)
+            container.resolve(key)
+            expect(decorated_class_spy).to have_received(:new)
+          end
+
+          specify do
+            expect(container[key]).to be_instance_of(SimpleDelegator)
+            expect(container[key].__getobj__).to be_instance_of(decorated_class)
+            expect(container[key]).not_to be(container[key])
+            expect(container[key].__getobj__).not_to be(container[key].__getobj__)
+          end
+        end
+
+        context 'memoize true' do
+          let(:memoize) { true }
+
+          specify do
+            expect(container[key]).to be_instance_of(SimpleDelegator)
+            expect(container[key].__getobj__).to be_instance_of(decorated_class)
+            expect(container[key]).to be(container[key])
+          end
         end
       end
 
@@ -411,6 +436,23 @@ RSpec.shared_examples 'a container' do
           expect(container.resolve(key).__getobj__.call).to eql("value")
         end
       end
+
+      context 'with an instance as a decorator' do
+        let(:decorator) do
+          double.tap do |decorator|
+            allow(decorator).to receive(:call) { |input| "decorated #{input}" }
+          end
+        end
+
+        before do
+          container.register(key) { "value" }
+          container.decorate(key, with: decorator)
+        end
+
+        it 'expected to pass original value to decorator#call method' do
+          expect(container.resolve(key)).to eq("decorated value")
+        end
+      end
     end
 
     describe 'namespace' do
@@ -574,4 +616,23 @@ RSpec.shared_examples 'a container' do
       expect(container.freeze).to be(container)
     end
   end
+
+  describe '.dup' do
+    it "returns a copy that doesn't share registered keys with the parent" do
+      container.dup.register(:foo, 'bar')
+      expect(container.key?(:foo)).to be false
+    end
+  end
+
+  describe '.clone' do
+    it "returns a copy that doesn't share registered keys with the parent" do
+      container.clone.register(:foo, 'bar')
+      expect(container.key?(:foo)).to be false
+    end
+
+    it 're-uses frozen container' do
+      expect(container.freeze.clone).to be_frozen
+      expect(container.clone._container).to be(container._container)
+    end
+  end
 end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: dry-container
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Andy Holland
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-06-07 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'
-  name: concurrent-ruby
-  prerelease: false
   type: :runtime
+  prerelease: false
   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:
     - - "~>"
@@ -33,9 +34,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
-  name: dry-configurable
-  prerelease: false
   type: :runtime
+  prerelease: false
   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'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   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'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   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'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   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,9 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: A simple container intended for use as an IoC container
 test_files: