IN PROGRESS - issue SESPRINGPYTHONPY-34: AOP: AOP doesn't seem able to proxy __str__ methods

gregturn · gregturn · commit c0d89730c5f6 · 2008-08-20T21:03:57.000Z
http://jira.springframework.org/browse/SESPRINGPYTHONPY-34 Merged r46:47 from sandbox/gregturnquist/se-springpython-py-34 into trunk. Ran 230 tests with 100% success. git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk/springpython@48 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/src/springpython/aop/__init__.py b/src/springpython/aop/__init__.py
@@ -210,7 +210,7 @@ def dispatch(self, *args, **kwargs):
         target object. This allow this object to serve as a proxying agent for the target object."""
         self.logger.debug("Calling AopProxy.%s(%s)" % (self.methodName, args))
         invocation = MethodInvocation(self.target, self.methodName, args, kwargs, self.interceptors)
-        return getattr(invocation, self.methodName)(*args, **kwargs)
+        return invocation.__getattr__(self.methodName)(*args, **kwargs)
 
     def __getattr__(self, name):
         """If any of the parameters are local objects, they are immediately retrieved. Callables cause the dispatch method
@@ -224,7 +224,7 @@ def __getattr__(self, name):
                return attr
             self.methodName = name
             return self.dispatch
-
+        
 class ProxyFactory(object):
     """This object helps to build AopProxy objects programmatically. It allows configuring advice and target objects.
     Then it will produce an AopProxy when needed. To use similar behavior in an IoC environment, see ProxyFactoryComponent."""
@@ -257,8 +257,11 @@ class ProxyFactoryComponent(ProxyFactory, AopProxy):
     """This class acts as both a ProxyFactory to build and an AopProxy. It makes itself look like the target object.
     Any changes to the target and list of interceptors is immediately seen when using this as a proxy."""
     def __init__(self, target = None, interceptors = None):
-        self.logger = logging.getLogger("springpython.aop.ProxyFactoryComponent")
         ProxyFactory.__init__(self, target, interceptors)
+        self.logger = logging.getLogger("springpython.aop.ProxyFactoryComponent")
+        
+    def __str__(self):
+        return self.__getattr__("__str__")()
 
 class PerformanceMonitorInterceptor(MethodInterceptor):
     def __init__(self, prefix = None, level = logging.DEBUG):
diff --git a/test/springpythontest/aopTestCases.py b/test/springpythontest/aopTestCases.py
@@ -13,6 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.       
 """
+import logging
 import unittest
 from springpython.aop import MethodInterceptor
 from springpython.aop import MethodMatcher
@@ -53,14 +54,23 @@ def testCreatingAProxyFactoryAndAddingAnInterceptorProgrammatically(self):
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it!</Wrapped>", service.method("test"))
         self.assertEquals("sample", service.attribute)
-
+        
     def testCreatingAProxyFactoryAndAddingAnInterceptorIoC(self):
         factory = self.appContext.getComponent("factory")
         service = factory.getProxy()
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it!</Wrapped>", service.method("test"))
         self.assertEquals("sample", service.attribute)
 
+    def testWrappingStringFunctionWithInterceptor(self):
+        service = ProxyFactoryComponent()
+        service.target = SampleService()
+        service.interceptors = [WrappingInterceptor()]
+        self.assertEquals("This is a sample service.", service.target.__str__())
+        self.assertEquals("This is a sample service.", str(service.target))
+        self.assertEquals("<Wrapped>This is a sample service.</Wrapped>", str(service))
+        self.assertEquals("<Wrapped>This is a sample service.</Wrapped>", service.__str__())
+    
     def testCreatingAProxyFactoryComponentAndAddingAnInterceptorProgrammatically(self):
         service = ProxyFactoryComponent()
         service.target = SampleService()
@@ -141,4 +151,13 @@ def testWrappingPyroProxyOnClientSideIoC(self):
     #    self.appContext.dispose()
 
 if __name__ == "__main__":
+    logger = logging.getLogger("springpython")
+    loggingLevel = logging.INFO
+    logger.setLevel(loggingLevel)
+    ch = logging.StreamHandler()
+    ch.setLevel(loggingLevel)
+    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") 
+    ch.setFormatter(formatter)
+    logger.addHandler(ch)
+
     unittest.main()
diff --git a/test/springpythontest/support/testSupportClasses.py b/test/springpythontest/support/testSupportClasses.py
@@ -142,6 +142,8 @@ def method(self, data):
         return "You made it!"
     def doSomething(self):
         return "Alright!"
+    def __str__(self):
+        return "This is a sample service."
 
 class RemoteService1(object):
     def getData(self, param):
