minitest-substitute 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288e4fc7e4e20c4b649237471762f8723ce333f2886d4244048033ea281c4ab2
-  data.tar.gz: ee23d391142761ea6be22ecb306944313e612fc697c4849ab4f70c7a6ce8e844
+  metadata.gz: ada3a9ae885b2050d30579935751f6f6d6d3a668b299def79602098549897ff6
+  data.tar.gz: 2892e09363f655605a9c7f19da56cc40f2229d44cb332e4b583d50f193c18cef
 SHA512:
-  metadata.gz: 6d2abd17135f9a750c2e7efb89e1fbc4d2b1ce30a7767e60ad368715059de575435e36856128e5e911c495cfc407169ef68baf9176721ee11eb28f55197fb13f
-  data.tar.gz: ba8d78a68880474bd1051887ad5435e0efdda86aa78c643ddad004bdf606e725ee688385da114abdc4dfb110ad5eb42e5c1a7de146de380e49372296ae6ec9de
+  metadata.gz: 3222b3c80b2cf6aee7451d14f602b6aa154367a4ef95b873bc1917d2c76ab240df9183a2322c917507737059eb7a83b3d17f5952c8363f23874c04e4eaa81eda
+  data.tar.gz: d85e9ea4fb25448a7065c0d0c32a0aa28b00df47cc03495d72b2f8df8134c43fb7aadb920dda4c1b71792012a0bf048f1ac7f0e863bf55b4b30d4a6b780449bb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Nothing so far
 
+## 0.2.1
+
+Nothing so far
+
 ## 0.2.0
 
 #### Additions

data/README.md

@@ -131,15 +131,45 @@ describe Config do
 end
 ```
 
-For consistency with other Minitest helpers, the following alternative does exactly the same:
+:warning: The target `on` is set explicitly in this case. If you omit this argument, `:subject` will be used as target by default which refers to the subject defined by the `subject {}` helper.
+
+Alternatively, you can pass the substitution value as a block. This block will be evaluated once in the context of the test, in other words, you can use assignments done with `let` inside the block:
 
 ```ruby
-with '@version', on: Config do
-  2
+class Config
+  def initialize
+    @version = 1
+  end
+end
+
+describe Config do
+  subject do
+    Config.new
+  end
+
+  let :version do
+    2
+  end
+
+  describe 'original version' do
+    it "returns the original version" do
+      _(subject.instance_variable_get('@version')).must_equal 1
+    end
+  end
+
+  describe 'sustituted version' do
+    with '@version', on: Config do
+      version   # set using "let" above
+    end
+
+    it "returns the substituted version" do
+      _(subject.instance_variable_get('@version')).must_equal 2
+    end
+  end
 end
 ```
 
-:warning: The target `on` is set explicitly in this case. If you omit this argument, `:subject` will be used as target by default which refers to the subject defined by the `subject {}` helper.
+If both a substitution value and a substitution block are present, the latter takes precedence.
 
 It's safe to use multiple `with` statements within one `describe` block.
 

data/lib/minitest/substitute/spec.rb

@@ -11,10 +11,10 @@ Minitest::Spec::DSL.class_eval do
   # @param on [Object, Symbol, nil] substitute in the context of this object
   #   or in the context of the declared subject if +:subject+ is set
   # @yield temporary substitution value (takes precedence over +substitute+ param)
-  def with(variable, substitute=nil, on: :subject)
-    substitute = yield if block_given?
-    substitutor = Minitest::Substitute::Substitutor.new(variable, substitute, on: on)
+  def with(variable, substitute=nil, on: :subject, &block)
+    substitutor = Minitest::Substitute::Substitutor.new(variable, on: on)
     before do
+      substitutor.substitute(block ? instance_eval(&block) : substitute)
       substitutor.on = subject if on == :subject && respond_to?(:subject)
       substitutor.commit
     end

data/lib/minitest/substitute/substitutor.rb

@@ -8,8 +8,13 @@ module Minitest
 
       attr_writer :on
 
-      def initialize(variable, substitute, on:)
-        @variable, @substitute, @on = variable, substitute, on
+      def initialize(variable, on:)
+        @variable, @on = variable, on
+      end
+
+      def substitute(value)
+        @substitute = value unless instance_variable_defined? :@substitute
+        self
       end
 
       def commit

data/lib/minitest/substitute/version.rb

@@ -2,6 +2,6 @@
 
 module Minitest
   module Substitute
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/minitest/substitute/with.rb

@@ -12,7 +12,7 @@ module Minitest
       # @yield block during which the substitution is made
       # @return [Object] return value of the yielded block
       def with(variable, substitute, on: self)
-        substitutor = Minitest::Substitute::Substitutor.new(variable, substitute, on: on)
+        substitutor = Minitest::Substitute::Substitutor.new(variable, on: on).substitute(substitute)
         substitutor.commit
         yield.tap do
           substitutor.rollback

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-substitute
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-08-25 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest