dry-system 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f148327cdac0f870ac0ac39a244d59cc2edfb15
-  data.tar.gz: d712c57e08f1968fb7092a99e3c84fe706bb4097
+  metadata.gz: 94d4f0b0085ef8e7edf3938fe94d39f4c26d2ea9
+  data.tar.gz: 15a9499b38c9d1a8ef109728d86b577616dad388
 SHA512:
-  metadata.gz: 9fa712dbe64d87958faa6eaac6fc7dfbbf0d5b30e20b1cc52c196c2159db05380fdb45da00c39b52f02488db0aebaebbc65602fab66cbc091406ac73fe44c354
-  data.tar.gz: d5214fded99b89eed583d9fbb6397432d73407eba966bfab7026a8007d9670e7b214e3a50b07ffa964a84a0a6d1b349abae7b818e3d71b57e57851edc1ea5dde
+  metadata.gz: 4979edbd2d31b3039bc25438a2340462ce94e946e9ceeded7003c488e8322209a07b1d58ccfd5419a922ac1a96cf326bf8dddc5fa22069b82387e9578564a944
+  data.tar.gz: 887221bf029d0b6cf26f32e06ff8ac8d642e9cdc289cf8428351f8185a73161900ee26ee762d778f1912c0f7926c936e397cef28db3afb4b2d2c5ddda38518de

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.7.3 - 2017-08-02
+
+### Fixed
+
+* `Container.enable_stubs!` calls super too, which actually adds `stub` API (solnic)
+* Issues with lazy-loading and import in stub mode are gone (solnic)
+
 # 0.7.2 - 2017-08-02
 
 ### Added

data/lib/dry/system/container.rb

@@ -80,6 +80,7 @@ module Dry
 
       class << self
         extend Dry::Core::Deprecations['Dry::System::Container']
+
         # Configures the container
         #
         # @example
@@ -213,6 +214,15 @@ module Dry
           self
         end
 
+        # Return if a container was finalized
+        #
+        # @return [TrueClass, FalseClass]
+        #
+        # @api public
+        def finalized?
+          @__finalized__.equal?(true)
+        end
+
         # Finalizes the container
         #
         # This triggers importing components from other containers, booting
@@ -243,7 +253,7 @@ module Dry
         #
         # @api public
         def finalize!(freeze: true, &block)
-          return self if frozen?
+          return self if finalized?
 
           yield(self) if block
 
@@ -252,6 +262,8 @@ module Dry
           manual_registrar.finalize!
           auto_registrar.finalize!
 
+          @__finalized__ = true
+
           self.freeze if freeze
         end
 
@@ -433,7 +445,7 @@ module Dry
 
         # @api public
         def resolve(key)
-          load_component(key) unless frozen?
+          load_component(key) unless finalized?
 
           super
         end
@@ -509,7 +521,7 @@ module Dry
         # @api private
         def load_local_component(component, default_namespace_fallback = false)
           if component.bootable?(booter.path) || component.file_exists?(load_paths)
-            booter.boot_dependency(component) unless frozen?
+            booter.boot_dependency(component) unless finalized?
 
             require_component(component) do
               register(component.identifier) { component.instance }

data/lib/dry/system/stubs.rb

@@ -1,10 +1,8 @@
+require 'dry/container/stub'
+
 module Dry
   module System
     class Container
-      # Incuded only in the Test environment
-      # Sending the message enable_stubs! allow you to stub components after
-      # finalize your container in your tests.
-      #
       # @api private
       module Stubs
         def finalize!(&block)
@@ -12,8 +10,23 @@ module Dry
         end
       end
 
+      # Enables stubbing container's components
+      #
+      # @example
+      #   require 'dry/system/stubs'
+      #
+      #   MyContainer.enable_stubs!
+      #   MyContainer.finalize!
+      #
+      #   MyContainer.stub('some.component', some_stub_object)
+      #
+      # @return Container
+      #
+      # @api public
       def self.enable_stubs!
+        super
         extend ::Dry::System::Container::Stubs
+        self
       end
     end
   end

data/lib/dry/system/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module System
-    VERSION = '0.7.2'.freeze
+    VERSION = '0.7.3'.freeze
   end
 end

data/spec/fixtures/stubbing/lib/{stubbing → test}/car.rb

@@ -1,4 +1,4 @@
-module Stubbing
+module Test
   class Car
     def wheels_count
       4

data/spec/fixtures/stubbing/system/boot/db.rb

@@ -0,0 +1,8 @@
+Test::Container.finalize :db do |container|
+  module Test
+    class DB
+    end
+  end
+
+  container.register(:db, Test::DB.new)
+end

data/spec/integration/import_spec.rb

@@ -1,3 +1,5 @@
+require 'dry/system/stubs'
+
 RSpec.describe 'Lazy-booting external deps' do
   before do
     module Test
@@ -42,6 +44,14 @@ RSpec.describe 'Lazy-booting external deps' do
     end
 
     it_behaves_like 'lazy booted dependency'
+
+    context 'when stubs are enabled' do
+      before do
+        system.enable_stubs!
+      end
+
+      it_behaves_like 'lazy booted dependency'
+    end
   end
 
   context 'when top-level container provides the dependency through import' do
@@ -59,5 +69,13 @@ RSpec.describe 'Lazy-booting external deps' do
     end
 
     it_behaves_like 'lazy booted dependency'
+
+    context 'when stubs are enabled' do
+      before do
+        system.enable_stubs!
+      end
+
+      it_behaves_like 'lazy booted dependency'
+    end
   end
 end

data/spec/unit/container_spec.rb

@@ -1,4 +1,5 @@
 require 'dry/system/container'
+require 'dry/system/stubs'
 
 RSpec.describe Dry::System::Container do
   subject(:container) { Test::Container }
@@ -196,46 +197,47 @@ RSpec.describe Dry::System::Container do
     end
   end
 
-  context 'Allow to stub container' do
+  describe '.stub' do
+    let(:stubbed_car) do
+      instance_double(Test::Car, wheels_count: 5)
+    end
+
     before do
       class Test::Container < Dry::System::Container
         configure do |config|
           config.root = SPEC_ROOT.join('fixtures/stubbing').realpath
         end
+
         load_paths!('lib')
         auto_register!('lib')
       end
     end
 
-    describe 'without enable_stubs!' do
-      before do
-        container.finalize!
-      end
-
-      it 'raises error when trying to stub freeze container' do
-        expect {
-          allow(container).to receive(:[]).with('mock').and_return(true)
-        }.to raise_error(RuntimeError, /frozen/)
+    describe 'with stubs disabled' do
+      it 'raises error when trying to stub frozen container' do
+        expect { container.stub('test.car', stubbed_car) }.to raise_error(NoMethodError, /stub/)
       end
     end
 
-    describe 'with enable_stubs!' do
+    describe 'with stubs enabled' do
       before do
         container.enable_stubs!
-        container.finalize!
       end
 
-      it 'allows to stub the container it self' do
-        expect(container['mock']).to eq false
-        allow(container).to receive(:[]).with('mock').and_return(true)
-        expect(container['mock']).to eq true
+      it 'lazy-loads a component' do
+        expect(container[:db]).to be_instance_of(Test::DB)
+        container.finalize!
+        expect(container[:db]).to be_instance_of(Test::DB)
       end
 
       it 'allows to stub components' do
-        car = container['stubbing.car']
-        expect(car.wheels_count).to eq 4
-        allow(car).to receive(:wheels_count).and_return(5)
-        expect(car.wheels_count).to eq 5
+        container.finalize!
+
+        expect(container['test.car'].wheels_count).to be(4)
+
+        container.stub('test.car', stubbed_car)
+
+        expect(container['test.car'].wheels_count).to be(5)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Piotr Solnica
@@ -232,8 +232,8 @@ files:
 - spec/fixtures/other/lib/test/models.rb
 - spec/fixtures/other/lib/test/models/book.rb
 - spec/fixtures/other/lib/test/models/user.rb
-- spec/fixtures/stubbing/lib/stubbing/car.rb
-- spec/fixtures/stubbing/system/boot/mock.rb
+- spec/fixtures/stubbing/lib/test/car.rb
+- spec/fixtures/stubbing/system/boot/db.rb
 - spec/fixtures/test/config/application.yml
 - spec/fixtures/test/config/subapp.yml
 - spec/fixtures/test/lib/test/dep.rb
@@ -317,8 +317,8 @@ test_files:
 - spec/fixtures/other/lib/test/models.rb
 - spec/fixtures/other/lib/test/models/book.rb
 - spec/fixtures/other/lib/test/models/user.rb
-- spec/fixtures/stubbing/lib/stubbing/car.rb
-- spec/fixtures/stubbing/system/boot/mock.rb
+- spec/fixtures/stubbing/lib/test/car.rb
+- spec/fixtures/stubbing/system/boot/db.rb
 - spec/fixtures/test/config/application.yml
 - spec/fixtures/test/config/subapp.yml
 - spec/fixtures/test/lib/test/dep.rb

data/spec/fixtures/stubbing/system/boot/mock.rb

@@ -1,3 +0,0 @@
-Test::Container.finalize(:mock) do |container|
-  container.register(:mock, false)
-end