python-ubercode-utils 2.0.4__tar.gz → 2.0.6__tar.gz

{python_ubercode_utils-2.0.4 → python_ubercode_utils-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_ubercode_utils
-Version: 2.0.4
+Version: 2.0.6
 Summary: Core python utilities for all apps
 Home-page: https://github.com/sstacha/python-ubercode-utils
 Author: Steve Stacha

{python_ubercode_utils-2.0.4 → python_ubercode_utils-2.0.6}/python_ubercode_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ubercode-utils
-Version: 2.0.4
+Version: 2.0.6
 Summary: Core python utilities for all apps
 Home-page: https://github.com/sstacha/python-ubercode-utils
 Author: Steve Stacha

{python_ubercode_utils-2.0.4 → python_ubercode_utils-2.0.6}/setup.py

@@ -4,7 +4,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setuptools.setup(name='python_ubercode_utils',
-      version='2.0.4',
+      version='2.0.6',
       description='Core python utilities for all apps',
       long_description=long_description,
       long_description_content_type="text/markdown",

{python_ubercode_utils-2.0.4 → python_ubercode_utils-2.0.6}/test/test_environment.py

@@ -109,6 +109,13 @@ class TestEnvironment(unittest.TestCase):
         self.assertTrue("Test_************sword" in sout.getvalue())
         # test a None still works for initialization
         self.assertIsNotNone(Environment())
+        # bug: test that a missing db gets created instead of failing (threw key error before)
+        os_vars = {
+            'DATABASES__booger__ENGINE': 'django.db.backends.mysql'
+        }
+        env2 = Environment(environment_variable_map=os_vars)
+        self.assertIsNotNone(env2.override_database_variables(DATABASES))
+
 
     def test_override_database_urls(self):
         # we will start with the default dict for a new django install

{python_ubercode_utils-2.0.4 → python_ubercode_utils-2.0.6}/test/test_urls.py

@@ -1,6 +1,4 @@
 import unittest
-from contextlib import redirect_stdout
-from io import StringIO
 
 from ubercode.utils.urls import ParsedUrl
 from ubercode.utils.urls import ParsedQueryString
@@ -90,6 +88,21 @@ class TestUrls(unittest.TestCase):
         # test encoded @ for password since that could be needed
         dj_db_url = DjUrl(':asfcasdf23%401:/!?--atencoded')
         self.assertEqual(dj_db_url.password, 'asfcasdf23@1:/!')
+        # test that we can pass a dict of database properties and have it fill in
+        default = {
+            'ENGINE': 'django.db.backends.mysql',
+            'HOST': 'localhost',
+            'USER': 'scott',
+            'PASSWORD': 'tiger',
+            'PORT': '3306',
+            'NAME': 'test'
+        }
+        dj_db_url = DjUrl().from_dict(default)
+        self.assertEqual(str(dj_db_url), 'django.db.backends.mysql://scott:t***r@localhost:3306/test')
+        # test that to_dict ignores None values so we only have overrides
+        dj_db_url = DjUrl(':testoverridepasswordonly')
+        override_dict = dj_db_url.to_dict()
+        self.assertEqual(str(override_dict), "{'PASSWORD': 'testoverridepasswordonly'}")
 
     # --- basic retrieval
     # -------------------

{python_ubercode_utils-2.0.4 → python_ubercode_utils-2.0.6}/ubercode/utils/environment.py

@@ -199,7 +199,7 @@ class Environment:
                     _log_from_value = 'None'
                     _log_to_value = str(v)
                     # we may be setting up a completely new database from scratch so create if it doesn't exist
-                    if not db_dict[db_parts[1]]:
+                    if not db_dict.get(db_parts[1]):
                         self._logger.debug(f'database {db_parts[0]}[{db_parts[1]}] was not found; creating...')
                         db_dict[db_parts[1]] = {}
                     # we now have db dict; we may not have a property already defined; if not we want to add it

{python_ubercode_utils-2.0.4 → python_ubercode_utils-2.0.6}/ubercode/utils/urls.py

@@ -290,10 +290,34 @@ class DjUrl:
         elif len(hoststr) > 0:
             self.host = hoststr
 
+#
+    def from_dict(self, properties_dict: dict):
+        """
+        overrides instance properties with dictionary values
+        NOTE: rule is that we expect the instance propery to be attribute uppercased
+        EX: self.name = properties_dict[self.name.upper()]
+
+        :param properties_dict: dictionary values
+        :return: this instance for chaining. ex: x = DjUrl().from_dict({"ENGINE": "test"})
+        """
+        if isinstance(properties_dict, dict):
+            for attr, value in vars(DjUrl).items():
+                if not attr.startswith('__') and not callable(value) and not attr.startswith('_'):
+                    setattr(self, attr, properties_dict.get(attr.upper(), value))
+        return self
+
     def to_dict(self) -> dict:
+        """
+        converts instance properties to dictionary values
+        NOTE: does not convert None values
+
+        :return: dict of values in upper case for replacement in django databases settings
+        """
         dct = {}
-        for attr, value in vars(self).items():
-            dct[attr.upper()] = value
+        for attr, value in vars(DjUrl).items():
+            if not attr.startswith('__') and not callable(value) and not attr.startswith('_'):
+                if getattr(self, attr) is not None:
+                    dct[attr.upper()] = getattr(self, attr)
         return dct
 
     def __str__(self) -> str: