Interwiki Module Fixed

MoinMoin/util/_tests/test_interwiki.py

 # Copyright: 2010 MoinMoin:ThomasWaldmann
 # Copyright: 2010 MoinMoin:MicheleOrru
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
     MoinMoin - MoinMoin.util.interwiki Tests
 """
 
 
 from __future__ import absolute_import, division
@@ skipping 10 matching lines @@
 from MoinMoin.constants.keys import CURRENT
 from MoinMoin.app import before_wiki
 
 
 class TestInterWiki(object):
     class Config(wikiconfig.Config):
         interwiki_map = {'Self': 'http://localhost:8080/',
                          'MoinMoin': 'http://moinmo.in/',
                          'OtherWiki': 'http://otherwiki.com/',
                          'OtherWiki/ns1': 'http://otherwiki.com/ns1/',
                          'OtherWiki/ns1/ns2': 'http://otherwiki.com/ns1/ns2/',

[Thomas.J.Waldmann, 2013/06/21 12:36:26]

ok, so we are changing interwiki markup also
(as in: linking to other wikis)

this will need some change in the moin 1.9 importer to adapt the markup, so add
a # TODO about this.

         }
 
     def test_url_for_item(self):
         before_wiki()
         revid = 'cdc431e0fc624d6fb8372152dcb66457'
 
         tests = [(('SomePage', '', '', '', CURRENT, 'frontend.show_item', False), '/SomePage'),
                  # Method signature to understand the tuple parameters
                  # (item_name, wiki_name='', namespace='', rev=CURRENT, endpoint='frontend.show_item', _external=False):
                  (('SomePage', '', '', '', CURRENT, 'frontend.show_item', True), 'http://localhost:8080/SomePage'),
                  (('SomePage', '', '', '', CURRENT, 'frontend.modify_item', False), '/+modify/SomePage'),
                  # FIXME if you set interwiki_map = dict(Self='http://localhost:8080', MoinMoin='http://moinmo.in/', ),
                  # the above line make it fails, it returns http://localhost/+modify/SomePage
                  # (('SomePage', '', '', CURRENT, 'frontend.modify_item', True), 'http://localhost:8080/+modify/SomePage'),
-                 (('SomePage', '', 'revid', '', revid, 'frontend.show_item', False), '/+show/+{0}/%40revid/SomePage'.format(revid)),

[Thomas.J.Waldmann, 2013/06/21 12:36:26]

incorrect test, see below

+                 (('SomeRevID', '', 'revid', '', revid, 'frontend.show_item', False), '/+show/+{0}/%40revid/SomeRevID'.format(revid)),
                  (('SomePage', '', '', '', revid, 'frontend.show_item_meta', False), '/+meta/+{0}/SomePage'.format(revid)),
                  # Valid namespaces
                  (('SomePage', '', '', 'ns1', CURRENT, 'frontend.show_item', False), '/ns1/SomePage'),

[Thomas.J.Waldmann, 2013/06/21 12:36:26]

seems like we had some extra-indication in the past.
/: :

vs

/ /

The question is: did that have some advantage / do we still need it?

-                 (('SomePage', '', 'tags', 'ns1', CURRENT, 'frontend.show_item', False), '/ns1/%40tags/SomePage'),

[Thomas.J.Waldmann, 2013/06/21 12:36:26]

ehrm, really %40 ? when we (waldi an me) chose @ we checked that it is "safe"
for use in the path, so it should be "@" not "%40".

is your werkzeug/flask the latest version? if not, upgrade before doing anything
else.

also, this test doesn't look correct. You say @tags, but you are using
"SomePage" (which looks rather like a pagename, not a tag). so rather use
"sometag".

+                 (('SomeTag', '', 'tags', 'ns1', CURRENT, 'frontend.show_item', False), '/ns1/%40tags/SomeTag'),
                  (('SomePage', '', '', 'ns1/ns2', CURRENT, 'frontend.show_item', True), 'http://localhost:8080/ns1/ns2/SomePage'),
                  (('SomePage', '', '', 'ns1', CURRENT, 'frontend.modify_item', False), '/+modify/ns1/SomePage'),
                  (('SomePage', '', '', 'ns1/ns2', CURRENT, 'frontend.show_item_meta', True), 'http://localhost:8080/+meta/ns1/ns2/SomePage'),
                  (('SomePage', '', '', 'ns1', revid, 'frontend.show_item', False), '/+show/+{0}/ns1/SomePage'.format(revid)),
                  (('SomePage', '', '', 'ns1/ns2', revid, 'frontend.show_item_meta', False), '/+meta/+{0}/ns1/ns2/SomePage'.format(revid)),
-                 (('SomePage', '', 'revid', 'ns1/ns2', revid, 'frontend.show_item_meta', False), '/+meta/+{0}/ns1/ns2/%40revid/SomePage'.format(revid)),

[Thomas.J.Waldmann, 2013/06/21 12:36:26]

that test is incorrect

your are using @revid so the "name" has to be the revid value.

+                 (('SomeRevID', '', 'revid', 'ns1/ns2', CURRENT, 'frontend.show_item_meta', False), '/+meta/ns1/ns2/%40revid/SomeRevID'.format(revid)),
 
                  (('SomePage', 'MoinMoin', '', 'ns1', CURRENT, 'frontend.show_item', False), 'http://moinmo.in/ns1/SomePage'),
                  (('SomePage', 'MoinMoin', '', '', CURRENT, 'frontend.show_item', False), 'http://moinmo.in/SomePage'),
                  # FIXME will exist a map for this case? maybe there should be a placeholder for it.
                  # we need that for wiki farms with common search index and search in non-current revisions.
                  (('SomePage', 'MoinMoin', '', '', revid, 'frontend.show_item', False), 'http://moinmo.in/+show/+{0}/SomePage'.format(revid)),
-                 (('SomePage', 'non-existent', 'itemid', '', CURRENT, 'frontend.show_item', False), '/non-existent/@itemid/SomePage'),
+                 (('SomeItemID', 'non-existent', 'itemid', '', CURRENT, 'frontend.show_item', False), '/non-existent/@itemid/SomeItemID'),
                  (('SomePage', 'non-existent', '', 'ns1', CURRENT, 'frontend.show_item', False), '/non-existent/ns1/SomePage'),
                 ]
 
         for (item_name, wiki_name, field, namespace, rev, endpoint, _external), url in tests:
             assert url_for_item(item_name, wiki_name, field, namespace, rev, endpoint, _external) == url
 
     def test__split_namespace(self):
         map = set()
         map.add(u'ns1')
         map.add(u'ns1/ns2')
         tests = [('', ('', '')),
                  ('OtherWiki/', ('', 'OtherWiki/')),
                  ('ns1/', ('ns1', '')),
                  ('ns3/foo', ('', 'ns3/foo')),
                  ('ns1/OtherPage', ('ns1', 'OtherPage')),
                  ('ns1/ns2/OtherPage', ('ns1/ns2', 'OtherPage')),
                  ('ns1/ns2/ns1/ns2/OtherPage', ('ns1/ns2', 'ns1/ns2/OtherPage')),
                  ('SomePage', ('', 'SomePage')),
                  ('OtherWiki/ns1/OtherPage', ('', 'OtherWiki/ns1/OtherPage')),
                 ]
         for markup, (namespace, pagename) in tests:
             assert _split_namespace(map, markup) == (namespace, pagename)
             namespace, pagename = _split_namespace(map, markup)
 
     def test_split_interwiki(self):
         app.cfg.namespace_mapping = [(u'', 'default_backend'), (u'ns1/', 'default_backend'), (u'ns1/ns2/', 'other_backend')]
-        tests = [('', ('Self', '', '', '')),
-                 ('OtherWiki/', ('OtherWiki', '', '', '')),
-                 ('/ns1/', ('Self', 'ns1', '', '')),
+        tests = [('', ('Self', '', 'name_exact', '')),
+                 ('OtherWiki/', ('OtherWiki', '', 'name_exact', '')),
+                 ('/ns1/', ('Self', 'ns1', 'name_exact', '')),
                  ('/@itemid/', ('Self', '', 'itemid', '')),
-                 ('/ns3/foo', ('Self', '', '', 'ns3/foo')),
-                 ('@tags/SomePage', ('Self', '', 'tags', 'SomePage')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

looks wrong, see above

-                 ('OtherWiki/OtherPage', ('OtherWiki', '', '', 'OtherPage')),
-                 ('NonExistentWiki/OtherPage', ('Self', '', '', 'NonExistentWiki/OtherPage')),
-                 ('OtherWiki/ns1/@chenid/Page', ('OtherWiki', 'ns1', '', '@chenid/Page')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

wut?

-                 ('/ns1/OtherPage', ('Self', 'ns1', '', 'OtherPage')),
-                 ('/ns1/ns2/OtherPage', ('Self', 'ns1/ns2', '', 'OtherPage')),
-                 ('ns1/OtherPage', ('Self', 'ns1', '', 'OtherPage')),
-                 ('ns1/ns2/OtherPage', ('Self', 'ns1/ns2', '', 'OtherPage')),
-                 ('OtherWiki/ns1/OtherPage', ('OtherWiki', 'ns1', '', 'OtherPage')),
-                 ('OtherWiki/ns1/ns2/OtherPage', ('OtherWiki', 'ns1/ns2', '', 'OtherPage')),
-                 ('OtherWiki/ns1/ns2/@userid/OtherPage', ('OtherWiki', 'ns1/ns2', 'userid', 'OtherPage')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

looks wrong, see above

-                 ('OtherWiki/ns3/ns2/@userid/OtherPage/foo', ('OtherWiki', '', '', 'ns3/ns2/@userid/OtherPage/foo')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

looks wrong, see above

+                 ('/ns3/foo', ('Self', '', 'name_exact', 'ns3/foo')),
+                 ('@tags/SomeTag', ('Self', '', 'tags', 'SomeTag')),
+                 ('OtherWiki/OtherPage', ('OtherWiki', '', 'name_exact', 'OtherPage')),
+                 ('NonExistentWiki/OtherPage', ('Self', '', 'name_exact', 'NonExistentWiki/OtherPage')),
+                 ('OtherWiki/ns1/@invalidID/Page', ('OtherWiki', 'ns1', 'name_exact', '@invalidID/Page')),
+                 ('/ns1/OtherPage', ('Self', 'ns1', 'name_exact', 'OtherPage')),
+                 ('/ns1/ns2/OtherPage', ('Self', 'ns1/ns2', 'name_exact', 'OtherPage')),
+                 ('ns1/OtherPage', ('Self', 'ns1', 'name_exact', 'OtherPage')),
+                 ('ns1/ns2/OtherPage', ('Self', 'ns1/ns2', 'name_exact', 'OtherPage')),
+                 ('OtherWiki/ns1/OtherPage', ('OtherWiki', 'ns1', 'name_exact', 'OtherPage')),
+                 ('OtherWiki/ns1/ns2/OtherPage', ('OtherWiki', 'ns1/ns2', 'name_exact', 'OtherPage')),
+                 ('OtherWiki/ns1/ns2/@userid/SomeUserID', ('OtherWiki', 'ns1/ns2', 'userid', 'SomeUserID')),
+                 ('OtherWiki/ns3/ns2/@Notfield/OtherPage/foo', ('OtherWiki', '', 'name_exact', 'ns3/ns2/@Notfield/OtherPage/foo')),
                 ]
         for markup, (wikiname, namespace, field, pagename) in tests:
             assert split_interwiki(markup) == (wikiname, namespace, field, pagename)
             wikiname, namespace, field, pagename = split_interwiki(markup)
             assert isinstance(namespace, unicode)
             assert isinstance(pagename, unicode)
             assert isinstance(field, unicode)
             assert isinstance(wikiname, unicode)
 
     def testJoinWiki(self):
         tests = [(('http://example.org/', u'SomePage', '', ''), 'http://example.org/SomePage'),
                  (('', u'SomePage', '', ''), 'SomePage'),
                  (('http://example.org/?page=$PAGE&action=show', u'SomePage', '', ''), 'http://example.org/?page=SomePage&action=show'),
                  (('http://example.org/', u'Aktuelle\xc4nderungen', '', ''), 'http://example.org/Aktuelle%C3%84nderungen'),
                  (('http://example.org/$PAGE/show', u'Aktuelle\xc4nderungen', '', ''), 'http://example.org/Aktuelle%C3%84nderungen/show'),
 
-                 (('http://example.org/', u'SomePage', 'itemid', u'ns1'), 'http://example.org/ns1/@itemid/SomePage'),

[Thomas.J.Waldmann, 2013/06/21 12:36:26]

test looks wrong - please systematically review all your changes and fix them.

+                 (('http://example.org/', u'SomeItemID', 'itemid', u'ns1'), 'http://example.org/ns1/@itemid/SomeItemID'),
                  (('http://example.org/?page=$PAGE&action=show&namespace=$NAMESPACE', u'SomePage', '', u'ns1'), 'http://example.org/?page=SomePage&action=show&namespace=ns1'),
                  (('http://example.org/', u'Aktuelle\xc4nderungen', '', u'ns1\xc4'), 'http://example.org/ns1%C3%84/Aktuelle%C3%84nderungen'),
                  (('http://example.org/$NAMESPACE/$PAGE/show', u'Aktuelle\xc4nderungen', '', u'ns\xc41'), 'http://example.org/ns%C3%841/Aktuelle%C3%84nderungen/show'),
                  (('http://example.org/@$FIELD/$PAGE/show', u'Aktuelle\xc4nderungen', u'itemid', u''), 'http://example.org/@itemid/Aktuelle%C3%84nderungen/show'),
                 ]
         for (baseurl, pagename, field, namespace), url in tests:
             assert join_wiki(baseurl, pagename, field, namespace) == url
 
     def test_split_fqname(self):
         app.cfg.namespace_mapping = [(u'', 'default_backend'), (u'ns1/', 'default_backend'), (u'ns1/ns2/', 'other_backend')]
-        tests = [('ns1/ns2/@itemid/Page', ('ns1/ns2', 'itemid', 'Page')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

looks wrong, see above

-                 ('ns3/@itemid/Page', ('', '', 'ns3/@itemid/Page')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

looks wrong, see above

-                 ('Page', ('', '', 'Page')),
-                 ('ns1/ns2/@tags', ('ns1/ns2', 'tags', '')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

sense?

-                 ('@tags/cheenu', ('', 'tags', 'cheenu')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

wut?

-                 ('ns1/ns2/@notid', ('ns1/ns2', '', '@notid')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

i think we should disallow itemnames starting with @ (or +)

-                 ('ns1/ns2/ns3/@itemid/ns4', ('ns1/ns2', '', 'ns3/@itemid/ns4')),

[Thomas.J.Waldmann, 2013/06/22 20:56:01]

sense?

+        tests = [('ns1/ns2/@itemid/SomeItemID', ('ns1/ns2', 'itemid', 'SomeItemID')),
+                 ('ns3/@itemid/SomeItemID', ('', 'name_exact', 'ns3/@itemid/SomeItemID')),
+                 ('Page', ('', 'name_exact', 'Page')),
+                 ('ns1/ns2/@tags/SomeTag', ('ns1/ns2', 'tags', 'SomeTag')),
+                 ('@tags/SomeTag', ('', 'tags', 'SomeTag')),
+                 ('ns1/ns2/@notid', ('ns1/ns2', 'name_exact', '@notid')),
+                 ('ns1/ns2/ns3/Thisisapagename/ns4', ('ns1/ns2', 'name_exact', 'ns3/Thisisapagename/ns4')),
                 ]
         for url, (namespace, field, pagename) in tests:
             assert split_fqname(url) == (namespace, field, pagename)
 
 
 class TestInterWikiMapBackend(object):
     """
     tests for interwiki map
     """
 
@@ skipping 60 matching lines @@
         testiwm = InterWikiMap.from_file(testfile)
 
         assert 'MoinSrc' in testiwm.iwmap
         assert testiwm.iwmap['MoinMaster'] == 'http://master.moinmo.in/'
         assert 'PythonInfo' in testiwm.iwmap
         assert 'this' not in testiwm.iwmap
         assert testiwm.iwmap['MoinCVS'] == 'http://hg.moinmo.in/moin/2.0?f=-1;file='
 
 
 coverage_modules = ['MoinMoin.util.interwiki']