Fixed requested changes

viaduct-ai · Nov 26, 2019 · 757f34e · 757f34e
1 parent 30e2f2c
commit 757f34e
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 78 deletions.
diff --git a/Pipfile b/Pipfile
@@ -20,7 +20,7 @@ psycopg2 = ">=2.6.1"
 requests = ">=2.7.0"
 six = ">=1.9.0"
 notebook = {extras = ["test"],version = ">=4.0"}
-hybrid-content-manager = {editable = true,extras = ["test"],path = "."}
+hybridcontents = {editable = true,extras = ["test"],path = "."}
 
 [requires]
 python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/hybrid_content_manager/__init__.py → hybridcontents/__init__.py b/hybrid_content_manager/__init__.py → hybridcontents/__init__.py
diff --git a/hybrid_content_manager/api_utils.py → hybridcontents/api_utils.py b/hybrid_content_manager/api_utils.py → hybridcontents/api_utils.py
diff --git a/hybrid_content_manager/hybridmanager.py → hybridcontents/hybridmanager.py b/hybrid_content_manager/hybridmanager.py → hybridcontents/hybridmanager.py
@@ -195,18 +195,11 @@ def _validate_path(self, prefix, path):
 
         path_is_valid = validator(path)
 
-        # Ensure return type is bool
-        if type(path_is_valid) is not bool:
-            raise HTTPError(
-                400,
-                "The provided path_validator for the prefix '{prefix}' does not return a boolean"
-                .format(prefix=prefix, path=path))
-
         if not path_is_valid:
             raise HTTPError(
-                401,
-                "The provided path_validator for the prefix '{prefix}' has flagged the path '{path}' as invalid."
-                .format(prefix=prefix, path=path))
+                405,
+                "The path '{path}' is not valid for the prefix '{prefix}'".
+                format(path=path, prefix=prefix))
 
         return path_is_valid
 

diff --git a/hybrid_content_manager/ipycompat.py → hybridcontents/ipycompat.py b/hybrid_content_manager/ipycompat.py → hybridcontents/ipycompat.py
diff --git a/hybrid_content_manager/tests/__init__.py → hybridcontents/tests/__init__.py b/hybrid_content_manager/tests/__init__.py → hybridcontents/tests/__init__.py
diff --git a/...tent_manager/tests/test_hybrid_manager.py → hybridcontents/tests/test_hybrid_manager.py b/...tent_manager/tests/test_hybrid_manager.py → hybridcontents/tests/test_hybrid_manager.py
@@ -21,7 +21,7 @@
 
 from IPython.utils.tempdir import TemporaryDirectory
 
-from hybrid_content_manager.hybridmanager import HybridContentsManager
+from hybridcontents.hybridmanager import HybridContentsManager
 
 from .testing_utils import assertRaisesHTTPError
 
@@ -323,13 +323,13 @@ def test_rename_invalid_path(self):
         old_path = 'Untitled.yaml'
         new_path = 'A/Untitled.yaml'
 
-        with assertRaisesHTTPError(self, 401):
+        with assertRaisesHTTPError(self, 405):
             cm.rename(old_path, new_path)
 
     def test_save_invalid_path(self):
         cm = self.contents_manager
 
-        with assertRaisesHTTPError(self, 401):
+        with assertRaisesHTTPError(self, 405):
             cm.new_untitled(path='A', ext='.yaml')
 
     def tearDown(self):

diff --git a/...id_content_manager/tests/testing_utils.py → hybridcontents/tests/testing_utils.py b/...id_content_manager/tests/testing_utils.py → hybridcontents/tests/testing_utils.py
diff --git a/setup.py b/setup.py
@@ -21,13 +21,13 @@ def main():
     test_reqs = read_requirements('requirements_test.txt')
 
     setup(
-        name='hybrid-content-manager',
+        name='hybridcontents',
         version='0.6',
         description="Hybrid Content Manager",
         long_description=long_description,
         author="viaduct.ai",
         author_email="[email protected]",
-        packages=find_packages(include='hybrid_content_manager.*'),
+        packages=find_packages(include='hybridcontents.*'),
         license='Apache 2.0',
         include_package_data=True,
         zip_safe=True,

diff --git a/tox.ini b/tox.ini
@@ -16,4 +16,4 @@ deps =
     py{27,36,37}-notebook{4,5,6}: .[test]
 
 commands =
-    py{27,36,37}-notebook{4,5,6}: pytest hybrid_content_manager/tests
+    py{27,36,37}-notebook{4,5,6}: pytest hybridcontents/tests