much-stub 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c37bcf3b2a355483515be9eabd74c93bd93ccf5f503180409f86d18a183f6f8a
-  data.tar.gz: 20cab69d294b44212ccd23eb068ae17e2458576153e817c30dac08206c294c47
+  metadata.gz: bc032b1684e0734a374eb6b4a5df50d2980cc9a7cbf7e1149af37e1a4937a5f9
+  data.tar.gz: 35b88afbbc8c997dacc497e71b5469a4a5062e59259385533b63387a2865180e
 SHA512:
-  metadata.gz: 929d09b4df2e8b85496b4a47fe67a23dde700ee751b7fa3d1b074a09db185f01ad3ff54e16a7935cd1db75fc4af58fdb9ff3482fe81d40fcfcca421ae515e265
-  data.tar.gz: dfbfd75bc0edc084c45eee9c62926c7c2baaec32cb28f40d670a6296e1b21c7348ee4f1d6926d02b03a63223e1369b2d0907735c2b8849805862404afffd256f
+  metadata.gz: 615eaeb52480305c353204c4a1a27653a84d4f855f323356bcd09f55baf421998ccd35ad8b9c80ef1d431dd700db754be51ed05f7734644e452b2ebe16d3e828
+  data.tar.gz: 4f7f4fc3666baca6bed52dec567fccca5fa6248946182c84d1a3325f2e7a8eaab88ffad4287b7c7a8f242e6b523c63f0ac60605c42ed16ae6ea8a331a19be09d

data/lib/much-stub/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MuchStub
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/much-stub.rb

@@ -50,34 +50,34 @@ module MuchStub
     stubs.keys.each{ |key| stubs.delete(key).teardown }
   end
 
-  def self.stub_send(obj, meth, *args, &block)
+  def self.stub_send(obj, meth, *pargs, **kargs, &block)
     orig_caller = caller_locations
     stub =
       stubs.fetch(MuchStub::Stub.key(obj, meth)) do
         raise NotStubbedError, "`#{meth}` not stubbed.", orig_caller.map(&:to_s)
       end
-    stub.call_method(args, &block)
+    stub.call_method(*pargs, **kargs, &block)
   end
 
   def self.tap(obj, meth, &tap_block)
-    stub(obj, meth) do |*args, &block|
-      stub_send(obj, meth, *args, &block).tap do |value|
-        tap_block&.call(value, *args, &block)
+    stub(obj, meth) do |*pargs, **kargs, &block|
+      stub_send(obj, meth, *pargs, **kargs, &block).tap do |value|
+        tap_block&.call(value, *pargs, **kargs, &block)
       end
     end
   end
 
   def self.tap_on_call(obj, meth, &on_call_block)
-    tap(obj, meth) do |value, *args, &block|
-      on_call_block&.call(value, MuchStub::Call.new(*args, &block))
+    tap(obj, meth) do |value, *pargs, **kargs, &block|
+      on_call_block&.call(value, MuchStub::Call.new(*pargs, **kargs, &block))
     end
   end
 
   def self.spy(obj, *meths, **return_values)
     MuchStub::CallSpy.new(**return_values).call_spy_tap do |spy|
       meths.each do |meth|
-        stub(obj, meth) do |*args, &block|
-          spy.__send__(meth, *args, &block)
+        stub(obj, meth) do |*pargs, **kargs, &block|
+          spy.__send__(meth, *pargs, **kargs, &block)
         end
       end
     end
@@ -108,12 +108,13 @@ module MuchStub
       @do = block || @do
     end
 
-    def call_method(args, &block)
-      @method.call(*args, &block)
+    def call_method(*pargs, **kargs, &block)
+      @method.call(*pargs, **kargs, &block)
     end
 
-    def call(args, orig_caller = nil, &block)
+    def call(*pargs, orig_caller: nil, **kargs, &block)
       orig_caller ||= caller_locations
+      args = combined_args(pargs, kargs)
       unless MuchStub.arity_matches?(@method, args)
         raise(
           StubArityError.new(
@@ -124,14 +125,15 @@ module MuchStub
           ),
         )
       end
-      lookup(args, orig_caller).call(*args, &block)
+      lookup(pargs, kargs, orig_caller).call(*pargs, **kargs, &block)
     rescue NotStubbedError
       @lookup.rehash
-      lookup(args, orig_caller).call(*args, &block)
+      lookup(pargs, kargs, orig_caller).call(*pargs, **kargs, &block)
     end
 
-    def with(*args, &block)
+    def with(*pargs, **kargs, &block)
       orig_caller = caller_locations
+      args = combined_args(pargs, kargs)
       unless MuchStub.arity_matches?(@method, args)
         raise(
           StubArityError.new(
@@ -148,8 +150,8 @@ module MuchStub
 
     def on_call(&on_call_block)
       stub_block =
-        ->(*args, &block){
-          on_call_block&.call(MuchStub::Call.new(*args, &block))
+        ->(*pargs, **kargs, &block){
+          on_call_block&.call(MuchStub::Call.new(*pargs, **kargs, &block))
         }
       if @lookup.empty?
         @do = stub_block
@@ -198,13 +200,16 @@ module MuchStub
 
       MuchStub.instance_variable_set(@ivar_name, self)
       @metaclass.class_eval <<-stub_method
-        def #{@method_name}(*args, &block)
-          MuchStub.instance_variable_get("#{@ivar_name}").call(args, caller_locations, &block)
+        def #{@method_name}(*pargs, **kargs, &block)
+          MuchStub
+            .instance_variable_get("#{@ivar_name}")
+            .call(*pargs, orig_caller: caller_locations, **kargs, &block)
         end
       stub_method
     end
 
-    def lookup(args, orig_caller)
+    def lookup(pargs, kargs, orig_caller)
+      args = combined_args(pargs, kargs)
       @lookup.fetch(args) do
         self.do ||
         begin
@@ -229,6 +234,10 @@ module MuchStub
     def inspect_call(args)
       "`#{@method_name}(#{args.map(&:inspect).join(",")})`"
     end
+
+    def combined_args(pargs, kargs)
+      [*pargs, (kargs.empty? ? nil : kargs)].compact
+    end
   end
 
   StubError       = Class.new(ArgumentError)
@@ -268,7 +277,7 @@ module MuchStub
     def self.new(object, method_name)
       arity = get_arity(object, method_name)
       params = build_params_from_arity(arity)
-      params << "*args" if arity < 0
+      params << "*pargs, **kargs" if arity < 0
       params << "&block"
       params.join(", ")
     end

data/test/unit/much-stub_tests.rb

@@ -200,6 +200,10 @@ module MuchStub
             [val1, val2, args]
           end
 
+          def mykargs(val1:, **kargs)
+            [val1, kargs]
+          end
+
           def myblk(&block)
             block.call
           end
@@ -422,46 +426,54 @@ module MuchStub
 
       # no args
       stub = MuchStub::Stub.new(@myobj, :mymeth){ "mymeth" }
-      assert_equal "mymeth", stub.call([])
-      assert_equal "meth",   stub.call_method([])
+      assert_equal "mymeth", stub.call
+      assert_equal "meth",   stub.call_method
 
       # static args
       stub = MuchStub::Stub.new(@myobj, :myval, &:to_s)
-      assert_equal "1", stub.call([1])
-      assert_equal 1,   stub.call_method([1])
-      assert_equal "2", stub.call([2])
-      assert_equal 2,   stub.call_method([2])
+      assert_equal "1", stub.call(1)
+      assert_equal 1,   stub.call_method(1)
+      assert_equal "2", stub.call(2)
+      assert_equal 2,   stub.call_method(2)
       stub.with(2){ "two" }
-      assert_equal "two", stub.call([2])
-      assert_equal 2,     stub.call_method([2])
+      assert_equal "two", stub.call(2)
+      assert_equal 2,     stub.call_method(2)
 
       # dynamic args
       stub = MuchStub::Stub.new(@myobj, :myargs){ |*args| args.join(",") }
-      assert_equal "1,2", stub.call([1, 2])
-      assert_equal [1, 2], stub.call_method([1, 2])
-      assert_equal "3,4,5", stub.call([3, 4, 5])
-      assert_equal [3, 4, 5], stub.call_method([3, 4, 5])
+      assert_equal "1,2", stub.call(1, 2)
+      assert_equal [1, 2], stub.call_method(1, 2)
+      assert_equal "3,4,5", stub.call(3, 4, 5)
+      assert_equal [3, 4, 5], stub.call_method(3, 4, 5)
       stub.with(3, 4, 5){ "three-four-five" }
-      assert_equal "three-four-five", stub.call([3, 4, 5])
-      assert_equal [3, 4, 5],           stub.call_method([3, 4, 5])
+      assert_equal "three-four-five", stub.call(3, 4, 5)
+      assert_equal [3, 4, 5], stub.call_method(3, 4, 5)
 
       # mixed static/dynamic args
       stub = MuchStub::Stub.new(@myobj, :myvalargs){ |*args| args.join(",") }
-      assert_equal "1,2,3", stub.call([1, 2, 3])
-      assert_equal [1, 2, [3]], stub.call_method([1, 2, 3])
-      assert_equal "3,4,5", stub.call([3, 4, 5])
-      assert_equal [3, 4, [5]], stub.call_method([3, 4, 5])
+      assert_equal "1,2,3", stub.call(1, 2, 3)
+      assert_equal [1, 2, [3]], stub.call_method(1, 2, 3)
+      assert_equal "3,4,5", stub.call(3, 4, 5)
+      assert_equal [3, 4, [5]], stub.call_method(3, 4, 5)
       stub.with(3, 4, 5){ "three-four-five" }
-      assert_equal "three-four-five", stub.call([3, 4, 5])
-      assert_equal [3, 4, [5]], stub.call_method([3, 4, 5])
+      assert_equal "three-four-five", stub.call(3, 4, 5)
+      assert_equal [3, 4, [5]], stub.call_method(3, 4, 5)
+
+      # keyword args
+      stub = MuchStub::Stub.new(@myobj, :mykargs){ |**kargs| kargs.inspect }
+      assert_equal "{:val1=>1, :val2=>2}", stub.call(val1: 1, val2: 2)
+      assert_equal [1, { val2: 2 }], stub.call_method(val1: 1, val2: 2)
+      stub.with(val1: 3, val2: 4){ "three-four" }
+      assert_equal "three-four", stub.call(val1: 3, val2: 4)
+      assert_equal [3, { val2: 4 }], stub.call_method(val1: 3, val2: 4)
 
       # blocks
       blkcalled = false
       blk = proc{ blkcalled = true }
       stub = MuchStub::Stub.new(@myobj, :myblk){ blkcalled = "true" }
-      stub.call([], &blk)
+      stub.call(&blk)
       assert_equal "true", blkcalled
-      stub.call_method([], &blk)
+      stub.call_method(&blk)
       assert_equal true, blkcalled
     end
 
@@ -500,7 +512,7 @@ module MuchStub
     subject{ @stub }
 
     should "not raise a stub error when called" do
-      assert_nothing_raised{ @stub.call([@arg]) }
+      assert_nothing_raised{ @stub.call(@arg) }
     end
   end
 
@@ -564,7 +576,7 @@ module MuchStub
     end
 
     should "build a parameter list for a method that takes any args" do
-      assert_equal "*args, &block", subject.new(@object, "anyargs")
+      assert_equal "*pargs, **kargs, &block", subject.new(@object, "anyargs")
     end
 
     should "build a parameter list for a method that takes many args" do
@@ -574,7 +586,8 @@ module MuchStub
 
     should "build a parameter list for a method that takes a minimum number "\
            "of args" do
-      expected = "#{ParameterList::LETTERS.join(", ")}, aa, *args, &block"
+      expected =
+        "#{ParameterList::LETTERS.join(", ")}, aa, *pargs, **kargs, &block"
       assert_equal expected, subject.new(@object, "minargs")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: much-stub
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Kelly Redding