Skip to content

Commit 7373cf1

Browse files
mjhea0mjhea0
committed
updated akinkunmi's solutions
1 parent 95a1aa5 commit 7373cf1

File tree

9 files changed

+62
-88
lines changed

9 files changed

+62
-88
lines changed

‎part1/reverse-string/reverse_akinkunmi/reverse.py‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,2 @@
1-
2-
def reverse(str):
3-
str_reverse_list = str.split()
4-
str_reverse_list.reverse()
5-
str_reverse = ' '.join(str_reverse_list)
6-
return str_reverse
7-
8-
9-
if __name__ == '__main__':
10-
input_string = raw_input("Please input a string: ")
11-
str_reversed = reverse(input_string)
12-
print str_reversed
13-
1+
def reverse(str_to_reverse):
2+
return str_to_reverse[::-1]

‎part1/reverse-string/reverse_akinkunmi/reverse_test.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
from reverse import reverse
2-
def reverse_test():
3-
str = raw_input("Please input a string: ")
4-
str_reversed = reverse(str)
5-
print str_reversed
6-
2+
import unittest
3+
4+
5+
class TestReverse(unittest.TestCase):
6+
7+
def test_reverse(self):
8+
self.assertEqual(reverse('hello'), 'olleh')
9+
self.assertEqual(reverse('newyork'), 'kroywen')
10+
self.assertNotEqual(reverse('newyork'), 'newyork')
11+
12+
713
if __name__ == '__main__':
8-
reverse_test()
9-
14+
unittest.main()

‎part1/vowel-counter/counter_akinkunmi/vowel_counter.py‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
1-
2-
31
def vowel_counter(str):
4-
5-
vowel_freqs = {}
6-
vowel_list = ['a', 'e', 'i', 'o', 'u']
7-
for word in str:
8-
str_list = str.split()
9-
for v in vowel_list:
10-
f = word.find(v)
11-
if f !=-1:
12-
if v in vowel_freqs:
13-
vowel_freqs[v] += 1
14-
else:
15-
vowel_freqs[v] = 1
16-
17-
for key,value in vowel_freqs.items():
18-
print key, value
19-
20-
21-
if __name__ == '__main__':
22-
str = raw_input("Please input a string: ")
23-
vowel_counter(str)
24-
25-
2+
vowel_freqs = {}
3+
vowel_list = ['a', 'e', 'i', 'o', 'u']
4+
lower_case_string = str.lower()
5+
for v in vowel_list:
6+
f = lower_case_string.find(v)
7+
if f != -1:
8+
if v in vowel_freqs:
9+
vowel_freqs[v] += 1
10+
else:
11+
vowel_freqs[v] = 1
12+
return vowel_freqs

‎part1/vowel-counter/counter_akinkunmi/vowel_counter_test.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
from vowel_counter import vowel_counter
2+
import unittest
3+
4+
5+
class VowelCounterTestCase(unittest.TestCase):
6+
def test(self):
7+
test_string = "Akinkunmi"
8+
expected_vowel_count = {'a': 1, 'i': 1, 'u': 1}
9+
resulted_vowel_count = vowel_counter(test_string)
10+
self.assertEqual(expected_vowel_count, resulted_vowel_count)
211

3-
def vowel_counter_test():
4-
str = raw_input("Please input a string: ")
5-
vowel_counter(str)
6-
7-
812
if __name__ == '__main__':
9-
vowel_counter_test()
13+
unittest.main()

‎part1/vowel-counter/counter_reza/test_vowel_counter.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from vowel_counter import vowel_counter
22
import unittest
33

4+
45
class VowelCounterTestCase(unittest.TestCase):
56
def test(self):
67
test_string = "Hello, My name is Reza. Github user name:ni8mr"
78
expected_vowel_count = 14
89
resulted_vowel_count = vowel_counter(test_string)
910
self.assertEqual(expected_vowel_count, resulted_vowel_count)
1011

11-
if __name__=='__main__':
12+
if __name__ == '__main__':
1213
unittest.main()

‎part1/vowel-counter/counter_reza/vowel_counter.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
def vowel_counter(string):
22
count = 0
33
for letter in string:
4-
if letter in ['A','E','I','O','U','a','e','i','o','u']:
4+
if letter in ['A', 'E', 'I', 'O', 'U', 'a', 'e', 'i', 'o', 'u']:
55
count = count + 1
66
return count
7-

‎part2/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
| [MPerham](https://github.com/mperham2/python-devtest/tree/master/part2/reverse_flask_perham) | [Heroku](https://shrouded-thicket-5935.herokuapp.com/) |
88
| [Gary Herd](https://github.com/garyherd/python-devtest) | [reverse-string](https://grh-reverse-string.herokuapp.com/) |
99
| [Noor Faziur Reza](https://github.com/ni8mr/python-devtest) | [reverse_string_reza](http://ni8mr2.herokuapp.com/) |
10-
| [AAkinkunmi](https://github.com/nubianMONK/python-devtest/tree/master/part2/reverse_flask_akinkunmi) | [reverse-flask](vast-forest-9436.herokuapp.com/) |
10+
| [AAkinkunmi](https://github.com/nubianMONK/python-devtest/tree/master/part2/reverse_flask_akinkunmi) | [reverse-flask](http://vast-forest-9436.herokuapp.com/) |
1111
| Add link here | Add link here |

‎part2/reverse_flask_akinkunmi/Procfile.windows‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎part2/reverse_flask_akinkunmi/reverse_flask.py‎

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flask import Flask, render_template, request, redirect, url_for,flash,session
1+
from flask import Flask, render_template, redirect, url_for
22
from flask.ext.session import Session
33
from flask.ext.bootstrap import Bootstrap
44
from flask.ext.wtf import Form
@@ -7,7 +7,6 @@
77
from wtforms.validators import Required
88

99

10-
1110
app = Flask(__name__)
1211
app.config['SECRET_KEY'] = 'hard to guess string'
1312
bootstrap = Bootstrap(app)
@@ -16,53 +15,44 @@
1615

1716

1817
class Reverse_Flask_Form(Form):
18+
form_string = StringField('Please input a string', validators=[Required()])
19+
form_submit = SubmitField('Submit')
20+
21+
22+
def reverse(str_to_reverse):
23+
return str_to_reverse[::-1]
1924

20-
form_string = StringField('Please input a string', validators=[Required()])
21-
form_submit = SubmitField('Submit')
22-
23-
def reverse(str):
24-
str_reverse_list = str.split()
25-
str_reverse_list.reverse()
26-
str_reverse = ' '.join(str_reverse_list)
27-
return str_reverse
28-
2925

3026
@app.errorhandler(403)
3127
def page_forbidden(e):
32-
return render_template('403.html'), 403
33-
28+
return render_template('403.html'), 403
29+
30+
3431
@app.errorhandler(404)
3532
def page_not_found(e):
36-
return render_template('404.html'), 404
33+
return render_template('404.html'), 404
3734

3835

3936
@app.errorhandler(500)
4037
def internal_server_error(e):
41-
return render_template('500.html'), 500
42-
43-
38+
return render_template('500.html'), 500
39+
40+
4441
@app.route('/', methods=['GET', 'POST'])
4542
def reverse_string_post():
46-
form = Reverse_Flask_Form()
47-
if form.validate_on_submit():
48-
49-
input_string =form.form_string.data
50-
43+
form = Reverse_Flask_Form()
44+
if form.validate_on_submit():
45+
input_string = form.form_string.data
46+
return redirect(url_for('reversed_string', entry=input_string))
47+
return render_template('entry_flask.html', form=form)
5148

52-
return redirect(url_for('reversed_string', entry = input_string ))
5349

54-
return render_template('entry_flask.html', form=form)
55-
5650
@app.route('/reversed_entry/<entry>')
5751
def reversed_string(entry):
58-
r_string = reverse(entry)
59-
return render_template('reverse.html', original=entry, transformed = r_string)
60-
61-
52+
r_string = reverse(entry)
53+
return render_template('reverse.html', original=entry, transformed=r_string)
6254

63-
6455

6556
if __name__ == '__main__':
66-
67-
app.debug = True
68-
app.run()
57+
app.debug = True
58+
app.run()

0 commit comments

Comments
 (0)