Merge branch '21-support--http-methods-for-app-urls' into 'master'

Resolve "Unterstützung von anderen HTTP-Methoden als GET innerhalb einer APP"

Closes #21

See merge request !16

debian/changelog

-python3-sams-classes (1.0.1~1) UNRELEASED; urgency=medium
+python3-sams-classes (1.0.1~2) UNRELEASED; urgency=medium
 
   * fixed issue #20 "Basis-Pfad (/) bei API über Proxy nicht aufrufbar" 
+  * fixed issue #21 "Unterstützung von anderen HTTP-Methoden als GET innerhalb 
+    einer APP"
 
- -- Lobinger <slobinger@justus.zib.de>  Tue, 13 Jun 2017 15:28:43 +0200
+ -- Sebastian Lobinger <sebastian.lobinger@zib.de>  Wed, 14 Jun 2017 08:36:02 +0200
 
 python3-sams-classes (1.0.0) unstable; urgency=medium
 

sams_classes/sams_app.py

@@ -47,7 +47,8 @@ class SAMSApp:
       view_func = SAMSApp._get_attr(self.module, view['function'])
       self.__blueprint.add_url_rule(
         rule = self._generate_url(urlPart = view.get('url')), endpoint = endpoint,
-        view_func = view_func)
+        view_func = view_func,
+        methods = view.get('methods', ['GET', 'HEAD', 'OPTIONS']))
   
   def __add_proxy_urls(self):
     i = 0

test/test_sams_app.py

@@ -60,18 +60,40 @@ class TestSAMSApp(unittest.TestCase):
     manifest = {
       'default_language': 'en'
       , 'views': [
-        {'url': 'test/do_nothing'
-         , 'function': 'views.do_nothing'}
+        {'url': 'test/do_nothing',
+          'function': 'views.do_nothing',
+          'methods': [
+            'GET', 'POST', 'DELETE', 'PUT', 'UPDATE', 'HEAD', 'PATCH',
+            'OPTIONS'
+          ]
+        }, 
+        {'url': 'test/do_nothing_defaults', 'function': 'views.do_nothing'}
       ]
     }
     app = SAMSApp(name = 'test', manifest = manifest
       , langDict = {'en':{}})
     flaskApp = Flask(__name__)
     flaskApp.register_blueprint(app.blueprint)
-    self.assertGreater(len(list(flaskApp.url_map.iter_rules())), 1)
-    client = flaskApp.test_client(self)
-    response = client.get('/test/do_nothing')
-    self.assertIs(response.status_code, 200)
+    with self.subTest('test url_map'):
+      self.assertGreater(len(list(flaskApp.url_map.iter_rules())), 1)
+    thApp = FlaskInThread(flaskApp, host="localhost", port=5000)
+    thApp.start()
+    time.sleep(0.01)
+    for method in manifest['views'][0]['methods']:
+      with self.subTest('do_nothing: ' + method):
+        response = requests.request(
+          method = method, url = 'http://localhost:5000/test/do_nothing')
+        self.assertIs(response.status_code, 200)
+    for method in ('GET', 'HEAD', 'OPTIONS'):
+      # Check that app follows flask 0.6 default behavior for no methods defined
+      with self.subTest('do_nothing_default: ' + method):
+        response = requests.request(
+          method = method,
+          url = 'http://localhost:5000/test/do_nothing_defaults')
+        self.assertIs(response.status_code, 200)  
+    requests.request(
+      method = 'GET', url = 'http://localhost:5000/shutdown')
+    time.sleep(0.01)
 
   def test_app_lang(self):
     """App.lang(language) returns dict with requested language / default."""