rspec-forward 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 408b6bb845882bb291901c4cdd81bdc6c0f22b90f9a28f76992e22a83c4b1c63
-  data.tar.gz: 82a3952da4f7b3debb6759afbc0fd37340405fde5d59a3059b081d83224e9493
+  metadata.gz: 6b4f8c6e7d8124ea73c31bf830dd1ee274b381e402f9f72075d42c605705dc1e
+  data.tar.gz: a222768f7062e6e05cfcbe3bf8cc23914a7e5f6f5a57457a7f56f89848604791
 SHA512:
-  metadata.gz: 98481a93f0e7770547c370b49d5635b0e4be146ea9b292139ca4eb692e202c1b0778410c213af863da8770d6e194aabd5212107c2c6b30061255a6e0f060ac67
-  data.tar.gz: 403eef097334f5796c461e8bca0ad792b00e22d65d8a7484a88bab5209b59ca228fa150f8c22d4459685d1a5be93d4d16fdcf057455d7b242e56c04ccfbac4bb
+  metadata.gz: 373959bf21c98b2788d98a10974b612c3ef0e625771329b97ba7d4097fc48f0c99a89220ec509beb135b5f3c513d0f0a90ecc1a6162f5274438791fb3fe4ad43
+  data.tar.gz: 9e4a8d5afa6d5d94f278e7613094ed2bf6a04f72297ca84fbf415e8e44cc29433cf3f86be3fd44bf340a485a1d664e25705589f3e35c79fd840c34c0b4054816

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rspec-forward (0.3.0)
-      rspec-mocks (~> 3.9)
+    rspec-forward (0.3.1)
+      rspec-mocks (~> 3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -37,6 +37,8 @@ complete: `spring stop`.
 
 ## Usage
 
+### Forwarding from class method to instance of the same class
+
 Assume you have a Method Object with `#call` method defined like this:
 
 ```ruby
@@ -75,42 +77,54 @@ RSpec.describe Add do
   end
 
   describe ".call" do
-    subject { described_class }
+    let(:klass) { described_class }
 
-    it { should forward_to_instance(:call).with_2_args }
+    it "passes arguments to instance" do
+      expect(klass)
+        .to forward_to_instance(:call)
+        .with_2_args
+    end
   end
 end
 ```
 
-If you would rather not use the old, deprecated
-`should` syntax in RSpec, replace the above exaple with the following:
+Possible calls to the matcher include the following:
 
 ```ruby
-describe ".call" do
-  let(:klass) { described_class }
+it { is_expected.to forward_to_instance(:call).with_no_args }
+it { is_expected.to forward_to_instance(:call).with_1_arg }
+it { is_expected.to forward_to_instance(:call).with_2_args }
+it { is_expected.to forward_to_instance(:call).with_3_args }
+it { is_expected.to forward_to_instance(:call).with_named(:foo, :bar) }
+it { is_expected.to forward_to_instance(:call).with_1_arg_and_named(:foo) }
+it { is_expected.to forward_to_instance(:call).with_2_args_and_named(:foo) }
+it { is_expected.to forward_to_instance(:call).with_3_args_and_named(:foo, :bar) }
+```
 
-  it "passes arguments to instance" do
-    expect(klass)
-      .to forward_to_instance(:call)
-      .with_2_args
+**TODO**: Explain `forward_to_instance_build(...)`
+
+### Forwarding from method to another class
+
+Assume you have a method which just passes all args to another class.
+
+```ruby
+class Add
+  def self.call(addend1, addend2)
+    @addend1 + @addend2
   end
 end
-```
 
-Possible calls to the matcher include the following:
+class Other
+  def add(...)
+    Add.call(...)
+  end
+end
 
-```ruby
-it { should forward_to_instance(:call).with_no_args }
-it { should forward_to_instance(:call).with_1_arg }
-it { should forward_to_instance(:call).with_2_args }
-it { should forward_to_instance(:call).with_3_args }
-it { should forward_to_instance(:call).with_named(:foo, :bar) }
-it { should forward_to_instance(:call).with_1_arg_and_named(:foo) }
-it { should forward_to_instance(:call).with_2_args_and_named(:foo) }
-it { should forward_to_instance(:call).with_3_args_and_named(:foo, :bar) }
+Add.call(3, 5) # => 8
 ```
+[...]
 
-**TODO**: Explain `forward_to_instance_build(...)`
+**TODO**: Explain usage.
 
 ## Development
 

data/lib/rspec/forward/forward_scope_methods.rb

@@ -10,7 +10,17 @@ module ::RSpec
         @args
       end
 
-      def matches_for?(actual)
+      def find_actual(klass_or_instance)
+        if klass_or_instance.is_a? Class
+          klass_or_instance
+        else
+          klass_or_instance.class
+        end
+      end
+
+      def matches_for?(klass_or_instance)
+        actual = find_actual(klass_or_instance)
+
         method_name = @expected
         base_klass = format("%<method>s_scope", method: method_name.to_s).camelize
         @scope_klass_name ||= format("%s::%s", actual.to_s, base_klass)
@@ -28,13 +38,13 @@ module ::RSpec
           .and_return(:result)
 
         if @kwargs.any?
-          result = actual.public_send(method_name, *@args, **@kwargs) == :result
+          result = klass_or_instance.public_send(method_name, *@args, **@kwargs) == :result
 
           expect(@scope_klass)
             .to have_received(@target_method_name)
             .with(*exp_args(actual), **@kwargs)
         else
-          result = actual.public_send(method_name, *@args) == :result
+          result = klass_or_instance.public_send(method_name, *@args) == :result
 
           expect(@scope_klass)
             .to have_received(@target_method_name)
@@ -60,7 +70,7 @@ module ::RSpec
       end
 
       def self.included(base)
-        private :matches_for?
+        private :matches_for?, :find_actual
       end
     end
   end

data/lib/rspec/forward/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Forward
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/rspec-forward.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rspec-mocks", "~> 3.9"
+  spec.add_runtime_dependency "rspec-mocks", "~> 3"
   spec.add_development_dependency "guard", "~> 2.16"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-forward
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marz Drel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement