spy 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1c3954f26350a18af51b75fd2400d06600c859ba9e4675a2ddfb5b983f8a8d
-  data.tar.gz: e535c67bdf68ba225c6cfb98f3182c53004de5452e27eb3d3476deaa16369956
+  metadata.gz: aa89505674a7286f055ee019988cf29debbdd5cb7e525a022864f551d20ae842
+  data.tar.gz: fa61fa5e78f5aea6fab75bcc471bdcc8032182d8e9c7528e9370b91022ef7ae0
 SHA512:
-  metadata.gz: 6d6fb00c5cdc3e0f435f24ffdff53921fa8578f69a004c0b995fda335b69a694a4ea06fe61541d66fb0d40c0a52303d197ceec5b429bec102c09828da19082a4
-  data.tar.gz: 16de7875661311fa5d6ca327ff4510751e88d743e672e937492a8d4abcbd11599f12df9667965c2e5434a5bd6b5725c12caf4c781672fac033ce6c51b5746dbe
+  metadata.gz: abb91b0bcef139e03b90cb59f2f1b5d9f0c52c8137beafab301f56a96d44dbcffc203bcf0c69cd7e5376bed68549e0bb9bf407b4f85e07fc91d875d401ce39d0
+  data.tar.gz: 58d355373220b031ba5740b0cfdc2a6d9bb94a7c39166fafae23896342eec3c3b907994f7224e80abc7f2d1ae289048d98cd56a05750569befa62c98f6330a22

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.0

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.5.1
+  - '2.1'
+  - '2.5'
+  - '2.7'
   - jruby
   - ruby-head
   - rbx-3
@@ -9,3 +10,4 @@ matrix:
   allow_failures:
       - rvm: ruby-head
       - rvm: rbx-3
+      - rvm: jruby

data/CHANGELOG.md

@@ -1,7 +1,14 @@
+## Spy 1.0.1 (August 20th, 2020) ##
+
+*   Fix call_through w/ instance methods (@lreeves)
+*   Replace implicit Proc.new by explicit given block reference (@Hugo-Hache)
+*   Remove 2.7 warnings (@byroot)
+
 ## Spy 1.0.0 (October 10, 2018) ##
 
 *   drop support for ruby 1.9.3, 2.0. Only support 2.1+ (@dylanahsmith)
 *   support named arguments (@dylanahsmith)
+*   Fix readme (@ignat-z)
 
 ## Spy 0.4.3 (April 14, 2016) ##
 

data/lib/spy.rb

@@ -34,8 +34,6 @@ module Spy
         spy = Subroutine.get(base_object, method_name)
         if spy
           spy.unhook
-        else
-          raise NoSpyError, "#{method_name} was not hooked on #{base_object.inspect}."
         end
       end
 

data/lib/spy/api.rb

@@ -36,8 +36,8 @@ module Spy
         end
       end
 
-      def with(*args)
-        @with = block_given? ? Proc.new : args
+      def with(*args, &block)
+        @with = block_given? ? block : args
         self
       end
 

data/lib/spy/subroutine.rb

@@ -52,8 +52,21 @@ module Spy
         @original_method = current_method
       end
 
-      define_method_with = singleton_method ? :define_singleton_method : :define_method
-      base_object.send(define_method_with, method_name, override_method)
+      if original_method && original_method.owner == base_object
+        original_method.owner.send(:remove_method, method_name)
+      end
+
+      if singleton_method
+        if base_object.singleton_class.method_defined?(method_name) || base_object.singleton_class.private_method_defined?(method_name)
+          base_object.singleton_class.alias_method(method_name, method_name)
+        end
+        base_object.define_singleton_method(method_name, override_method)
+      else
+        if base_object.method_defined?(method_name) || base_object.private_method_defined?(method_name)
+          base_object.alias_method(method_name, method_name)
+        end
+        base_object.define_method(method_name, override_method)
+      end
 
       if [:public, :protected, :private].include? hook_opts[:visibility]
         method_owner.send(hook_opts[:visibility], method_name)
@@ -69,11 +82,10 @@ module Spy
     def unhook
       raise NeverHookedError, "'#{method_name}' method has not been hooked" unless hooked?
 
+      method_owner.send(:remove_method, method_name)
       if original_method && method_owner == original_method.owner
-        method_owner.send(:define_method, method_name, original_method)
-        method_owner.send(original_method_visibility, method_name) if original_method_visibility
-      else
-        method_owner.send(:remove_method, method_name)
+        original_method.owner.send(:define_method, method_name, original_method)
+        original_method.owner.send(original_method_visibility, method_name) if original_method_visibility
       end
 
       clear_method!
@@ -105,7 +117,7 @@ module Spy
     #   spy.and_return(force: true) { |invalid_arity| true }
     #
     # @return [self]
-    def and_return(value = nil)
+    def and_return(value = nil, &block)
       @do_not_check_plan_arity = false
 
       if block_given?
@@ -115,7 +127,7 @@ module Spy
           raise ArgumentError, "value and block conflict. Choose one"
         end
 
-        @plan = Proc.new
+        @plan = block
         check_for_too_many_arguments!(@plan)
       else
         @plan = Proc.new { value }
@@ -136,13 +148,29 @@ module Spy
     # tells the spy to call the original method
     # @return [self]
     def and_call_through
-      @plan = Proc.new do |*args, &block|
-        if original_method
-          original_method.call(*args, &block)
-        else
-          base_object.send(:method_missing, method_name, *args, &block)
+      if @base_object.is_a? Class
+        @plan = Proc.new do |object, *args, &block|
+          if original_method
+            if original_method.is_a? UnboundMethod
+              bound_method = original_method.bind(object)
+              bound_method.call(*args, &block)
+            else
+              original_method.call(*args, &block)
+            end
+          else
+            base_object.send(:method_missing, method_name, *args, &block)
+          end
+        end
+      else
+        @plan = Proc.new do |*args, &block|
+          if original_method
+            original_method.call(*args, &block)
+          else
+            base_object.send(:method_missing, method_name, *args, &block)
+          end
         end
       end
+
       self
     end
 
@@ -193,9 +221,9 @@ module Spy
     # check if the method was called with the exact arguments
     # @param args Arguments that should have been sent to the method
     # @return [Boolean]
-    def has_been_called_with?(*args)
+    def has_been_called_with?(*args, &block)
       raise NeverHookedError unless @was_hooked
-      match = block_given? ? Proc.new : proc { |call| call.args == args }
+      match = block_given? ? block : proc { |call| call.args == args }
       calls.any?(&match)
     end
 
@@ -203,10 +231,18 @@ module Spy
     # method.
     def invoke(object, args, block, called_from)
       check_arity!(args.size)
-      result = if @plan
-                 check_for_too_many_arguments!(@plan)
-                 @plan.call(*args, &block)
-               end
+
+      if base_object.is_a? Class
+        result = if @plan
+                   check_for_too_many_arguments!(@plan)
+                   @plan.call(object, *args, &block)
+                 end
+      else
+        result = if @plan
+                   check_for_too_many_arguments!(@plan)
+                   @plan.call(*args, &block)
+                 end
+      end
     ensure
       calls << CallLog.new(object, called_from, args, block, result)
     end
@@ -274,6 +310,8 @@ module Spy
       min_arity = block.arity
       min_arity = min_arity.abs - 1 if min_arity < 0
 
+      min_arity -=1 if base_object.is_a? Class # Instance-method procs take an extra param for receiving object
+
       if min_arity > arity_range.max
         raise ArgumentError.new("block requires #{min_arity} arguments while original_method require a maximum of #{arity_range.max}")
       end

data/lib/spy/version.rb

@@ -1,3 +1,3 @@
 module Spy
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spy.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_development_dependency('pry')
-  gem.add_development_dependency('pry-nav')
-  gem.add_development_dependency('pry-stack_explorer')
+  gem.add_development_dependency('pry-byebug')
   gem.add_development_dependency('minitest', '>= 4.5.0')
   gem.add_development_dependency('minitest-reporters')
   gem.add_development_dependency('rspec-core')

data/test/integration/test_constant_spying.rb

@@ -30,7 +30,7 @@ class TestConstantSpying < Minitest::Test
     assert_equal "hello world", Foo.hello
 
     spy = Spy.on_const(Foo, :HELLO)
-    assert_equal nil, Foo.hello
+    assert_nil Foo.hello
     spy.and_return("awesome")
     assert_equal "awesome", Foo.hello
 
@@ -39,7 +39,7 @@ class TestConstantSpying < Minitest::Test
 
     assert_equal "hello world", Foo::Bar.hello
     spy = Spy.on_const(Foo, :HELLO)
-    assert_equal nil, Foo::Bar.hello
+    assert_nil Foo::Bar.hello
     spy.and_return("awesome")
     assert_equal "awesome", Foo::Bar.hello
 
@@ -48,7 +48,7 @@ class TestConstantSpying < Minitest::Test
 
     assert_equal "hello world", ChildFoo.hello
     spy = Spy.on_const(Foo, :HELLO)
-    assert_equal nil, ChildFoo.hello
+    assert_nil ChildFoo.hello
     spy.and_return("awesome")
     assert_equal "awesome", ChildFoo.hello
 

data/test/integration/test_instance_method.rb

@@ -17,6 +17,12 @@ class TestAnyInstanceOf < Minitest::Test
     Spy::Agency.instance.dissolve!
   end
 
+  def test_call_through_with_instance_method
+    Spy.on_instance_method(Foo, :bar).and_call_through
+    assert_equal "foobar", Foo.new.bar
+    Spy.off_instance_method(Foo, :bar)
+  end
+
   def test_it_overides_all_methods
     assert_equal Foo.new.bar, "foobar"
     spy = Spy.on_instance_method(Foo, bar: "timshel")

data/test/integration/test_subroutine_spying.rb

@@ -16,12 +16,12 @@ class TestSpy < Minitest::Test
 
     assert_kind_of Spy::Subroutine, pen_write_spy
     assert_kind_of Spy::Subroutine, pen_write_hello_spy
-    assert_equal [pen_write_spy, pen_write_hello_spy], Spy::Agency.instance.subroutines
+    assert_equal [pen_write_spy, pen_write_hello_spy], Spy::Agency.instance.spies
     assert pen_write_spy.has_been_called?
     assert pen_write_hello_spy.has_been_called?
   end
 
-  def test_spy_on_hooks_and_saves_spy_with_array
+  def test_spy_on_hooks_and_saves_spy_with_hash
     pen_write_spy, pen_write_hello_spy = Spy.on(@pen, write: "hello", write_hello: "world")
     assert_equal "hello", @pen.write(nil)
     assert_equal "world", @pen.write_hello

data/test/spy/test_mock.rb

@@ -68,7 +68,7 @@ module Spy
       end
     end
 
-    BUGGY_METHODS = %i(tap pretty_print_inspect trust untrust untrusted?)
+    BUGGY_METHODS = %i(tap pretty_print_inspect trust untrust untrusted? debugger byebug taint untaint tainted?)
     def test_mocked_methods
       pen_methods = Pen.public_instance_methods(false) +
         Pen.protected_instance_methods(false) +

data/test/spy/test_subroutine.rb

@@ -157,7 +157,7 @@ module Spy
       assert pen_write_spy.has_been_called_with?("hello")
     end
 
-    def test_spy_hook_records_number_of_calls
+    def test_spy_hook_records_number_of_calls2
       args = ["hello world"]
       block = Proc.new {}
       pen_write_spy = spy_on(@pen, :write)

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 require 'bundler/setup'
+require 'pry'
+require 'pry-byebug'
 require 'minitest/autorun'
 require "minitest/reporters"
-require 'pry'
-require 'pry-nav'
 require 'coveralls'
 Coveralls.wear!
 Minitest::Reporters.use!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryan Ong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -25,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,6 +118,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".tool-versions"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -197,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple modern mocking library that uses the spy pattern and checks method's