fix bug #212 and add tests (#227)

src/cachier/core.py

@@ -245,7 +245,11 @@ def func_wrapper(*args, **kwds):
             if verbose:
                 _print = print
             if ignore_cache or not _default_params["caching_enabled"]:
-                return func(**kwargs)
+                return (
+                    func(args[0], **kwargs)
+                    if core.func_is_method
+                    else func(**kwargs)
+                )
             key, entry = core.get_entry((), kwargs)
             if overwrite_cache:
                 return _calc_entry(core, key, func, args, kwds)

tests/test_general.py

@@ -241,6 +241,76 @@ def get_random():
     assert result_1 != result_3
 
 
+def test_global_disable_function():
+    @cachier.cachier()
+    def test():
+        return True
+
+    cachier.disable_caching()
+    try:
+        assert test()
+    finally:
+        cachier.enable_caching()
+
+
+def test_global_disable_method():
+    class Test:
+        @cachier.cachier()
+        def test(self):
+            return True
+
+    cachier.disable_caching()
+    try:
+        assert Test().test()
+    finally:
+        cachier.enable_caching()
+
+
+def test_global_disable_method_with_args():
+    class Test:
+        @cachier.cachier()
+        def test(self, test):
+            return test
+
+    cachier.disable_caching()
+    try:
+        assert Test().test(1) == 1
+    finally:
+        cachier.enable_caching()
+
+
+def test_global_disable_method_with_optional_parameters():
+    class Test:
+        def __init__(self, val):
+            self.val = val
+
+        @cachier.cachier()
+        def test(self, test=0):
+            return self.val + test
+
+    cachier.disable_caching()
+    try:
+        assert Test(1).test(test=1) == 2
+    finally:
+        cachier.enable_caching()
+
+
+def test_global_disable_method_with_args_and_optional_parameters():
+    class Test:
+        def __init__(self, val):
+            self.val = val
+
+        @cachier.cachier()
+        def test(self, test1, test2=0):
+            return self.val + test1 + test2
+
+    cachier.disable_caching()
+    try:
+        assert Test(1).test(2, 3) == 6
+    finally:
+        cachier.enable_caching()
+
+
 def test_none_not_cached_by_default():
     count = 0