fixed mock usage; got 3 of 5 relme tests working

Author: bear

ronkyuu/__init__.py

@@ -8,7 +8,7 @@
 __email__        = 'bear@bear.im'
 __copyright__    = 'Copyright (c) 2013-2016 by Mike Taylor and Kartik Prabhu'
 __license__      = 'MIT'
-__version__      = '0.3.3'
+__version__      = '0.3.4'
 __url__          = 'https://github.com/bear/ronkyuu'
 __download_url__ = 'https://pypi.python.org/pypi/ronkyuu'
 __description__  = 'Webmention Manager'

ronkyuu/relme.py

@@ -6,13 +6,16 @@
 IndieWeb Rel=Me Tools
 """
 
-from tools import normalizeURL
+from tools import normalizeURL, cleanURL
 
 import requests
 from urlparse import urlparse
 from bs4 import BeautifulSoup
 
 
+_html_parser = 'html5lib'   # 'html.parser', 'lxml', 'lxml-xml'
+
+
 # see http://microformats.org/wiki/rel-me for the spec
 #
 # With a profile URL http://bear.im and a resource URL http://twitter.com/bear
@@ -71,15 +74,14 @@ def findRelMe(sourceURL):
               'url':     sourceURL
               }
     if r.status_code == requests.codes.ok:
-        dom = BeautifulSoup(r.text, 'html.parser')
-
+        dom = BeautifulSoup(r.text, _html_parser)
         for link in dom.find_all('a', rel='me'):
             rel  = link.get('rel')
             href = link.get('href')
             if rel is not None and href is not None:
                 url = urlparse(href)
                 if url is not None and url.scheme in ('http', 'https'):
-                    result['relme'].append(href)
+                    result['relme'].append(cleanURL(href))
     return result
 
 

ronkyuu/tools.py

@@ -9,6 +9,7 @@
 import os
 import json
 import re
+from urlparse import urlsplit, urlunsplit
 
 import requests
 
@@ -53,6 +54,11 @@ def getURLChain(targetURL):
         ok = False
     return (ok, chain)
 
+def cleanURL(targetURL):
+    scheme, netloc, path, query, fragment = urlsplit(targetURL)
+    if len(path) == 0:
+        path = '/'
+    return urlunsplit((scheme, netloc, path, query, fragment))
 
 def normalizeURL(targetURL):
     result = None

setup.py

@@ -38,6 +38,13 @@ def extract_metaitem(meta):
         license=extract_metaitem('license'),
         packages=find_packages(exclude=('tests', 'docs')),
         platforms=['Any'],
+        install_requires=[
+            'requests',
+            'beautifulsoup',
+            'mf2py',
+            'html5lib',
+            'lxml',
+        ],
         classifiers=[
             'Development Status :: 4 - Beta',
             'Intended Audience :: Developers',

tests/test_relme.py

@@ -5,91 +5,72 @@
 """
 
 import unittest
-from httmock import urlmatch, HTTMock
+from httmock import all_requests, HTTMock
 
 from ronkyuu import findRelMe, confirmRelMe
+from ronkyuu.tools import cleanURL
 
 
-profile_url  = "https://bear.im"
-redirect_url = "http://code-bear.com"
-twitter_url  = "https://twitter.com/bear"
-other_url    = "https://tantek.com"
+profile_url  = cleanURL("https://bear.im")
+redirect_url = cleanURL("http://code-bear.com")
+twitter_url  = cleanURL("https://twitter.com/bear")
+t_co_url     = cleanURL('https://t.co/ZK4BFjSq66')
+other_url    = cleanURL("https://tantek.com")
 
 profile_html = ''.join(open('./tests/data/relme_bear.html').readlines())
 twitter_html = ''.join(open('./tests/data/relme_twitter_bear.html').readlines())
 other_html   = ''.join(open('./tests/data/relme_tantek.html').readlines())
 
-@urlmatch(netloc=r'https://bear\.im$')
-def bear_im_mock(url, request):
-    return profile_html
-
-@urlmatch(netloc=r'(.*\.)?twitter\.com$')
-def twitter_mock(url, request):
-    return twitter_html
-
-@urlmatch(netloc=r'(.*\.)?tantek\.com$')
-def other_mock(url, request):
+@all_requests
+def _mock(url, request):
+    if 'code-bear.com' in url:
+        return profile_html
+    if 'bear.im' in url:
+        return profile_html
+    if 'twitter.com' in url:
+        return twitter_html
     return other_html
 
 class TestProfileURLParsing(unittest.TestCase):
     def runTest(self):
-        with HTTMock(bear_im_mock):
+        with HTTMock(_mock):
             relme = findRelMe(profile_url)
             assert len(relme['relme']) > 0
-            assert 'https://bear.im' in relme['relme']
+            assert profile_url in relme['relme']
 
 class TestTargetURLParsing(unittest.TestCase):
     def runTest(self):
-        with HTTMock(twitter_mock):
+        with HTTMock(_mock):
             relme = findRelMe(twitter_url)
             assert len(relme['relme']) > 0
-            assert 'https://t.co/ZK4BFjSq66' in relme['relme']
+            assert t_co_url in relme['relme']
 
 class TestConfirmRelMeSimple(unittest.TestCase):
     """Test a relme case where the resource URL directly maps
     to the profile URL's relme list
     """
     def runTest(self):
-        with HTTMock(bear_im_mock):
+        with HTTMock(_mock):
             relmeProfile = findRelMe(profile_url)
-            assert len(relmeProfile['relme']) > 0
-            assert 'https://bear.im' in relmeProfile['relme']
-
-        with HTTMock(twitter_mock):
-            relmeTarget = findRelMe(twitter_url)
-            assert len(relmeTarget['relme']) > 0
-            assert 'https://t.co/ZK4BFjSq66' in relmeTarget['relme']
+            relmeTarget  = findRelMe(twitter_url)
 
-        assert confirmRelMe(profile_url, twitter_url, relmeProfile['relme'], relmeTarget['relme'])
+            assert confirmRelMe(profile_url, twitter_url, relmeProfile['relme'], relmeTarget['relme'])
 
 class TestInvalidRelMeSimple(unittest.TestCase):
     def runTest(self):
-        with HTTMock(bear_im_mock):
+        with HTTMock(_mock):
             relmeProfile = findRelMe(profile_url)
-            assert len(relmeProfile['relme']) > 0
-            assert 'https://bear.im' in relmeProfile['relme']
-
-        with HTTMock(other_mock):
             relmeOtherProfile = findRelMe(other_url)
-            assert len(relmeOtherProfile['relme']) > 0
-            assert 'https://twitter.com/t' in relmeOtherProfile['relme']
-
-        assert not confirmRelMe(profile_url, other_url, relmeProfile['relme'], relmeOtherProfile['relme'])
+            assert not confirmRelMe(profile_url, other_url, relmeProfile['relme'], relmeOtherProfile['relme'])
 
 class TestConfirmRelMeRedirect(unittest.TestCase):
     """Test a relme case where the resource URL in-directly maps
     to the profile URL's relme list because the profile URL itself
     is a redirect.
     """
     def runTest(self):
-        with HTTMock(bear_im_mock):
+        with HTTMock(_mock):
             relmeProfile = findRelMe(redirect_url)
-            assert len(relmeProfile['relme']) > 0
-            assert 'https://bear.im' in relmeProfile['relme']
-
-        with HTTMock(twitter_mock):
-            relmeTarget = findRelMe(twitter_url)
-            assert len(relmeTarget['relme']) > 0
-            assert 'https://t.co/ZK4BFjSq66' in relmeTarget['relme']
+            relmeTarget  = findRelMe(twitter_url)
 
-        assert confirmRelMe(profile_url, twitter_url, relmeProfile['relme'], relmeTarget['relme'])
+            assert confirmRelMe(profile_url, twitter_url, relmeProfile['relme'], relmeTarget['relme'])