From bbb9ab341b86596a1df40213feb788324cdc1895 Mon Sep 17 00:00:00 2001
From: Martin <me.carlsson@gmail.com>
Date: Tue, 26 Apr 2016 12:18:11 +0200
Subject: [PATCH] remove custom json serializer

---
 api/__init__.py         |  4 ----
 api/helpers/__init__.py |  1 -
 api/helpers/json.py     | 46 -----------------------------------------
 api/models/designer.py  | 14 +++++++++----
 4 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 api/helpers/json.py

diff --git a/api/__init__.py b/api/__init__.py
index bc27867..3700c23 100644
--- a/api/__init__.py
+++ b/api/__init__.py
@@ -1,13 +1,9 @@
 from flask import Flask, jsonify
 from flask_sqlalchemy import SQLAlchemy
-from api.helpers import JSONEncoder
 
 app = Flask(__name__)
 app.config.from_object('config')
 
-# enable this when json encoding works
-# app.json_encoder = JSONEncoder
-
 def on_404(e):
   return jsonify(dict(error='Not found')), 404
 
diff --git a/api/helpers/__init__.py b/api/helpers/__init__.py
index 6545dd6..e69de29 100644
--- a/api/helpers/__init__.py
+++ b/api/helpers/__init__.py
@@ -1 +0,0 @@
-from .json import JSONEncoder, JsonSerializer
\ No newline at end of file
diff --git a/api/helpers/json.py b/api/helpers/json.py
deleted file mode 100644
index 2539148..0000000
--- a/api/helpers/json.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from flask.json import JSONEncoder as BaseJSONEncoder
-
-
-class JSONEncoder(BaseJSONEncoder):
-    """Custom :class:`JSONEncoder` which respects objects that include the
-    :class:`JsonSerializer` mixin.
-    """
-    def default(self, obj):
-        if isinstance(obj, JsonSerializer):
-            return obj.to_json()
-        return super(JSONEncoder, self).default(obj)
-
-
-class JsonSerializer(object):
-    """A mixin that can be used to mark a SQLAlchemy model class which
-    implements a :func:`to_json` method. The :func:`to_json` method is used
-    in conjuction with the custom :class:`JSONEncoder` class. By default this
-    mixin will assume all properties of the SQLAlchemy model are to be visible
-    in the JSON output. Extend this class to customize which properties are
-    public, hidden or modified before being being passed to the JSON serializer.
-    """
-
-    __json_public__ = None
-    __json_hidden__ = None
-    __json_modifiers__ = None
-
-    def get_field_names(self):
-        for p in self.__mapper__.iterate_properties:
-            yield p.key
-
-    def to_json(self):
-        field_names = self.get_field_names()
-
-        public = self.__json_public__ or field_names
-        hidden = self.__json_hidden__ or []
-        modifiers = self.__json_modifiers__ or dict()
-
-        rv = dict()
-        for key in public:
-            rv[key] = getattr(self, key)
-        for key, modifier in modifiers.items():
-            value = getattr(self, key)
-            rv[key] = modifier(value, self)
-        for key in hidden:
-            rv.pop(key, None)
-        return rv
\ No newline at end of file
diff --git a/api/models/designer.py b/api/models/designer.py
index 39cc683..7cfa798 100644
--- a/api/models/designer.py
+++ b/api/models/designer.py
@@ -1,9 +1,15 @@
 from api import db
-from api.helpers import JsonSerializer
 
-class Designer(JsonSerializer, db.Model):
+class Designer(db.Model):
   __tablename__ = 'designers'
 
-  designerid = db.Column('designerid', db.Integer, primary_key=True)
+  designerid = db.Column(db.Integer, primary_key=True)
   name = db.Column(db.String(100), nullable=False)
-  path = db.Column(db.String(100), nullable=False)
\ No newline at end of file
+  path = db.Column(db.String(100), nullable=False)
+
+  def to_json(self, nested=False):
+    return {
+      'designerid': self.designerid,
+      'name': self.name,
+      'path': self.path,
+    }
\ No newline at end of file