Changeset 16:bb9f1fb34a32

Timestamp:

06/29/10 23:38:00 (23 months ago)

Author:

fs

Branch:

default

Message:

moved code for captcha injection in the controller so it can be shared

Location:

trac_captcha

Files:

• controller.py (modified) (3 diffs)
• ticket.py (modified) (4 diffs)

trac_captcha/controller.py

@@ -24 +24 @@
 
 from genshi import HTML
+from genshi.builder import tag
 from trac.config import ExtensionOption, Option
 from trac.core import Component, implements
@@ -64 +65 @@
         return False
     
-    def genshi_stream(self, req):
-        return HTML(self.captcha.genshi_stream(req))
-    
     def check_captcha_solution(self, req):
         if self.should_skip_captcha(req):
@@ -77 +75 @@
         self.add_token_for_request(req)
         return None
+    
+    # Captcha generation / Genshi stream manipulation
+    def captcha_html(self, req):
+        return HTML(self.captcha.genshi_stream(req))
+    
+    def inject_captcha_into_stream(self, req, stream, transformer):
+        initialize_captcha_data(req)
+        if 'token' in req.captcha_data:
+            return stream | transformer.before(self.captcha_token_tag(req))
+        if self.should_skip_captcha(req):
+            return stream
+        
+        return stream | transformer.before(self.captcha_html(req))
+    
+    def captcha_token_tag(self, req):
+        token = req.captcha_data['token']
+        return tag.input(type='hidden', name='__captcha_token', value=token)
     
     # --- private API ----------------------------------------------------------

trac_captcha/ticket.py

@@ -23 +23 @@
 # THE SOFTWARE.
 
-from genshi.builder import tag
 from genshi.filters.transform import Transformer
 from trac.core import Component, implements
@@ -29 +28 @@
 from trac.web.api import ITemplateStreamFilter
 
-from trac_captcha.controller import initialize_captcha_data, TracCaptchaController
+from trac_captcha.controller import TracCaptchaController
 
 __all__ = ['TicketCaptcha']
@@ -41 +40 @@
         if filename != 'ticket.html':
             return stream
-        initialize_captcha_data(req)
-        controller = TracCaptchaController(self.env)
-        if 'token' in req.captcha_data:
-            return stream | self.captcha_token_tag(req)
-        if controller.should_skip_captcha(req):
-            return stream
-        
-        captcha = controller.genshi_stream(req)
-        return stream | Transformer('//div[@class="buttons"]').before(captcha)
+        transformer = Transformer('//div[@class="buttons"]')
+        return TracCaptchaController(self.env).inject_captcha_into_stream(req, stream, transformer)
     
     # --- ITicketManipulator ---------------------------------------------------
@@ -61 +53 @@
         return ((None, error_message),)
     
-    # --- private API ----------------------------------------------------------
-    
-    def captcha_token_tag(self, req):
-        token = req.captcha_data['token']
-        input_tag = tag.input(type='hidden', name='__captcha_token', value=token)
-        return Transformer('//div[@class="buttons"]').before(input_tag)