Changeset 16171

Timestamp:

Dec 30, 2016, 1:24:52 AM (7 years ago)

Author:

Jun Omae

Message:

WikiCreateTicketPlugin: support Trac 1.2 and add unit tests (closes #13019)

Location:

wikicreateticketplugin/0.12

Files:

• setup.py (modified) (1 diff)
• wikicreateticket/__init__.py (modified) (3 diffs)
• wikicreateticket/tests (added)
• wikicreateticket/tests/__init__.py (added)

wikicreateticketplugin/0.12/setup.py

@@ +1 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 from setuptools import setup
 
 setup(
     name='WikiCreateTicket',
-    version='0.1',
+    version='0.1.1',
     packages=['wikicreateticket'],
-    package_data={'wikicreateticket' : [] },
+    package_data={'wikicreateticket' : []},
+    test_suite='wikicreateticket.tests.suite',
     author='Yoshiyuki Sugimoto',
-    maintainer = 'Yoshiyuki Sugimoto',
-    maintainer_email = 's.yosiyuki@gmail.com',
+    maintainer='Yoshiyuki Sugimoto',
+    maintainer_email='s.yosiyuki@gmail.com',
     license='BSD',
-    url='http://trac-hacks.org/wiki/WikiCreateTicketPlugin',
+    url='https://trac-hacks.org/wiki/WikiCreateTicketPlugin',
     description='A plugin to assign new markup to create ticket.',
     entry_points = {'trac.plugins': ['wikicreateticket = wikicreateticket']},

wikicreateticketplugin/0.12/wikicreateticket/__init__.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+
 import re
-from trac.core import *
+from trac.core import Component, implements
 from trac.wiki import IWikiChangeListener, WikiPage
 from trac.ticket import Ticket
@@ -9 +11 @@
     implements(IWikiChangeListener)
 
-    _new_ticket_tag = '#new '
-    _new_ticket_re = re.compile(r'#new (.*)$')
-
-    def match_request(self, req):
-        return 'WIKI_MODIFY' in req.perm and 'TICKET_CREATE' in req.perm
+    _new_ticket_re = re.compile(r'(?P<id>#new)\s+(?P<summary>.+?)\s*$',
+                                re.UNICODE)
+    _space_re = re.compile(r'\s', re.UNICODE)
 
     def wiki_page_added(self, page):
-        self.__parse_wiki_and_create_ticket(page, 1)
+        self._parse_wiki_and_create_ticket(page, 1)
 
     def wiki_page_changed(self, page, version, t, comment, author, ipnr):
-        self.__parse_wiki_and_create_ticket(page, version)
+        self._parse_wiki_and_create_ticket(page, version)
 
     def wiki_page_deleted(self, page):
@@ -27 +27 @@
         pass
 
-    def wiki_page_renamed(self, page, old_name): 
+    def wiki_page_renamed(self, page, old_name):
         pass
 
-    def __parse_wiki_and_create_ticket(self, page, version):
+    def _parse_wiki_and_create_ticket(self, page, version):
         page = WikiPage(self.env, page.name, version)
 
-        lines = page.text.splitlines()
-        new_lines = []
+        lines = page.text.splitlines(True)
+        for idx, line in enumerate(lines):
+            match = self._new_ticket_re.search(line)
+            if match:
+                tktid = self.__create_new_ticket(page, match.group('summary'))
+                if tktid:
+                    lines[idx] = '%s#%d%s' % (line[:match.start('id')],
+                                              tktid, line[match.end('id'):])
+                else:
+                    self.log.error("failed to create ticket from wiki: %s",
+                                   page.name)
 
-        for line in page.text.splitlines():
-            matched = self._new_ticket_re.search(line)
-            if matched:
-                ticket_id = self.__create_new_ticket(page, matched.group(1), page.author)
-                if ticket_id:
-                    self.env.log.debug("create ticket from wiki: %s, ticket: %s" % (page.name, ticket_id))
-                    new_line = line.replace(self._new_ticket_tag, '#%s ' % ticket_id, 1)
-                else:
-                    self.env.log.error("failed to create ticket from wiki: %s" % page.name)
-                    new_line = line
+        self._update_wiki(page, ''.join(lines))
 
-            else:
-                new_line = line
+    def _update_wiki(self, page, text):
+        @self.env.with_transaction()
+        def fn(db):
+            cursor = db.cursor()
+            cursor.execute(
+                "UPDATE wiki SET text=%s WHERE name=%s AND version=%s",
+                (text, page.name, page.version))
 
-            new_lines.append(new_line)
-
-        page.text = "\n".join(new_lines)
-        self.__update_wiki(page)
-
-    def __update_wiki(self, page):
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-        page.save
-        cursor.execute("UPDATE wiki SET text=%s WHERE name=%s AND version=%s",
-                    (page.text, page.name, page.version))
-        db.commit()
-
-    def __create_new_ticket(self, page, title, owner):
-        matched = re.compile(r'^\[(.*)\](.*)').search(title)
-        if matched:
-            summary = matched.group(2)
-            owner = matched.group(1)
+    def __create_new_ticket(self, page, title):
+        match = re.match(r'\[(\S+)\]\s*(.*?)\s*\Z', title)
+        if match:
+            summary = match.group(2)
+            owner = match.group(1)
         else:
             summary = title
             owner = None
-
         ticket = Ticket(self.env)
-        ticket.values = {
-            'status': 'new',
-            'reporter': page.author,
-            'summary': summary,
-            'owner': owner,
-            'description': "wiki:%s" % page.name,
-        }
+        ticket['status'] = 'new'
+        ticket['reporter'] = page.author
+        ticket['summary'] = summary
+        ticket['owner'] = owner
+        if self._space_re.search(page.name):
+            description = 'wiki:"%s"' % page.name
+        else:
+            description = 'wiki:%s' % page.name
+        ticket['description'] = description
         return ticket.insert()