diff --git a/__pycache__/templates.cpython-36.pyc b/__pycache__/templates.cpython-36.pyc new file mode 100644 index 0000000..4575ec3 Binary files /dev/null and b/__pycache__/templates.cpython-36.pyc differ diff --git a/calculator.py b/calculator.py index a46affd..ab1007d 100644 --- a/calculator.py +++ b/calculator.py @@ -1,84 +1,103 @@ -""" -For your homework this week, you'll be creating a wsgi application of -your own. -You'll create an online calculator that can perform several operations. +import traceback +from templates import Template -You'll need to support: - - * Addition - * Subtractions - * Multiplication - * Division - -Your users should be able to send appropriate requests and get back -proper responses. For example, if I open a browser to your wsgi -application at `http://localhost:8080/multiple/3/5' then the response -body in my browser should be `15`. - -Consider the following URL/Response body pairs as tests: - -``` - http://localhost:8080/multiply/3/5 => 15 - http://localhost:8080/add/23/42 => 65 - http://localhost:8080/subtract/23/42 => -19 - http://localhost:8080/divide/22/11 => 2 - http://localhost:8080/ => Here's how to use this page... -``` - -To submit your homework: - - * Fork this repository (Session03). - * Edit this file to meet the homework requirements. - * Your script should be runnable using `$ python calculator.py` - * When the script is running, I should be able to view your - application in my browser. - * I should also be able to see a home page (http://localhost:8080/) - that explains how to perform calculations. - * Commit and push your changes to your fork. - * Submit a link to your Session03 fork repository! - - -""" +def home(): + + return Template.home() def add(*args): - """ Returns a STRING with the sum of the arguments """ - - # TODO: Fill sum with the correct value, based on the - # args provided. - sum = "0" - - return sum + + try: + sum = 0 + for i in range(0, len(args)): + sum = sum + int(args[i]) + except ValueError: + return "This application requires integer values." + return str(sum) + +def subtract(*args): + + try: + diff = int(args[0]) + for i in range(1, len(args)): + diff = diff - int(args[i]) + except ValueError: + return "This application requires integer values." + return str(diff) + + +def multiply(*args): + + try: + multiple = 1 + for i in range(0, len(args)): + multiple = multiple * int(args[i]) + except ValueError: + return "This application requires integer values." + return str(multiple) + + +def divide(*args): + + try: + div = int(args[0]) + for i in range(1, len(args)): + div = div / int(args[i]) + except ValueError: + return "This application requires integer values." + except ZeroDivisionError: + return "Cannot divide by zero." + return str(div) -# TODO: Add functions for handling more arithmetic operations. def resolve_path(path): """ Should return two values: a callable and an iterable of arguments. """ - - # TODO: Provide correct values for func and args. The - # examples provide the correct *syntax*, but you should - # determine the actual values of func and args using the - # path. - func = add - args = ['25', '32'] - - return func, args + funcs = { + '': home, + 'add': add, + 'subtract': subtract, + 'multiply': multiply, + 'divide': divide, + } + path = path.strip('/').split('/') + func_name = path[0] + args = path[1:] + try: + func = funcs[func_name] + except KeyError: + raise NameError + + return func_name, func, args def application(environ, start_response): - # TODO: Your application code from the book database - # work here as well! Remember that your application must - # invoke start_response(status, headers) and also return - # the body of the response in BYTE encoding. - # - # TODO (bonus): Add error handling for a user attempting - # to divide by zero. - pass + headers = [('Content-type', 'text/html')] + try: + path = environ.get('PATH_INFO', None) + if path is None: + raise NameError + func_name, func, args = resolve_path(path) + body = Template.answer(func_name, func(*args)) + body = func(*args) + status = "200 OK" + except NameError: + status = "404 Not Found" + body = '

Not Found

' + except Exception: + status = '500 Internal Server Error' + body = '

Internal Server Error

' + print(traceback.format_exc()) + finally: + headers.append(('Content-length', str(len(body)))) + start_response(status, headers) + return [body.encode('utf8')] + if __name__ == '__main__': - # TODO: Insert the same boilerplate wsgiref simple - # server creation that you used in the book database. - pass + from wsgiref.simple_server import make_server + srv = make_server('localhost', 8080, application) + srv.serve_forever() diff --git a/templates.py b/templates.py new file mode 100644 index 0000000..2274791 --- /dev/null +++ b/templates.py @@ -0,0 +1,28 @@ + +class Template(): + + def home(): + + return ''' + + Internet Programming in Python: wsgi-calculator Assignment + + +

Internet Programming in Python: wsgi-calculator Assignment

+

Please follow the format below to operate the calculator:

+

For multiplacation: http://localhost:8080/multiply/3/5

+

For addition: http://localhost:8080/add/23/42

+

For subtraction: http://localhost:8080/subtract/23/42

+

For division: http://localhost:8080/divide/22/11

  + + ''' + + def answer(operation, ans): + + page = ''' +

The answer for the {} operation is: {}.

+ ''' + return page.format(operation, ans) + + + diff --git a/tests.py b/tests.py index c2a8dcb..c4192d7 100644 --- a/tests.py +++ b/tests.py @@ -10,7 +10,7 @@ class WebTestCase(unittest.TestCase): def setUp(self): self.server_process = subprocess.Popen( [ - "python", + "python3", "calculator.py" ], stdout=subprocess.PIPE,