much-stub 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25518cd79915a42ef00d555f2f09db36b19ec52237054c1fb763667ff0a5c4d0
-  data.tar.gz: edbd7bd553731a3084806768ad3d956b7f086212b095dfaf63e9eff0ba56cc4e
+  metadata.gz: 21883570fda48199a217f7489b6c45f6d3c2e1d1cb5aa872847e154033754771
+  data.tar.gz: bf63e826137aa1d315d48823c7a11787a09be559b16abc600a168edc19ff9068
 SHA512:
-  metadata.gz: eb69a558eb21bbd717bb9164a5142c318697ea512e0234dd110c0127eaa9eef68a25abd13c2d9c4136dc9474712312a85fb5af8a30fc7dcaf8c7b1cc6d8606c4
-  data.tar.gz: 390126be543ddf6c36fcf7dd3c0491c5530ba8535b049b91edf9de6a3461895f5b4f673d2ef0b5b920af30880e71ea705f1043648edef75ede03b9c1af74b311
+  metadata.gz: 7f6c8c294b7f7d006b3c88a3890d24e3ff913110caa11b70642d7ba246449dd3dcb20de0df46e939d90a9b917f0c509144c260fdbfc689f6a89be1f9fb5b942f
+  data.tar.gz: 6a7c16b6b19625ad5b84df6d5413119a921f81425278f5f3b8c0b579895c9a22e8de58da349e56684412d93a74f450ba6e7ed2b53f06ad9185f9cf8ee31ec1a5

data/README.md

@@ -116,6 +116,12 @@ MuchStub.(my_object, :basic_method) { |*args|
 MuchStub.(my_object, :basic_method).on_call { |call|
   basic_method_called_with = call
 }
+# OR
+MuchStub.on_call(my_object, :basic_method) { |call|
+  # MucStub.on_call(...) { ... } is equivalent to
+  # MuchStub.(...).on_call { ... }
+  basic_method_called_with = call
+}
 
 my_object.basic_method(123)
 basic_method_called_with.args

data/lib/much-stub.rb

@@ -18,16 +18,24 @@ module MuchStub
     return false
   end
 
-  def self.call(*args, &block)
-    self.stub(*args, &block)
-  end
-
   def self.stub(obj, meth, &block)
     key = self.stub_key(obj, meth)
     self.stubs[key] ||= MuchStub::Stub.new(obj, meth, caller_locations)
     self.stubs[key].tap{ |s| s.do = block }
   end
 
+  def self.call(*args, &block)
+    self.stub(*args, &block)
+  end
+
+  def self.stub_on_call(*args, &on_call_block)
+    self.stub(*args).on_call(&on_call_block)
+  end
+
+  def self.on_call(*args, &on_call_block)
+    self.stub_on_call(*args, &on_call_block)
+  end
+
   def self.unstub(obj, meth)
     key = self.stub_key(obj, meth)
     (self.stubs.delete(key) || MuchStub::NullStub.new).teardown
@@ -60,10 +68,10 @@ module MuchStub
   end
 
   def self.spy(obj, *meths, **return_values)
-    MuchStub::CallSpy.new(**return_values).tap do |spy|
+    MuchStub::CallSpy.new(**return_values).call_spy_tap do |spy|
       meths.each do |meth|
         self.stub(obj, meth) { |*args, &block|
-          spy.public_send(meth, *args, &block)
+          spy.__send__(meth, *args, &block)
         }
       end
     end

data/lib/much-stub/call_spy.rb

@@ -1,7 +1,7 @@
 require "much-stub/call"
 
 module MuchStub
-  class CallSpy
+  class CallSpy < ::BasicObject
     METHOD_NAME_REPLACEMENTS = {
       "!" => "_bang",
       "?" => "_predicate"
@@ -9,10 +9,42 @@ module MuchStub
 
     def initialize(**return_values)
       @call_spy_return_values = return_values.transform_keys{ |key| key.to_s }
-
-      @call_spy_method_calls = Hash.new { |hash, key| hash[key] = [] }
+      @call_spy_method_calls = ::Hash.new { |hash, key| hash[key] = [] }
       @call_spy_method_return_values =
-        Hash.new { |hash, key| hash[key] = call_spy_return_value_proc(key) }
+        ::Hash.new { |hash, key| hash[key] = call_spy_return_value_proc(key) }
+    end
+
+    def call_spy_tap
+      yield self
+      self
+    end
+
+    def ==(other)
+      self.equal?(other)
+    end
+
+    def ===(other)
+      self.equal?(other)
+    end
+
+    def eql?(other)
+      self.equal?(other)
+    end
+
+    def equal?(other)
+      self.__id__ == other.__id__
+    end
+
+    def hash
+      self.__id__
+    end
+
+    def respond_to?(*)
+      true
+    end
+
+    def inspect
+      "#<MuchStub::CallSpy:#{"0x0%x" % (self.__id__ << 1)}>"
     end
 
     private
@@ -25,7 +57,7 @@ module MuchStub
       value = @call_spy_return_values[method_name]
       return value if value.respond_to?(:call)
 
-      ->(*) { value.nil? ? self : value }
+      ::Proc.new { value.nil? ? self : value }
     end
 
     def call_spy_normalize_method_name(name)
@@ -36,8 +68,8 @@ module MuchStub
 
     def call_spy_define_spied_method(name)
       method_name = call_spy_normalize_method_name(name)
-      self.define_singleton_method(name) do |*args, &block|
-        call = MuchStub::Call.new(*args, &block)
+      call_spy_define_metaclass_method(name) do |*args, &block|
+        call = ::MuchStub::Call.new(*args, &block)
         @call_spy_method_calls[method_name] << call
         call_spy_method_return_value(name, call)
       end
@@ -47,45 +79,46 @@ module MuchStub
       spied_method_name = query_method_match[1]
       query_method_suffix = query_method_match[2]
       method_name = call_spy_normalize_method_name(spied_method_name)
-      self.define_singleton_method("#{method_name}#{query_method_suffix}") do
-        yield(method_name) if block_given?
+      call_spy_define_metaclass_method("#{method_name}#{query_method_suffix}") do
+        yield(method_name) if ::Kernel.block_given?
       end
     end
 
+    def call_spy_define_metaclass_method(name, &block)
+      metaclass = class << self; self; end
+      metaclass.define_method(name, &block)
+    end
+
     def method_missing(name, *args, &block)
       if (match = name.match(/(\w+)(_calls)\z/))
         call_spy_define_query_method(match) do |method_name|
           @call_spy_method_calls[method_name]
         end
-        self.send(name, *args, &block)
+        self.__send__(name, *args, &block)
       elsif (match = name.match(/(\w+)(_last_called_with)\z/))
         call_spy_define_query_method(match) do |method_name|
-          self.send("#{method_name}_calls").last
+          self.__send__("#{method_name}_calls").last
         end
-        self.send(name, *args, &block)
+        self.__send__(name, *args, &block)
       elsif (match = name.match(/(\w+)(_called_with)\z/))
         call_spy_define_query_method(match) do |method_name|
-          self.send("#{method_name}_last_called_with")
+          self.__send__("#{method_name}_last_called_with")
         end
-        self.send(name, *args, &block)
+        self.__send__(name, *args, &block)
       elsif (match = name.match(/(\w+)(_call_count)\z/))
         call_spy_define_query_method(match) do |method_name|
-          self.send("#{method_name}_calls").size
+          self.__send__("#{method_name}_calls").size
         end
-        self.send(name, *args, &block)
+        self.__send__(name, *args, &block)
       elsif (match = name.match(/(\w+)(_called\?)\z/))
         call_spy_define_query_method(match) do |method_name|
-          self.send("#{method_name}_call_count") > 0
+          self.__send__("#{method_name}_call_count") > 0
         end
-        self.send(name, *args, &block)
+        self.__send__(name, *args, &block)
       else
         call_spy_define_spied_method(name)
-        self.send(name, *args, &block)
+        self.__send__(name, *args, &block)
       end
     end
-
-    def respond_to_missing?(*args)
-      super
-    end
   end
 end

data/lib/much-stub/version.rb

@@ -1,3 +1,3 @@
 module MuchStub
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/much-stub.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = "~> 2.5"
 
-  gem.add_development_dependency("assert", ["~> 2.18.1"])
-
+  gem.add_development_dependency("assert", ["~> 2.18.2"])
 end

data/test/unit/call_spy_tests.rb

@@ -4,7 +4,7 @@ require "much-stub/call_spy"
 require "test/support/factory"
 
 class MuchStub::CallSpy
-  class UnitTests < Assert::Context
+  class UnitTests < ::Assert::Context
     desc "MuchStub::CallSpy"
     setup do
       @unit_class = MuchStub::CallSpy
@@ -19,7 +19,7 @@ class MuchStub::CallSpy
     subject{ @spy }
 
     should "spy on method calls and return itself" do
-      assert_false subject.respond_to?(:get)
+      assert_true subject.respond_to?(:get)
 
       assert_equal [], subject.get_calls
       assert_nil subject.get_last_called_with

data/test/unit/much-stub_tests.rb

@@ -25,10 +25,32 @@ module MuchStub
       stub1 = MuchStub.(@myobj, :mymeth)
       assert_kind_of MuchStub::Stub, stub1
 
-      stub2 = MuchStub.call(@myobj, :mymeth)
+      stub2 = MuchStub.stub(@myobj, :mymeth)
       assert_kind_of MuchStub::Stub, stub2
     end
 
+    should "build a stub with an on_call block" do
+      my_meth_called_with = nil
+      stub1 =
+        MuchStub.on_call(@myobj, :mymeth) { |call|
+          my_meth_called_with = call
+        }
+
+      @myobj.mymeth
+      assert_kind_of MuchStub::Stub, stub1
+      assert_equal [], my_meth_called_with.args
+
+      my_meth_called_with = nil
+      stub2 =
+        MuchStub.stub_on_call(@myobj, :mymeth) { |call|
+          my_meth_called_with = call
+        }
+
+      @myobj.mymeth
+      assert_kind_of MuchStub::Stub, stub2
+      assert_equal [], my_meth_called_with.args
+    end
+
     should "lookup stubs that have been called before" do
       stub1 = MuchStub.(@myobj, :mymeth)
       stub2 = MuchStub.(@myobj, :mymeth)
@@ -112,11 +134,13 @@ module MuchStub
           :one,
           :two,
           :three,
+          :to_s,
           ready?: true)
 
       assert_equal spy, myobj.one
       assert_equal spy, myobj.two("a")
       assert_equal spy, myobj.three
+      assert_equal spy, myobj.to_s
 
       assert_true myobj.one.two("b").three.ready?
 
@@ -124,6 +148,7 @@ module MuchStub
       assert_equal 2, spy.one_call_count
       assert_equal 2, spy.two_call_count
       assert_equal 2, spy.three_call_count
+      assert_equal 1, spy.to_s_call_count
       assert_equal 1, spy.ready_predicate_call_count
       assert_equal ["b"], spy.two_last_called_with.args
       assert_true spy.ready_predicate_called?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: much-stub
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: assert
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.1
+        version: 2.18.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.1
+        version: 2.18.2
 description: Stubbing API for replacing method calls on objects in test runs.
 email:
 - kelly@kellyredding.com