Merge branch 'master' into pydal-pip

Conflicts: gluon/__init__.py gluon/dal/_load.py gluon/dal/adapters/base.py gluon/dal/adapters/google.py gluon/dal/adapters/postgres.py gluon/dal/adapters/teradata.py gluon/dal/base.py gluon/dal/objects.py gluon/tests/__init__.py gluon/tests/test_dal_nosql.py
2015-01-17 13:32:06 +01:00
parent 21cb35d4ca 5bc5d0496e
commit 4b337c3e2c
55 changed files with 2715 additions and 1907 deletions
@@ -17,6 +17,7 @@ from test_utils import *
 from test_contribs import *
 from test_web import *
 from test_dal import *
+from test_tools import *

 if sys.version[:3] == '2.7':
    from test_old_doctests import *
@@ -27,4 +27,4 @@ def fix_sys_path(current_path):
             os.path.abspath(os.path.join(path, 'site-packages')),
             os.path.abspath(os.path.join(path, 'gluon')),
             '']
-    [add_path_first(path) for path in paths]
+    [add_path_first(path) for path in paths]
@@ -37,7 +37,6 @@ class TestCache(unittest.TestCase):
    def testCacheInRam(self):

        # defaults to mode='http'
-
        cache = CacheInRam()
        self.assertEqual(cache('a', lambda: 1, 0), 1)
        self.assertEqual(cache('a', lambda: 2, 100), 1)
@@ -66,7 +65,6 @@ class TestCache(unittest.TestCase):
    def testCacheOnDisk(self):

        # defaults to mode='http'
-
        s = Storage({'application': 'admin',
                     'folder': 'applications/admin'})
        cache = CacheOnDisk(s)
@@ -102,8 +100,14 @@ class TestCache(unittest.TestCase):
        self.assertEqual(prefix('a', lambda: 2, 100), 1)
        self.assertEqual(cache.ram('prefixa', lambda: 2, 100), 1)

-
-
+    def testRegex(self):
+        cache = CacheInRam()
+        self.assertEqual(cache('a1', lambda: 1, 0), 1)
+        self.assertEqual(cache('a2', lambda: 2, 100), 2)
+        cache.clear(regex=r'a*')
+        self.assertEqual(cache('a1', lambda: 2, 0), 2)
+        self.assertEqual(cache('a2', lambda: 3, 100), 3)
+        return

 if __name__ == '__main__':
    setUpModule()       # pre-python-2.7
@@ -4,14 +4,24 @@
 """ Unit tests for contribs """

 import unittest
+import os
 from fix_path import fix_sys_path

 fix_sys_path(__file__)

+from gluon.storage import Storage
+import gluon.contrib.fpdf as fpdf
+import gluon.contrib.pyfpdf as pyfpdf
+from gluon.contrib.appconfig import AppConfig

-from utils import md5_hash
-import contrib.fpdf as fpdf
-import contrib.pyfpdf as pyfpdf
+
+def setUpModule():
+    pass
+
+
+def tearDownModule():
+    if os.path.isfile('appconfig.json'):
+        os.unlink('appconfig.json')


 class TestContribs(unittest.TestCase):
@@ -35,6 +45,28 @@ class TestContribs(unittest.TestCase):
        self.assertTrue(fpdf.FPDF_VERSION in pdf_out, 'version string')
        self.assertTrue('hello world' in pdf_out, 'sample message')

+    def test_appconfig(self):
+        """
+        Test for the appconfig module
+        """
+        from gluon import current
+        s = Storage({'application': 'admin',
+                     'folder': 'applications/admin'})
+        current.request = s
+        simple_config = '{"config1" : "abc", "config2" : "bcd", "config3" : { "key1" : 1, "key2" : 2} }'
+        with open('appconfig.json', 'w') as g:
+            g.write(simple_config)
+        myappconfig = AppConfig('appconfig.json')
+        self.assertEqual(myappconfig['config1'], 'abc')
+        self.assertEqual(myappconfig['config2'], 'bcd')
+        self.assertEqual(myappconfig.take('config1'), 'abc')
+        self.assertEqual(myappconfig.take('config3.key1', cast=str), '1')
+        # once parsed, can't be casted to other types
+        self.assertEqual(myappconfig.take('config3.key1', cast=int), '1')
+
+        self.assertEqual(myappconfig.take('config3.key2'), 2)
+
+        current.request = {}

 if __name__ == '__main__':
    unittest.main()
@@ -131,7 +131,7 @@ class TestRouter(unittest.TestCase):
            'http://domain.com/abc/def'), "/init/default/abc ['def']")
        self.assertEqual(filter_url(
            'http://domain.com/index/a%20bc'), "/init/default/index ['a bc']")
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to/static" % root))
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
        try:
@@ -195,7 +195,7 @@ class TestRouter(unittest.TestCase):
                         norm_root('%s/applications/welcome/static/favicon.ico' % root))
        self.assertEqual(filter_url('http://domain.com/static/abc'),
                         norm_root('%s/applications/welcome/static/abc' % root))
-        self.assertEqual(filter_url('http://domain.com/static/path/to/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/static/path/to/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to/static" % root))
        # outgoing
        self.assertEqual(filter_url(
@@ -1086,13 +1086,13 @@ class TestRouter(unittest.TestCase):
                        norm_root("%s/applications/admin/static/file" % root))
        self.assertEqual(filter_url('http://domain.com/en/static/file'),
                        norm_root("%s/applications/admin/static/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'),
                        norm_root("%s/applications/examples/static/en/file" % root))
        self.assertEqual(filter_url('http://domain.com/examples/static/file'),
                         norm_root("%s/applications/examples/static/en/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'),
                        norm_root("%s/applications/examples/static/it/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'),
                        norm_root("%s/applications/examples/static/file" % root))

        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
@@ -1188,19 +1188,19 @@ class TestRouter(unittest.TestCase):
                         norm_root("%s/applications/admin/static/file" % root))
        self.assertEqual(filter_url('http://domain.com/en/static/file'),
                         norm_root("%s/applications/admin/static/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'),
                        norm_root("%s/applications/examples/static/en/file" % root))
        self.assertEqual(filter_url('http://domain.com/examples/static/file'),
                        norm_root("%s/applications/examples/static/en/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'),
                        norm_root("%s/applications/examples/static/it/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'),
                        norm_root("%s/applications/examples/static/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/static/en/file').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/examples/static/en/file').replace('/', os.sep),
                        norm_root("%s/applications/examples/static/en/file" % root))
        self.assertEqual(filter_url('http://domain.com/examples/static/it/file').replace('/', os.sep),
                        norm_root("%s/applications/examples/static/it/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/static/it-it/file').replace('/', os.sep),  
+        self.assertEqual(filter_url('http://domain.com/examples/static/it-it/file').replace('/', os.sep),
                        norm_root("%s/applications/examples/static/it-it/file" % root))

    def test_router_get_effective(self):
@@ -1267,14 +1267,14 @@ class TestRouter(unittest.TestCase):

        '''
        load(rdict=dict())
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to/static" % root))
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/==to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/-+=@$%%/static" % root))
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/.static')
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/s..tatic')
@@ -1287,7 +1287,7 @@ class TestRouter(unittest.TestCase):
            ),
        )
        load(rdict=router_static)
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to/#static" % root))

        router_static = dict(
@@ -1296,23 +1296,23 @@ class TestRouter(unittest.TestCase):
            ),
        )
        load(rdict=router_static)
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to/static" % root))
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep),  
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/==to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/-+=@$%%/static" % root))
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to//static')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to/#static" % root))
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/./static')
        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/../static')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/.../static').replace('/', os.sep),  
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/.../static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/.../static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/.static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/.static').replace('/', os.sep),
            norm_root("%s/applications/welcome/static/path/to/.static" % root))

    def test_router_args(self):
@@ -108,7 +108,7 @@ class TestRoutes(unittest.TestCase):
            'http://domain.com/abc/def/ghi/jkl'), "/abc/def/ghi ['jkl']")
        self.assertEqual(filter_url(
            'http://domain.com/abc/def/ghi/j%20kl'), "/abc/def/ghi ['j_kl']")
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static'), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static'),
            norm_root("%s/applications/welcome/static/path/to/static" % root))
        # no more necessary since explcit check for directory traversal attacks
        """
@@ -174,7 +174,7 @@ default_application = 'defapp'
        self.assertEqual(filter_url('http://domain.com/welcome/default/index/abc'), "/welcome/default/index ['abc']")
        self.assertEqual(filter_url('http://domain.com/welcome/static/abc'),
                         norm_root('%s/applications/welcome/static/abc' % root))
-        self.assertEqual(filter_url('http://domain.com/defapp/static/path/to/static'), 
+        self.assertEqual(filter_url('http://domain.com/defapp/static/path/to/static'),
            norm_root("%s/applications/defapp/static/path/to/static" % root))

    def test_routes_raise(self):
@@ -0,0 +1,83 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+    Unit tests for gluon.tools
+"""
+import os
+import sys
+if sys.version < "2.7":
+    import unittest2 as unittest
+else:
+    import unittest
+
+from fix_path import fix_sys_path
+
+fix_sys_path(__file__)
+
+DEFAULT_URI = os.getenv('DB', 'sqlite:memory')
+
+from gluon.dal import DAL, Field
+from dal.objects import Table
+from tools import Auth
+from gluon.globals import Request, Response, Session
+from storage import Storage
+from languages import translator
+from gluon.http import HTTP
+
+python_version = sys.version[:3]
+IS_IMAP = "imap" in DEFAULT_URI
+
+@unittest.skipIf(IS_IMAP, "TODO: Imap raises 'Connection refused'")
+class testAuth(unittest.TestCase):
+
+    def testRun(self):
+        # setup
+        request = Request(env={})
+        request.application = 'a'
+        request.controller = 'c'
+        request.function = 'f'
+        request.folder = 'applications/admin'
+        response = Response()
+        session = Session()
+        T = translator('', 'en')
+        session.connect(request, response)
+        from gluon.globals import current
+        current.request = request
+        current.response = response
+        current.session = session
+        current.T = T
+        db = DAL(DEFAULT_URI, check_reserved=['all'])
+        auth = Auth(db)
+        auth.define_tables(username=True, signature=False)
+        self.assertTrue('auth_user' in db)
+        self.assertTrue('auth_group' in db)
+        self.assertTrue('auth_membership' in db)
+        self.assertTrue('auth_permission' in db)
+        self.assertTrue('auth_event' in db)
+        db.define_table('t0', Field('tt'), auth.signature)
+        auth.enable_record_versioning(db)
+        self.assertTrue('t0_archive' in db)
+        for f in ['login', 'register', 'retrieve_password',
+                  'retrieve_username']:
+            html_form = getattr(auth, f)().xml()
+            self.assertTrue('name="_formkey"' in html_form)
+
+        for f in ['logout', 'verify_email', 'reset_password',
+                  'change_password', 'profile', 'groups']:
+            self.assertRaisesRegexp(HTTP, "303*", getattr(auth, f))
+
+        self.assertRaisesRegexp(HTTP, "401*", auth.impersonate)
+
+        try:
+            for t in ['t0_archive', 't0', 'auth_cas', 'auth_event',
+                      'auth_membership', 'auth_permission', 'auth_group',
+                      'auth_user']:
+                db[t].drop()
+        except SyntaxError as e:
+            # GAE doesn't support drop
+            pass
+        return
+
+if __name__ == '__main__':
+    unittest.main()