a first big refacto of the existing arch

4 files changed, 78 insertions, 0 deletions

diff --git a/pyaggr3g470r/controllers/__init__.py b/pyaggr3g470r/controllers/__init__.py
new file mode 100644
index 00000000..029cbf43
--- /dev/null
+++ b/pyaggr3g470r/controllers/__init__.py
@@ -0,0 +1,5 @@
+from .feed import FeedController
+from .article import ArticleController
+
+
+__all__ = ['FeedController', 'ArticleController']
diff --git a/pyaggr3g470r/controllers/abstract.py b/pyaggr3g470r/controllers/abstract.py
new file mode 100644
index 00000000..fe437b09
--- /dev/null
+++ b/pyaggr3g470r/controllers/abstract.py
@@ -0,0 +1,47 @@
+from flask import g
+from pyaggr3g470r.lib.exceptions import Forbidden, NotFound
+
+
+class AbstractController(object):
+    _db_cls = None
+
+    def __init__(self, user_id):
+        self.user_id = user_id
+
+    def _get(self, **filters):
+        if self.user_id:
+            filters['user_id'] = self.user_id
+        db_filters = [getattr(self._db_cls, key) == value
+                      for key, value in filters.iteritems()]
+        return self._db_cls.query.filter(*db_filters).first()
+
+    def get(self, **filters):
+        obj = self._get(**filters).first()
+        if not obj:
+            raise NotFound({'message': 'No %r (%r)'
+                                % (self._db_cls.__class__.__name__, filters)})
+        if obj.user_id != self.user_id:
+            raise Forbidden({'message': 'No authorized to access %r (%r)'
+                                % (self._db_cls.__class__.__name__, filters)})
+        return obj
+
+    def create(self, **attrs):
+        obj = self._db_cls(**attrs)
+        g.db.session.commit()
+        return obj
+
+    def read(self, **filters):
+        return self._get(**filters)
+
+    def update(self, obj_id, **attrs):
+        obj = self.get(id=obj_id)
+        for key, values in attrs.iteritems():
+            setattr(obj, key, values)
+        g.db.session.commit()
+        return obj
+
+    def delete(self, obj_id):
+        obj = self.get(id=obj_id)
+        g.db.session.delete(obj)
+        g.db.session.commit()
+        return obj
diff --git a/pyaggr3g470r/controllers/article.py b/pyaggr3g470r/controllers/article.py
new file mode 100644
index 00000000..cfaf386d
--- /dev/null
+++ b/pyaggr3g470r/controllers/article.py
@@ -0,0 +1,20 @@
+import conf
+from .abstract import AbstractController
+from pyaggr3g470r.models import Article
+
+
+class ArticleController(AbstractController):
+    _db_cls = Article
+
+    def read(self, obj_id):
+        article = super(ArticleController, self).read(obj_id)
+        if not article.readed:
+            self.update(obj_id, readed=True)
+        return article
+
+    def delete(self, obj_id):
+        obj = super(ArticleController, self).delete(obj_id)
+        if not conf.ON_HEROKU:
+            import pyaggr3g470r.search as fastsearch
+            fastsearch.delete_article(self.user_id, obj.feed_id, obj_id)
+        return obj
diff --git a/pyaggr3g470r/controllers/feed.py b/pyaggr3g470r/controllers/feed.py
new file mode 100644
index 00000000..5ada1a48
--- /dev/null
+++ b/pyaggr3g470r/controllers/feed.py
@@ -0,0 +1,6 @@
+from .abstract import AbstractController
+from pyaggr3g470r.models import Feed
+
+
+class FeedController(AbstractController):
+    _db_cls = Feed