cherrypy-foundation 1.0.0a11__tar.gz → 1.0.0a12__tar.gz

{cherrypy_foundation-1.0.0a11/src/cherrypy_foundation.egg-info → cherrypy_foundation-1.0.0a12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a11
+Version: 1.0.0a12
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3

{cherrypy_foundation-1.0.0a11 → cherrypy_foundation-1.0.0a12}/src/cherrypy_foundation/plugins/ldap.py

@@ -63,7 +63,7 @@ def first_attribute(attributes, keys, default=None):
             value = attributes[attr]
             if isinstance(value, list):
                 if len(value) == 0:
-                    pass
+                    continue
                 return value[0]
             else:
                 return value

{cherrypy_foundation-1.0.0a11 → cherrypy_foundation-1.0.0a12}/src/cherrypy_foundation/plugins/tests/test_ldap.py

@@ -19,13 +19,13 @@ Created on Oct 17, 2015
 @author: Patrik Dufresne <patrik@ikus-soft.com>
 """
 import os
-from unittest import mock, skipUnless
+from unittest import TestCase, mock, skipUnless
 
 import cherrypy
 import ldap3
 from cherrypy.test import helper
 
-from .. import ldap  # noqa
+from ..ldap import all_attribute, first_attribute  # noqa
 
 original_connection = ldap3.Connection
 
@@ -35,6 +35,79 @@ def mock_ldap_connection(*args, **kwargs):
     return original_connection(*args, client_strategy=ldap3.MOCK_ASYNC, **kwargs)
 
 
+class LdapFirstAttributeTest(TestCase):
+
+    def test_no_keys_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(first_attribute(attributes, None))
+        self.assertEqual(first_attribute(attributes, [], default="fallback"), "fallback")
+
+    def test_single_key_with_scalar_value(self):
+        attributes = {"uid": "jdoe"}
+        self.assertEqual(first_attribute(attributes, "uid"), "jdoe")
+
+    def test_single_key_with_list_value(self):
+        attributes = {"mail": ["john@example.com", "alt@example.com"]}
+        self.assertEqual(first_attribute(attributes, "mail"), "john@example.com")
+
+    def test_empty_list_value_is_skipped(self):
+        attributes = {
+            "mail": [],
+            "uid": ["jdoe"],
+        }
+        self.assertEqual(first_attribute(attributes, ["mail", "uid"]), "jdoe")
+
+    def test_missing_first_key_uses_next_key(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(first_attribute(attributes, ["sn", "cn"]), "John Doe")
+
+    def test_all_keys_missing_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(first_attribute(attributes, ["sn", "uid"], default="unknown"), "unknown")
+
+    def test_key_not_found_without_default_returns_none(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(first_attribute(attributes, "uid"))
+
+
+class LdapAllAttributeTest(TestCase):
+
+    def test_no_keys_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(all_attribute(attributes, None))
+        self.assertEqual(all_attribute(attributes, [], default="fallback"), "fallback")
+
+    def test_single_key_with_scalar_value(self):
+        attributes = {"uid": "jdoe"}
+        self.assertEqual(all_attribute(attributes, "uid"), ["jdoe"])
+
+    def test_single_key_with_list_value(self):
+        attributes = {"mail": ["john@example.com", "alt@example.com"]}
+        self.assertEqual(all_attribute(attributes, "mail"), ["john@example.com"])
+
+    def test_multiple_keys_collect_values(self):
+        attributes = {
+            "uid": "jdoe",
+            "cn": ["John Doe"],
+        }
+        self.assertEqual(all_attribute(attributes, ["uid", "cn"]), ["jdoe", "John Doe"])
+
+    def test_missing_keys_are_skipped(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(all_attribute(attributes, ["sn", "cn", "uid"]), ["John Doe"])
+
+    def test_all_keys_missing_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(all_attribute(attributes, ["sn", "uid"], default=[]), [])
+
+    def test_empty_list_value_is_appended_as_empty_list(self):
+        attributes = {
+            "mail": [],
+            "uid": "jdoe",
+        }
+        self.assertEqual(all_attribute(attributes, ["mail", "uid"]), [[], "jdoe"])
+
+
 class LdapPluginTest(helper.CPWebCase):
 
     @classmethod

{cherrypy_foundation-1.0.0a11 → cherrypy_foundation-1.0.0a12/src/cherrypy_foundation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a11
+Version: 1.0.0a12
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3