Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quick edits to app.py, jokes.py, add .gitignore, edit readme #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pyc
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Geek-Jokes

## A Flask RESTful API to get random geek jokes

## Start Up Commands
```bash
$ pip install -r requirements.txt
$ export FLASK_APP=app.py
$ export FLASK_DEBUG=1
$ flask run
```
25 changes: 7 additions & 18 deletions app.py
Original file line number Diff line number Diff line change
@@ -1,37 +1,26 @@
# -*- coding: utf-8 -*-
from flask import Flask
from flask_restful import Resource, Api

import joke
import sys


app = Flask(__name__)
api = Api(app)



reload(sys)
sys.setdefaultencoding('utf-8')

class APP(Resource):
class App(Resource):
def get(self):
return {'this is soon to become an awesome->': 'website'}

def post(self):
jk = joke.getJoke()
jk = jk.encode('ascii', 'ignore').decode('ascii')
#jk = jk.encode('utf-8')
return jk

class API(Resource):
class Api(Resource):
def get(self):
jk = joke.getJoke()
jk = jk.encode('ascii', 'ignore').decode('ascii')
# jk = jk.encode('utf-8')
return jk
return joke.get_joke().encode('ascii', 'ignore').decode('ascii')


api.add_resource(APP, '/')
api.add_resource(API, '/api')
api.add_resource(App, '/')
api.add_resource(Api, '/api')

if __name__ == '__main__':
app.run(debug=True)
17 changes: 8 additions & 9 deletions joke.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# -*- coding: utf-8 -*-
import json
from random import *
import random

def random_digits():
range_start = 1
range_end = 545
return randint(range_start, range_end)
def getJoke():

def random_digits(item_count):
return random.randint(0, item_count)


def get_joke():
with open('data.json') as data_file:
data = json.load(data_file)
joke = data[random_digits()]
print joke
return joke
return data[random_digits(len(data))]