diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 4c0aab0..625c2da --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ venv .DS_STORE htmlcov .coverage -__pycache__ \ No newline at end of file +__pycache__ +/.idea \ No newline at end of file diff --git a/part1/reverse-string/reverse_afr/reverse.py b/part1/reverse-string/reverse_afr/reverse.py new file mode 100644 index 0000000..b9f4e44 --- /dev/null +++ b/part1/reverse-string/reverse_afr/reverse.py @@ -0,0 +1,3 @@ +def reverse(s): + # return s[-1:-len(s)-1:-1] -- my first attempt which seems complicated + return s[::-1] # After researching on it. diff --git a/part1/reverse-string/reverse_afr/test_reverse.py b/part1/reverse-string/reverse_afr/test_reverse.py new file mode 100644 index 0000000..8176b2e --- /dev/null +++ b/part1/reverse-string/reverse_afr/test_reverse.py @@ -0,0 +1,22 @@ +from reverse import reverse + +# Test reversal in positive case +def test_reverse_1(): + strings = [("", ""), + ("hello", "olleh"), + ] + for s in strings: + (string, reverse_string) = s + assert reverse_string == reverse(string) + +# Test reversal in negative case +def test_reverse_2(): + strings = [("", "olleh"), + ("hello", "") + ] + for s in strings: + (string, reverse_string) = s + assert reverse_string != reverse(string) + +test_reverse_1() +test_reverse_2() diff --git a/part1/reverse-string/reverse_reisch/reverse_string.py b/part1/reverse-string/reverse_reisch/reverse_string.py new file mode 100755 index 0000000..9378885 --- /dev/null +++ b/part1/reverse-string/reverse_reisch/reverse_string.py @@ -0,0 +1,2 @@ +def reverse(some_string): + return some_string[::-1] diff --git a/part1/reverse-string/reverse_reisch/test_reverse.py b/part1/reverse-string/reverse_reisch/test_reverse.py new file mode 100755 index 0000000..4303ab2 --- /dev/null +++ b/part1/reverse-string/reverse_reisch/test_reverse.py @@ -0,0 +1,14 @@ +import unittest +from reverse_string import reverse + + +class ReverseStringTests(unittest.TestCase): + def test_reverse(self): + my_string = "testing" + my_reversed_string = "gnitset" + + returned_string = reverse(my_string) + assert my_reversed_string == returned_string + +if __name__ == "__main__": + unittest.main() diff --git a/part1/vowel-counter/counter_afr/test_vowel_counter.py b/part1/vowel-counter/counter_afr/test_vowel_counter.py new file mode 100644 index 0000000..9a6efa8 --- /dev/null +++ b/part1/vowel-counter/counter_afr/test_vowel_counter.py @@ -0,0 +1,27 @@ +from vowel_counter import vowel_counter + +def test_vowel_counter_1(): + string = "" + vowels = vowel_counter(string) + expected_vowels={ + "a":0, + "e":0, + "i":0, + "o":0, + "u":0 + } + assert vowels == expected_vowels + + string = "abcaaadefoogooo" + vowels = vowel_counter(string) + expected_vowels={ + "a":4, + "e":1, + "i":0, + "o":5, + "u":0 + } + assert vowels == expected_vowels + + +test_vowel_counter_1() diff --git a/part1/vowel-counter/counter_afr/vowel_counter.py b/part1/vowel-counter/counter_afr/vowel_counter.py new file mode 100644 index 0000000..8f3bfa7 --- /dev/null +++ b/part1/vowel-counter/counter_afr/vowel_counter.py @@ -0,0 +1,15 @@ +# return a dictionary +def vowel_counter(string): + vowels={ + "a":0, + "e":0, + "i":0, + "o":0, + "u":0 + } + + for c in string: + if c in vowels.keys(): + vowels[c] = vowels[c]+1 + return vowels + diff --git a/part1/vowel-counter/counter_reisch/test_vowel_counter.py b/part1/vowel-counter/counter_reisch/test_vowel_counter.py new file mode 100755 index 0000000..c3a622c --- /dev/null +++ b/part1/vowel-counter/counter_reisch/test_vowel_counter.py @@ -0,0 +1,12 @@ +import unittest +from vowel_counter import vowel_counter + + +class VowelCounterTests(unittest.TestCase): + def test_vowel_counter(self): + my_string = 'abracadabra' + vowel_count = vowel_counter(my_string) + assert vowel_count == 5 + +if __name__ == '__main__': + unittest.main() diff --git a/part1/vowel-counter/counter_reisch/vowel_counter.py b/part1/vowel-counter/counter_reisch/vowel_counter.py new file mode 100755 index 0000000..b2b5f4e --- /dev/null +++ b/part1/vowel-counter/counter_reisch/vowel_counter.py @@ -0,0 +1,9 @@ +vowels = ('a', 'e', 'i', 'o', 'u') + + +def vowel_counter(some_string): + count = 0 + for letter in some_string: + if letter in vowels: + count += 1 + return count diff --git a/part2/README.md b/part2/README.md old mode 100644 new mode 100755 index d7eb12e..a8972fd --- a/part2/README.md +++ b/part2/README.md @@ -8,4 +8,6 @@ | [Gary Herd](https://github.com/garyherd/python-devtest) | [reverse-string](https://grh-reverse-string.herokuapp.com/) | | [Noor Faziur Reza](https://github.com/ni8mr/python-devtest) | [reverse_string_reza](http://ni8mr2.herokuapp.com/) | | [AAkinkunmi](https://github.com/nubianMONK/python-devtest/tree/master/part2/reverse_flask_akinkunmi) | [reverse-flask](http://vast-forest-9436.herokuapp.com/) | +| [Matthew Reisch](https://github.com/mbreisch/python-devtest) | [reverse-flask](https://vast-caverns-90155.herokuapp.com/) | +| [Available For Recruit](https://github.com/available-for-recruit/python-devtest) | [reverse-flask](https://limitless-beach-97367.herokuapp.com/) | | Add link here | Add link here | diff --git a/part2/reverse_flask_afr/Procfile b/part2/reverse_flask_afr/Procfile new file mode 100644 index 0000000..0d9c468 --- /dev/null +++ b/part2/reverse_flask_afr/Procfile @@ -0,0 +1 @@ +web: python app.py diff --git a/part2/reverse_flask_afr/app.py b/part2/reverse_flask_afr/app.py new file mode 100644 index 0000000..1630263 --- /dev/null +++ b/part2/reverse_flask_afr/app.py @@ -0,0 +1,31 @@ +# Reverse a string +# Note - this doesn't persist anything in a db + +import os + +# import specific reverse function +from reverse import reverse + +from flask import Flask, flash, redirect, render_template, request, url_for + +SECRET_KEY = "jiosf0m()(HJI890w23r9j*&*^&GY" +WTF_CSRF_ENABLED = True # cross-site request forgery protection + +app = Flask(__name__) +app.config.from_object(__name__) + +# Main index route +@app.route("/") +def index(): + return render_template("index.html") + +# Route to reversed entry +@app.route("/reverse_entry", methods = ["POST"]) +def reverse_entry(): + re = reverse(request.form["string_to_reverse"]) + return render_template("reverse_entry.html", re = re) + +# Main - port added to work with heroku +if __name__ == "__main__": + port = int(os.environ.get("PORT", 5000)) + app.run(host="0.0.0.0", port = port) diff --git a/part2/reverse_flask_afr/requirements.txt b/part2/reverse_flask_afr/requirements.txt new file mode 100644 index 0000000..7385e3f --- /dev/null +++ b/part2/reverse_flask_afr/requirements.txt @@ -0,0 +1,15 @@ +behave==1.2.5 +Flask==0.10.1 +Flask-Bootstrap==3.3.4.1 +Flask-Session==0.2 +Flask-WTF==0.11 +gunicorn==19.3.0 +itsdangerous==0.24 +Jinja2==2.7.3 +MarkupSafe==0.23 +parse==1.6.6 +parse-type==0.3.4 +six==1.10.0 +Werkzeug==0.10.4 +wheel==0.26.0 +WTForms==2.0.2 diff --git a/part2/reverse_flask_afr/reverse.py b/part2/reverse_flask_afr/reverse.py new file mode 100644 index 0000000..b9f4e44 --- /dev/null +++ b/part2/reverse_flask_afr/reverse.py @@ -0,0 +1,3 @@ +def reverse(s): + # return s[-1:-len(s)-1:-1] -- my first attempt which seems complicated + return s[::-1] # After researching on it. diff --git a/part2/reverse_flask_afr/templates/base.html b/part2/reverse_flask_afr/templates/base.html new file mode 100644 index 0000000..93aa1b0 --- /dev/null +++ b/part2/reverse_flask_afr/templates/base.html @@ -0,0 +1,20 @@ + + + + Flask - Reverse Strings + + + + + + +
+ + {% block content %} + {% endblock %} + +
+ + diff --git a/part2/reverse_flask_afr/templates/index.html b/part2/reverse_flask_afr/templates/index.html new file mode 100644 index 0000000..9e87680 --- /dev/null +++ b/part2/reverse_flask_afr/templates/index.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} + +{% block content %} +
+

Please enter a string to be reversed

+

+
+
+
+
+
+
+
+
+
+{% endblock %} diff --git a/part2/reverse_flask_afr/templates/reverse_entry.html b/part2/reverse_flask_afr/templates/reverse_entry.html new file mode 100644 index 0000000..4d3dfd0 --- /dev/null +++ b/part2/reverse_flask_afr/templates/reverse_entry.html @@ -0,0 +1,7 @@ +{% extends "base.html" %} + +{% block content %} +
+ {{ re|safe }} +
+{% endblock %} diff --git a/part2/reverse_flask_reisch/Procfile b/part2/reverse_flask_reisch/Procfile new file mode 100755 index 0000000..ee63fad --- /dev/null +++ b/part2/reverse_flask_reisch/Procfile @@ -0,0 +1 @@ +web: python run.py \ No newline at end of file diff --git a/part2/reverse_flask_reisch/features/environment.py b/part2/reverse_flask_reisch/features/environment.py new file mode 100755 index 0000000..f9d9030 --- /dev/null +++ b/part2/reverse_flask_reisch/features/environment.py @@ -0,0 +1,19 @@ +import os +import sys + +pwd = os.path.abspath(os.path.dirname(__file__)) +project = os.path.basename(pwd) +base_path = pwd.strip(project) +new_path = os.path.join(base_path, 'project') + +try: + from project import app +except ImportError: + sys.path.append(full_path) + from project import app + + +def before_feature(context, feature): + app.config['TESTING'] = True + app.config['WTF_CSRF_ENABLED'] = False + context.client = app.test_client() diff --git a/part2/reverse_flask_reisch/features/reverse.feature b/part2/reverse_flask_reisch/features/reverse.feature new file mode 100755 index 0000000..6f68bd1 --- /dev/null +++ b/part2/reverse_flask_reisch/features/reverse.feature @@ -0,0 +1,11 @@ +# Created by Matthew B. Reisch at 2/7/2016 +Feature: reverse_flask is operational in that users can submit a string via a form and view the word in reverse + Scenario: successful string reversal + Given reverse_flask is set up + When we submit the form with the string "hello" + Then we should see the output "olleh" + + Scenario: unsuccessful string reversal + Given reverse_flask is set up + When we submit the form with the string " " + Then we should see the alert "This field is required." \ No newline at end of file diff --git a/part2/reverse_flask_reisch/features/steps/reverse_steps.py b/part2/reverse_flask_reisch/features/steps/reverse_steps.py new file mode 100755 index 0000000..a9975e8 --- /dev/null +++ b/part2/reverse_flask_reisch/features/steps/reverse_steps.py @@ -0,0 +1,21 @@ +from behave import * + + +@given(u'reverse_flask is set up') +def flask_is_setup(context): + assert context.client + + +@when(u'we submit the form with the string "{string_input}"') +def submit_form(context, string_input): + context.page = context.client.post('/', data=dict(input=string_input),follow_redirects=True) + + +@then(u'we should see the output "{output}"') +def output(context, output): + assert output in context.page.data.decode() + + +@then(u'we should see the alert "{message}"') +def alert(context, message): + assert message in context.page.data.decode() diff --git a/part2/reverse_flask_reisch/project/__init__.py b/part2/reverse_flask_reisch/project/__init__.py new file mode 100755 index 0000000..f0a3173 --- /dev/null +++ b/part2/reverse_flask_reisch/project/__init__.py @@ -0,0 +1,19 @@ +from flask import Flask, render_template, request +from flask_bootstrap import Bootstrap +from .forms import ReverseForm + +app = Flask(__name__) +app.config.from_pyfile('_config.py') +Bootstrap(app) + + +@app.route('/', methods=['POST', 'GET']) +def index(): + error = None + form = ReverseForm(request.form) + if request.method == 'POST': + if form.validate_on_submit(): + input_string = request.form['input'] + return render_template( + 'index.html', form=form, reversed_string=input_string[::-1]) + return render_template('index.html', form=form, error=error) diff --git a/part2/reverse_flask_reisch/project/_config.py b/part2/reverse_flask_reisch/project/_config.py new file mode 100755 index 0000000..6aac142 --- /dev/null +++ b/part2/reverse_flask_reisch/project/_config.py @@ -0,0 +1,3 @@ +WTF_CSRF_ENABLED = True +SECRET_KEY = '\x07\xdd\xb7\x1e\xe8\x1d*\xe3`3\xa2\x9e\xf6\x94\xd4i\x14(\xa7\x93\xe5s\n\x8e' +DEBUG = True diff --git a/part2/reverse_flask_reisch/project/forms.py b/part2/reverse_flask_reisch/project/forms.py new file mode 100755 index 0000000..ba2a21f --- /dev/null +++ b/part2/reverse_flask_reisch/project/forms.py @@ -0,0 +1,7 @@ +from flask_wtf import Form +from wtforms import StringField +from wtforms.validators import DataRequired + + +class ReverseForm(Form): + input = StringField('Input', validators=[DataRequired()]) diff --git a/part2/reverse_flask_reisch/project/templates/index.html b/part2/reverse_flask_reisch/project/templates/index.html new file mode 100755 index 0000000..90b5f57 --- /dev/null +++ b/part2/reverse_flask_reisch/project/templates/index.html @@ -0,0 +1,26 @@ +{% extends "bootstrap/base.html" %} +{% block title %}Welcome to Reverse-A-Tron-5000 {% endblock %} +{% block content %} +
+

Please Enter a String to be Reversified

+
+ {{ form.csrf_token }} +

+ {{ form.input(placeholder="input a string here") }} + + {% if form.input.errors %} + {% for error in form.input.errors %} + {{ error }} + {% endfor %} + {% endif %} + +

+

+ +

+
+
+

Result: {{ reversed_string }}

+
+
+{% endblock %} \ No newline at end of file diff --git a/part2/reverse_flask_reisch/run.py b/part2/reverse_flask_reisch/run.py new file mode 100755 index 0000000..ac4bc2b --- /dev/null +++ b/part2/reverse_flask_reisch/run.py @@ -0,0 +1,5 @@ +import os +from project import app + +port = int(os.environ.get('PORT', 5000)) +app.run(host='0.0.0.0', port=port) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 7b9840f..7385e3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,15 @@ -Flask==0.10.1 -Flask-WTF==0.11 -Flask-Session==0.2 -Flask-Bootstrap==3.3.4.1 -gunicorn==19.3.0 -Jinja2==2.7.3 -MarkupSafe==0.23 -WTForms==2.0.2 -Werkzeug==0.10.4 -itsdangerous==0.24 +behave==1.2.5 +Flask==0.10.1 +Flask-Bootstrap==3.3.4.1 +Flask-Session==0.2 +Flask-WTF==0.11 +gunicorn==19.3.0 +itsdangerous==0.24 +Jinja2==2.7.3 +MarkupSafe==0.23 +parse==1.6.6 +parse-type==0.3.4 +six==1.10.0 +Werkzeug==0.10.4 +wheel==0.26.0 +WTForms==2.0.2