grift 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb5ff564a491305f0eccd4e3098fb3c132fca4b70fef6f07ff05fd5a087fe12
-  data.tar.gz: bf327e20c122bc67ac490cce8409f80fb7e03fbeb81aca5e7443a2bad9b61c93
+  metadata.gz: 98c5113978ecfca383496652f50e2fee8b820bdf0f9dfd94e01649b567c44ee8
+  data.tar.gz: 16d205bacdddd4018ef18654b09c7f9b7d283956a382875f6f4dbae58f1244dd
 SHA512:
-  metadata.gz: ebe31625bd0ecf33c2d5e0cfbadba80ac634cfaee932d0e54cb915c94720b538ab6748c56f311ece69177c078a8ce4394c39ae1b4c431bc78293d0c34b2e95d6
-  data.tar.gz: 4779c67321958fe366269a293308c145e2402cb6a169a651a94e6ebdccd678b1b96154edd1170c5c5eeae84ddbe57f5ce769b41280dd9158a51f37beff679d0c
+  metadata.gz: 75ca213c47eabb2e1cf4ee8790949e041ff383193a844f34f1ab794486cd3afdf633e0206f367e7b74d358276bb43f48b7b0dcf8ae8fbb124977d42c34df1bb7
+  data.tar.gz: 91e88879f44d036403d94808ab853007a66f10e60dad5569e38ace29f1969abc2abc24fdb87b6f9f5db61c98a8efdd34c6d4cfcb4f063fc147e9a1bc80ece52c

data/CHANGELOG.md

@@ -8,6 +8,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 N/A
 
+## [1.0.2](https://github.com/clarkedb/grift/releases/tag/v1.0.2) - 2021-11-11
+
+This version fixes a bug that prevented the mocking of methods defined by a class's super class.
+
+### Fixed
+
+* Allow mocks of inherited methods
+
 ## [1.0.1](https://github.com/clarkedb/grift/releases/tag/v1.0.1) - 2021-11-10
 
 This version fixes a bug that prevented most mocking features in Grift from functioning as expected.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grift (1.0.1)
+    grift (1.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -36,6 +36,14 @@ class Minitest::Test
 end
 ```
 
+Or for Ruby on Rails:
+
+```ruby
+class ActiveSupport::TestCase
+  include Grift::MinitestPlugin
+end
+```
+
 ## Usage
 
 For complete usage guide, see the [docs](https://clarkedb.github.io/grift/).

data/lib/grift/mock_method.rb

@@ -29,7 +29,7 @@ module Grift
     #
     def initialize(klass, method_name, watch: true)
       if Grift.restricted_method?(klass, method_name)
-        raise(Grift::Error, "Cannont mock restricted method #{method_name} for class #{klass}")
+        raise(Grift::Error, "Cannot mock restricted method #{method_name} for class #{klass}")
       end
 
       @klass = klass
@@ -41,8 +41,8 @@ module Grift
       # class methods are really instance methods of the singleton class
       @class_method = klass.singleton_class.instance_methods(true).include?(method_name)
 
-      unless class_instance.instance_methods(true).include?(method_name)
-        raise(Grift::Error, "Cannont mock unknown method #{method_name} for class #{klass}")
+      unless @class_method || class_instance.instance_methods(true).include?(method_name)
+        raise(Grift::Error, "Cannot mock unknown method #{method_name} for class #{klass}")
       end
 
       if class_instance.instance_methods.include?(@cache_method_name)
@@ -137,7 +137,7 @@ module Grift
       premock_setup
       mock_executions = @mock_executions # required to access inside class instance block
 
-      class_instance.remove_method(@method_name)
+      class_instance.remove_method(@method_name) if class_instance.instance_methods(false).include?(@method_name)
       class_instance.define_method @method_name do |*args|
         return_value = block.call(*args)
 
@@ -168,7 +168,7 @@ module Grift
       premock_setup
       mock_executions = @mock_executions # required to access inside class instance block
 
-      class_instance.remove_method(@method_name)
+      class_instance.remove_method(@method_name) if method_defined?
       class_instance.define_method @method_name do |*args|
         # record the args passed in the call to the method and the result
         mock_executions.store(args, return_value)
@@ -217,7 +217,7 @@ module Grift
       mock_executions = @mock_executions # required to access inside class instance block
       cache_method_name = @cache_method_name
 
-      class_instance.remove_method(@method_name)
+      class_instance.remove_method(@method_name) if method_defined?
       class_instance.define_method @method_name do |*args|
         return_value = send(cache_method_name, *args)
 
@@ -237,7 +237,7 @@ module Grift
     def unmock_method
       raise(Grift::Error, 'Method is not cached') unless @true_method_cached
 
-      class_instance.remove_method(@method_name)
+      class_instance.remove_method(@method_name) if method_defined?
       class_instance.alias_method(@method_name, @cache_method_name)
       class_instance.remove_method(@cache_method_name)
 
@@ -280,5 +280,16 @@ module Grift
     def class_instance
       @class_method ? @klass.singleton_class : @klass
     end
+
+    ##
+    # Checks if the method is defined on the class instance. If the method is
+    # inherited from the super class and has not been mocked yet, this will
+    # return false because the super class defined the method.
+    #
+    # @return [Boolean]
+    #
+    def method_defined?
+      class_instance.instance_methods(false).include?(@method_name)
+    end
   end
 end

data/lib/grift/version.rb

@@ -2,6 +2,6 @@
 
 module Grift
   # gem version
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   public_constant :VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grift
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Clark Brown