Fix #24

HISTORY.rst

@@ -1,3 +1,9 @@
+0.7.1 (2017-??-??)
+------------------
+
+- Return an HTTP 404 response when a conceptscheme could not be found. (#24)
+
+
 0.7.0 (2016-08-11)
 ------------------
 

docs/conf.py

@@ -61,7 +61,7 @@
 # The short X.Y version.
 version = '0.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.0'
+release = '0.7.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyramid_skosprovider/views.py

@@ -220,6 +220,8 @@ def get_concept(self):
         scheme_id = self.request.matchdict['scheme_id']
         concept_id = self.request.matchdict['c_id']
         provider = self.skos_registry.get_provider(scheme_id)
+        if not provider:
+            return HTTPNotFound()
         concept = provider.get_by_id(concept_id)
         if not concept:
             return HTTPNotFound()
@@ -230,6 +232,8 @@ def get_concept_display_children(self):
         scheme_id = self.request.matchdict['scheme_id']
         concept_id = self.request.matchdict['c_id']
         provider = self.skos_registry.get_provider(scheme_id)
+        if not provider:
+            return HTTPNotFound()
         language = self.request.params.get('language', self.request.locale_name)
         children = provider.get_children_display(concept_id, language=language)
         if children is False:
@@ -241,6 +245,8 @@ def get_expand(self):
         scheme_id = self.request.matchdict['scheme_id']
         concept_id = self.request.matchdict['c_id']
         provider = self.skos_registry.get_provider(scheme_id)
+        if not provider:
+            return HTTPNotFound()
         expanded = provider.expand(concept_id)
         if not expanded:
             return HTTPNotFound()

setup.py

@@ -21,7 +21,7 @@
 
 setup(
     name='pyramid_skosprovider',
-    version='0.7.0',
+    version='0.7.1',
     license='MIT',
     description='Integration of skosprovider in pyramid',
     long_description=README + '\n\n' + CHANGES,

tests/test_renderers.py

@@ -25,7 +25,7 @@
 import json
 
 import unittest
-from mock import Mock
+from unittest.mock import Mock
 
 
 class TestRenderers(unittest.TestCase):

tests/test_utils.py

@@ -25,7 +25,7 @@
 import json
 
 import unittest
-from mock import Mock
+from unittest.mock import Mock
 
 class TestQueryBuilder:
 

tests/test_views.py

@@ -426,6 +426,16 @@ def test_get_unexsisting_concept(self):
         concept = pv.get_concept()
         self.assertIsInstance(concept, HTTPNotFound)
 
+    def test_get_concept_unexisting_conceptscheme(self):
+        request = self._get_dummy_request()
+        request.matchdict = {
+            'scheme_id': 'PARROTS',
+            'c_id': 1
+        }
+        pv = self._get_provider_view(request)
+        concept = pv.get_concept()
+        self.assertIsInstance(concept, HTTPNotFound)
+
     def test_get_concept_display_children(self):
         request = self._get_dummy_request()
         request.matchdict = {
@@ -473,6 +483,16 @@ def test_get_unexsisting_concept_display_children(self):
         concept = pv.get_concept_display_children()
         self.assertIsInstance(concept, HTTPNotFound)
 
+    def test_get_concept_display_children_unexisting_conceptscheme(self):
+        request = self._get_dummy_request()
+        request.matchdict = {
+            'scheme_id': 'PARROTS',
+            'c_id': 1
+        }
+        pv = self._get_provider_view(request)
+        concept = pv.get_concept_display_children()
+        self.assertIsInstance(concept, HTTPNotFound)
+
     def test_get_concept_expand(self):
         request = self._get_dummy_request()
         request.matchdict = {
@@ -507,13 +527,23 @@ def test_get_expand_no_resource(self):
         expanded = pv.get_expand()
         self.assertIsInstance(expanded, HTTPNotFound)
 
-    def test_get_top_concepts_unexisting_conceptscheme(self):
+    def test_get_expand_unexisting_conceptscheme(self):
         request = self._get_dummy_request()
         request.matchdict = {'scheme_id': 'PARROTS'}
         pv = self._get_provider_view(request)
         tc = pv.get_conceptscheme_top_concepts()
         self.assertIsInstance(tc, HTTPNotFound)
 
+    def test_get_top_concepts_unexisting_conceptscheme(self):
+        request = self._get_dummy_request()
+        request.matchdict = {
+            'scheme_id': 'PARROTS',
+            'c_id': 1
+        }
+        pv = self._get_provider_view(request)
+        expanded = pv.get_expand()
+        self.assertIsInstance(expanded, HTTPNotFound)
+
     def test_get_top_concepts(self):
         request = self._get_dummy_request()
         request.matchdict = {'scheme_id': 'TREES'}

tox.ini

@@ -4,7 +4,7 @@ envlist = py27,py33,py34,py35,cover
 [testenv]
 commands = 
 	python setup.py develop
-	pip install -r requirements.txt # Fix versions
+	pip install -r requirements-dev.txt # Fix versions
 	py.test
 deps =
 	pytest
@@ -15,7 +15,7 @@ basepython =
 	python2.7
 commands = 
 	python setup.py develop
-	pip install -r requirements.txt # Fix versions
+	pip install -r requirements-dev.txt # Fix versions
 	py.test --cov pyramid_skosprovider --cov-report term-missing tests
 deps =
 	webtest