Fixed encoding issues, optimized JSON file reads

Author: sameerkumar18

app.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-from flask import Flask, jsonify
+from flask import Flask, jsonify, request
 from flask_restful import Resource, Api
-import joke
-import sys
 from flask_cors import CORS
 
+import joke
+
 app = Flask(__name__)
 api = Api(app)
 
@@ -15,28 +15,31 @@ class APP(Resource):
 
  def get(self):
  return jsonify({
-'author' : 'Sameer Kumar',
-'author_url' : 'https://www.sameerkumar.website',
-'base_url' : 'https://geek-jokes.sameerkumar.website',
- 'project_name' : 'Geek Joke API',
-'project_url' : 'https://github.com/sameerkumar18/geek-joke-api'
-})
-
+ 'author': 'Sameer Kumar',
+ 'author_url': 'https://www.sameerkumar.website',
+ 'base_url': 'https://geek-jokes.sameerkumar.website',
+ 'project_name': 'Geek Joke API',
+ 'project_url': 'https://github.com/sameerkumar18/geek-joke-api'
+ })
 
  def post(self):
  jk = joke.get_joke()
- jk = jk.encode('ascii', 'ignore').decode('ascii')
- #jk = jk.encode('utf-8')
- return jk
+ if request.args.get('format') == 'json':
+ return {'joke': jk}
+ else:
+ # Making sure existing clients don't break
+ return jk
 
 
 class API(Resource):
 
  def get(self):
  jk = joke.get_joke()
- jk = jk.encode('ascii', 'ignore').decode('ascii')
- # jk = jk.encode('utf-8')
- return jk
+ if request.args.get('format') == 'json':
+ return {'joke': jk}
+ else:
+ # Making sure existing clients don't break
+ return jk
 
 
 api.add_resource(APP, '/')

data.json

@@ -2,14 +2,13 @@
 import json
 from random import randint
 
+with open('data.json', encoding='utf-8-sig') as data_file:
+ data = json.load(data_file)
+JOKE_COUNT = len(data)
 
-def random_digits(joke_count):
- # Return a joke index between first and last joke in data
- return randint(1, joke_count)
 
 def get_joke():
  # Return random joke
- with open('data.json', encoding="utf8") as data_file:
- data = json.load(data_file)
- joke = data[random_digits(len(data))]
- return joke
+ random_num = randint(1, JOKE_COUNT)
+ joke = data[random_num]
+ return joke.replace('\"', "'") + str(random_num)

joke.py

@@ -1,8 +1,4 @@
-Flask==1.0.2
-gunicorn==19.9.0
-httplib2==0.11.3
-Jinja2==2.10
-virtualenv==16.0.0
-Werkzeug==0.14.1
-flask-restful
-flask-cors==3.0.6
+Flask==1.1.1
+gunicorn==20.0.4
+flask-restful==0.3.8
+flask-cors==3.0.7