Add tests for the added resources

Added a couple of tests to make sure the newly added resources are
considered valid. While doing so did a minor refactor.

Author: Teun Zengerink

tests.py

@@ -1,3 +1,4 @@
+import logging
 import sys
 import unittest
 import usabilla as ub
@@ -6,10 +7,9 @@
 from unittest import TestCase, main as unittest_main
 
 
-import logging
-
 logging.basicConfig(level=logging.DEBUG)
 
+
 class TestCredentials(TestCase):
 
     def setUp(self):
@@ -66,18 +66,15 @@ def test_client_constants(self):
         self.assertEqual(self.client.host_protocol, 'https://')
         self.assertEqual('',self.client.query_parameters)
 
-
     def test_sign_key(self):
         signed_key = self.client.sign(self.secret_key.encode('utf-8'), 'usbl1_request'.encode('utf-8'))
         self.assertEqual(signed_key,  b"&-\x88\x80Z9\xe8Pnvx\xe4S\xeeZ\x9fG\xc5\xf7g\x11|\xc1\xaa~q(\xef\xaf\x95\xc0\xac")
 
-
     def test_get_signature_key(self):
         datestamp = '20150115'
         signing_key = self.client.get_signature_key(self.secret_key, datestamp)
         self.assertEqual(signing_key, b"\x15\x8d\xd7U\xceG\xdeH\x8aHwU\xf5qg\xae\xd4Z\x19`\xedM\x80\x87\x97V\xbf\xe9pw\xaa\xae")
 
-
     def test_query_parameters(self):
         params = {'limit': 1}
         self.client.set_query_parameters(params)
@@ -88,12 +85,32 @@ def test_query_parameters(self):
 
     def test_check_resource_validity(self):
         with self.assertRaises(ub.GeneralError):
-            self.client.check_resource_validity('nonexisting', 'nonexisting', 'nonexisting')
+            self.client.check_resource_validity(
+                'nonexisting',
+                'nonexisting',
+                'nonexisting')
         with self.assertRaises(ub.GeneralError):
-            self.client.check_resource_validity('live', 'nonexisting', 'nonexisting')
+            self.client.check_resource_validity(
+                'live',
+                'nonexisting',
+                'nonexisting')
         with self.assertRaises(ub.GeneralError):
-            self.client.check_resource_validity('live', 'websites', 'nonexisting')
-        self.assertEqual(self.client.check_resource_validity('live', 'websites', 'button'), '/live/websites/button')
+            self.client.check_resource_validity(
+                'live',
+                'websites',
+                'nonexisting')
+        self.assertEqual(
+            self.client.check_resource_validity('live', 'websites', 'button'),
+            '/live/websites/button')
+        self.assertEqual(
+            self.client.check_resource_validity('live', 'apps', 'campaign'),
+            '/live/apps/campaign')
+        self.assertEqual(
+            self.client.check_resource_validity(
+                'live',
+                'apps',
+                'campaign_result'),
+            '/live/apps/campaign/:id/results')
 
     def test_handle_id(self):
         url = '/live/websites/button/:id/feedback'

usabilla.py

@@ -239,7 +239,6 @@ def send_signed_request(self, scope):
         request_url = self.host + scope + '?' + canonical_querystring
         r = requests.get(self.host_protocol + request_url, headers=headers)
 
-
         if r.status_code != 200:
             return r
         else:
@@ -262,14 +261,15 @@ def check_resource_validity(self, scope, product, resource):
         """
         if scope not in self.resources['scopes'].keys():
             raise GeneralError('invalid scope', 'Invalid scope name')
-        if product not in self.resources['scopes'][scope]['products'].keys():
+        found_scope = self.resources['scopes'][scope]
+        if product not in found_scope['products'].keys():
             raise GeneralError('invalid product', 'Invalid product name')
-        if resource not in self.resources['scopes'][scope]['products'][product]['resources'].keys():
+        found_product = found_scope['products'][product]
+        if resource not in found_product['resources'].keys():
             raise GeneralError('invalid resource', 'Invalid resource name')
+        found_resource = found_product['resources'][resource]
 
-        url = '/' + scope + '/' + product + self.resources['scopes'][scope]['products'][product]['resources'][resource]
-
-        return url
+        return '/%s/%s%s' % (scope, product, found_resource)
 
     def handle_id(self, url, resource_id):
         """Replaces the :id pattern in the url