Migrated to Vagrant 2.0.2

Author: rofrano

Vagrantfile

@@ -1,10 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
+# This file requires Vagrant 2.0.2 or later
 Vagrant.configure(2) do |config|
   # The most common configuration options are documented and commented below.
   # For a complete reference, please see the online documentation at
@@ -15,7 +12,7 @@ Vagrant.configure(2) do |config|
 
   # Windows users need to change the permissions explicitly so that Windows doesn't
   # set the execute bit on all of your files which messes with GitHub users on Mac and Linux
-  config.vm.synced_folder "./", "/vagrant", owner: "ubuntu", mount_options: ["dmode=755,fmode=644"]
+  config.vm.synced_folder "./", "/vagrant", owner: "vagrant", mount_options: ["dmode=755,fmode=644"]
 
   # Example for VirtualBox:
   config.vm.provider "virtualbox" do |vb|
@@ -43,7 +40,7 @@ Vagrant.configure(2) do |config|
     apt-get -y autoremove
     pip install --upgrade pip
     # Make vi look nice
-    sudo -H -u ubuntu echo "colorscheme desert" > ~/.vimrc
+    sudo -H -u vagrant echo "colorscheme desert" > ~/.vimrc
     # Install app dependencies
     echo "\n******************************"
     echo " Installing App Dependencies"
@@ -58,7 +55,7 @@ Vagrant.configure(2) do |config|
   config.vm.provision "shell", inline: <<-SHELL
     # Prepare Redis data share
     sudo mkdir -p /var/lib/redis/data
-    sudo chown ubuntu:ubuntu /var/lib/redis/data
+    sudo chown vagrant:vagrant /var/lib/redis/data
   SHELL
 
   # Add Redis docker container

server.py

@@ -30,6 +30,7 @@
 import os
 import sys
 import logging
+from functools import wraps
 from flask import Flask, jsonify, request, url_for, make_response, abort
 from models import Pet, DataValidationError
 
@@ -93,6 +94,25 @@ def internal_server_error(error):
     app.logger.info(message)
     return jsonify(status=500, error='Internal Server Error', message=message), 500
 
+######################################################################
+# DECORATORS
+######################################################################
+def requires_content_type(*content_types):
+    """ Use this decorator to check content type """
+    def decorator(func):
+        """ Inner decorator """
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            """ Checks that the content type is correct """
+            for content_type in content_types:
+                if request.headers['Content-Type'] == content_type:
+                    return func(*args, **kwargs)
+
+            app.logger.error('Invalid Content-Type: %s', request.headers['Content-Type'])
+            abort(HTTP_415_UNSUPPORTED_MEDIA_TYPE,
+                  'Content-Type must be {}'.format(content_types))
+        return wrapper
+    return decorator
 
 ######################################################################
 # GET INDEX
@@ -143,14 +163,14 @@ def get_pets(pet_id):
 # ADD A NEW PET
 ######################################################################
 @app.route('/pets', methods=['POST'])
+@requires_content_type('application/json', 'application/x-www-form-urlencoded')
 def create_pets():
     """
     Creates a Pet
 
     This endpoint will create a Pet based the data in the body that is posted
     or data that is sent via an html form post.
     """
-    check_content_type('application/json')
     data = {}
     # Check for form submission data
     if request.headers.get('Content-Type') == 'application/x-www-form-urlencoded':
@@ -174,13 +194,13 @@ def create_pets():
 # UPDATE AN EXISTING PET
 ######################################################################
 @app.route('/pets/<int:pet_id>', methods=['PUT'])
+@requires_content_type('application/json')
 def update_pets(pet_id):
     """
     Update a Pet
 
     This endpoint will update a Pet based the body that is posted
     """
-    check_content_type('application/json')
     pet = Pet.find(pet_id)
     if not pet:
         abort(HTTP_404_NOT_FOUND, "Pet with id '{}' was not found.".format(pet_id))
@@ -240,12 +260,12 @@ def data_reset():
     """ Removes all Pets from the database """
     Pet.remove_all()
 
-def check_content_type(content_type):
-    """ Checks that the media type is correct """
-    if request.headers['Content-Type'] == content_type:
-        return
-    app.logger.error('Invalid Content-Type: %s', request.headers['Content-Type'])
-    abort(HTTP_415_UNSUPPORTED_MEDIA_TYPE, 'Content-Type must be {}'.format(content_type))
+# def check_content_type(content_type):
+#     """ Checks that the media type is correct """
+#     if request.headers['Content-Type'] == content_type:
+#         return
+#     app.logger.error('Invalid Content-Type: %s', request.headers['Content-Type'])
+#     abort(HTTP_415_UNSUPPORTED_MEDIA_TYPE, 'Content-Type must be {}'.format(content_type))
 
 # @app.before_first_request
 def initialize_logging(log_level=logging.INFO):