From 4db3882f73218ae06cca0b8a0ec1fd9fdd52685c Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 15:54:22 +0900
Subject: [PATCH 01/32] Prepare not using Cursor

---
 earthreader/web/__init__.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 5bdc7e3..9ee4909 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -89,6 +89,30 @@ def join_id(self, append):
         return '-' + append
 
 
+def get_category(category_id):
+    with stage:
+        category = (stage.subscriptions if stage.subscriptions
+                    else SubscriptionList())
+    if category_id:
+        path = get_category_path(category_id)
+        for key in path:
+            try:
+                category = category.categories[key]
+            except KeyError:
+                raise InvalidCategoryID('The given category ID is not valid')
+    return category
+
+
+def get_category_path(category_id):
+    return [key[1:] for key in category_id.split('/')]
+
+
+def join_category_id(base, append):
+    if base:
+        return base + '/-' + append
+    return '-' + append
+
+
 def add_urls(data, keys, category_id, feed_id=None, entry_id=None):
     APIS = {
         'entries_url': 'category_entries',

From 4cab41c5339bea63d3623ed10be8728d23b6bed5 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 15:55:58 +0900
Subject: [PATCH 02/32] Use Category, not Cursor in feeds API

---
 earthreader/web/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 9ee4909..6fe2290 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -165,7 +165,7 @@ def index():
 @app.route('/feeds/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/')
 def feeds(category_id):
-    cursor = Cursor(category_id)
+    cursor = get_category(category_id)
     feeds = []
     categories = []
     for child in cursor:

From 1d9b750550c02e9ceb1b1ba8773126721742439b Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 15:56:39 +0900
Subject: [PATCH 03/32] Extract functions in feeds API

---
 earthreader/web/__init__.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 6fe2290..472f61a 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -169,21 +169,31 @@ def feeds(category_id):
     feeds = []
     categories = []
     for child in cursor:
-        data = {'title': child.label}
         if isinstance(child, Subscription):
-            url_keys = ['entries_url', 'remove_feed_url']
-            add_urls(data, url_keys, cursor.category_id, child.feed_id)
-            add_path_data(data, cursor.category_id, child.feed_id)
-            feeds.append(data)
+            feeds.append(get_feed_data(category_id, child))
         elif isinstance(child, Category):
-            url_keys = ['feeds_url', 'entries_url', 'add_feed_url',
-                        'add_category_url', 'remove_category_url', 'move_url']
-            add_urls(data, url_keys, cursor.join_id(child.label))
-            add_path_data(data, cursor.join_id(child.label))
-            categories.append(data)
+            categories.append(get_category_data(category_id, child))
     return jsonify(feeds=feeds, categories=categories)
 
 
+def get_feed_data(base_category_id, subscription):
+    feed_data = {'title': subscription.label}
+    url_keys = ['entries_url', 'remove_feed_url']
+    add_urls(feed_data, url_keys, base_category_id, subscription.feed_id)
+    add_path_data(feed_data, base_category_id, subscription.feed_id)
+    return feed_data
+
+
+def get_category_data(base_category_id, category):
+    label = category.label
+    category_data = {'title': label}
+    url_keys = ['feeds_url', 'entries_url', 'add_feed_url',
+                'add_category_url', 'remove_category_url', 'move_url']
+    add_urls(category_data, url_keys, join_category_id(base_category_id, label))
+    add_path_data(category_data, join_category_id(base_category_id, label))
+    return category_data
+
+
 @app.route('/feeds/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/', methods=['POST'])
 def add_feed(category_id):

From 940caf34313420e42cf21dab8b007d124cfe2b88 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:00:41 +0900
Subject: [PATCH 04/32] Rename API function name. feeds -> list_in_category

---
 earthreader/web/__init__.py          | 14 +++++++-------
 earthreader/web/templates/index.html |  2 +-
 tests/web_test.py                    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 472f61a..2f1f7d3 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -116,7 +116,7 @@ def join_category_id(base, append):
 def add_urls(data, keys, category_id, feed_id=None, entry_id=None):
     APIS = {
         'entries_url': 'category_entries',
-        'feeds_url': 'feeds',
+        'feeds_url': 'list_in_category',
         'add_feed_url': 'add_feed',
         'add_category_url': 'add_category',
         'remove_category_url': 'delete_category',
@@ -164,7 +164,7 @@ def index():
 
 @app.route('/feeds/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/')
-def feeds(category_id):
+def list_in_category(category_id):
     cursor = get_category(category_id)
     feeds = []
     categories = []
@@ -225,7 +225,7 @@ def add_feed(category_id):
         sub = cursor.subscribe(feed)
         stage.subscriptions = cursor.subscriptionlist
         stage.feeds[sub.feed_id] = feed
-    return feeds(category_id)
+    return list_in_category(category_id)
 
 
 @app.route('/', methods=['POST'], defaults={'category_id': ''})
@@ -237,7 +237,7 @@ def add_category(category_id):
     cursor.add(outline)
     with stage:
         stage.subscriptions = cursor.subscriptionlist
-    return feeds(category_id)
+    return list_in_category(category_id)
 
 
 @app.route('/<path:category_id>/', methods=['DELETE'])
@@ -248,9 +248,9 @@ def delete_category(category_id):
         stage.subscriptions = cursor.subscriptionlist
     index = category_id.rfind('/')
     if index == -1:
-        return feeds('')
+        return list_in_category('')
     else:
-        return feeds(category_id[:index])
+        return list_in_category(category_id[:index])
 
 
 @app.route('/feeds/<feed_id>/', methods=['DELETE'],
@@ -274,7 +274,7 @@ def delete_feed(category_id, feed_id):
         return r
     with stage:
         stage.subscriptions = cursor.subscriptionlist
-    return feeds(category_id)
+    return list_in_category(category_id)
 
 
 @app.route('/<path:category_id>/feeds/', methods=['PUT'])
diff --git a/earthreader/web/templates/index.html b/earthreader/web/templates/index.html
index e5e97bd..e271b8c 100644
--- a/earthreader/web/templates/index.html
+++ b/earthreader/web/templates/index.html
@@ -7,7 +7,7 @@
           href="{{ url_for('static', filename='img/favicon_32.ico')}}"/>
     <script>
       URLS = {{ {
-        'feeds': url_for('feeds', _external=True),
+        'feeds': url_for('list_in_category', _external=True),
         'entries': url_for('category_entries', _external=True)
       }|tojson|safe }};
       THEMES = {{ {
diff --git a/tests/web_test.py b/tests/web_test.py
index 56a8b9a..1ee8cbb 100644
--- a/tests/web_test.py
+++ b/tests/web_test.py
@@ -285,7 +285,7 @@ def test_all_feeds(xmls):
         category_url = root_categories[0]['feeds_url']
         assert category_url == \
             url_for(
-                'feeds',
+                'list_in_category',
                 category_id='-categoryone',
                 _external=True
             )
@@ -352,7 +352,7 @@ def test_all_feeds(xmls):
         category_url = one_categories[0]['feeds_url']
         assert category_url == \
             url_for(
-                'feeds',
+                'list_in_category',
                 category_id='-categoryone/-categorytwo',
                 _external=True
             )
@@ -391,7 +391,7 @@ def test_all_feeds(xmls):
         category_url = root_categories[1]['feeds_url']
         assert category_url == \
             url_for(
-                'feeds',
+                'list_in_category',
                 category_id='-categorythree',
                 _external=True
             )

From 5e8efdbafa084d4d2a21cb0bbe9e2663239a51be Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:02:34 +0900
Subject: [PATCH 05/32] Rename cursor to category

---
 earthreader/web/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 2f1f7d3..f5a4882 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -165,10 +165,10 @@ def index():
 @app.route('/feeds/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/')
 def list_in_category(category_id):
-    cursor = get_category(category_id)
+    category = get_category(category_id)
     feeds = []
     categories = []
-    for child in cursor:
+    for child in category:
         if isinstance(child, Subscription):
             feeds.append(get_feed_data(category_id, child))
         elif isinstance(child, Category):

From 88742c7b29ba2363d98ff31cfae5cf79792480c1 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:07:32 +0900
Subject: [PATCH 06/32] Use category in add_feed API

---
 earthreader/web/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index f5a4882..5ec233a 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -197,7 +197,7 @@ def get_category_data(base_category_id, category):
 @app.route('/feeds/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/', methods=['POST'])
 def add_feed(category_id):
-    cursor = Cursor(category_id)
+    category = get_category(category_id)
     url = request.form['url']
     try:
         f = urllib.request.urlopen(url)
@@ -222,8 +222,8 @@ def add_feed(category_id):
     feed_url = feed_links[0].url
     feed_url, feed, hints = next(iter(crawl([feed_url], 1)))
     with stage:
-        sub = cursor.subscribe(feed)
-        stage.subscriptions = cursor.subscriptionlist
+        sub = category.subscribe(feed)
+        stage.subscriptions = category.subscriptionlist
         stage.feeds[sub.feed_id] = feed
     return list_in_category(category_id)
 

From e9fcf4b3e4b361419004dc1b98c476d4bad83924 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:12:18 +0900
Subject: [PATCH 07/32] Exceptions for errors when adding feed

---
 earthreader/web/exceptions.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/earthreader/web/exceptions.py b/earthreader/web/exceptions.py
index 648f093..2adbc25 100644
--- a/earthreader/web/exceptions.py
+++ b/earthreader/web/exceptions.py
@@ -48,3 +48,17 @@ class WorkerNotRunning(ValueError, JsonException):
     error = 'worker-not-running'
     message = 'The worker thread that crawl feeds in background is not' \
               'running.'
+
+
+class DocumentNotFound(ValueError, JsonException):
+    """Raised when the document is not reachable"""
+
+    error='unreachable-url',
+    message='Cannot connect to given url'
+
+
+class AutodiscoveryFailed(ValueError, JsonException):
+    """Raised when a feed url is not found"""
+
+    error='unreachable-feed-url',
+    message='Cannot find feed url'

From 592b0c0bd13f127f1a97786deea5b7e5ee55f05c Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:18:52 +0900
Subject: [PATCH 08/32] Function returning subscriptions

---
 earthreader/web/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 5ec233a..61ff269 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -89,6 +89,11 @@ def join_id(self, append):
         return '-' + append
 
 
+def get_subscription_list():
+    with stage:
+        return stage.subscriptions
+
+
 def get_category(category_id):
     with stage:
         category = (stage.subscriptions if stage.subscriptions

From 0714441c3338ace5a70506420bc12bc4d5c4c675 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:27:56 +0900
Subject: [PATCH 09/32] Return empty SubscriptionList when there is None

---
 earthreader/web/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 61ff269..98a0d7c 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -91,7 +91,8 @@ def join_id(self, append):
 
 def get_subscription_list():
     with stage:
-        return stage.subscriptions
+        return (stage.subscriptions if stage.subscriptions
+                else SubscriptionList())
 
 
 def get_category(category_id):

From 697ebcf44e11bff7eaf5ceed8de14a6962ed09c6 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:30:01 +0900
Subject: [PATCH 10/32] Get category using subscription list

---
 earthreader/web/__init__.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 98a0d7c..9b6502a 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -95,10 +95,8 @@ def get_subscription_list():
                 else SubscriptionList())
 
 
-def get_category(category_id):
-    with stage:
-        category = (stage.subscriptions if stage.subscriptions
-                    else SubscriptionList())
+def get_category(subscription_list, category_id):
+    category = subscription_list
     if category_id:
         path = get_category_path(category_id)
         for key in path:
@@ -171,7 +169,7 @@ def index():
 @app.route('/feeds/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/')
 def list_in_category(category_id):
-    category = get_category(category_id)
+    category = get_category(get_subscription_list(), category_id)
     feeds = []
     categories = []
     for child in category:
@@ -203,7 +201,8 @@ def get_category_data(base_category_id, category):
 @app.route('/feeds/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/', methods=['POST'])
 def add_feed(category_id):
-    category = get_category(category_id)
+    subscription_list = get_subscription_list()
+    category = get_category(subscription_list, category_id)
     url = request.form['url']
     try:
         f = urllib.request.urlopen(url)

From 600b23137b00b5f763140ed931ae66e13bc4e0d5 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 16:33:58 +0900
Subject: [PATCH 11/32] Refactoring add_feed API

---
 earthreader/web/__init__.py | 42 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 9b6502a..bfc87da 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -16,7 +16,8 @@
 
 from .util import autofix_repo_url, get_hash
 from .wsgi import MethodRewriteMiddleware
-from .exceptions import (InvalidCategoryID, IteratorNotFound, WorkerNotRunning,
+from .exceptions import (AutodiscoveryFailed, DocumentNotFound,
+                         InvalidCategoryID, IteratorNotFound, WorkerNotRunning,
                          FeedNotFound, EntryNotFound)
 from .worker import Worker
 from .stage import stage
@@ -204,33 +205,32 @@ def add_feed(category_id):
     subscription_list = get_subscription_list()
     category = get_category(subscription_list, category_id)
     url = request.form['url']
+    document = get_document(url)
+    feed_links = get_feed_links(document, url)
+    feed_url = feed_links[0].url
+    feed_url, feed, hints = next(iter(crawl([feed_url], 1)))
+    with stage:
+        subscription = category.subscribe(feed)
+        stage.subscriptions = subscription_list
+        stage.feeds[subscription.feed_id] = feed
+    return list_in_category(category_id)
+
+
+def get_document(url):
     try:
         f = urllib.request.urlopen(url)
         document = f.read()
         f.close()
+        return document
     except Exception:
-        r = jsonify(
-            error='unreachable-url',
-            message='Cannot connect to given url'
-        )
-        r.status_code = 400
-        return r
+        raise DocumentNotFound
+
+
+def get_feed_links(document, url):
     try:
-        feed_links = autodiscovery(document, url)
+        return autodiscovery(document, url)
     except FeedUrlNotFoundError:
-        r = jsonify(
-            error='unreachable-feed-url',
-            message='Cannot find feed url'
-        )
-        r.status_code = 400
-        return r
-    feed_url = feed_links[0].url
-    feed_url, feed, hints = next(iter(crawl([feed_url], 1)))
-    with stage:
-        sub = category.subscribe(feed)
-        stage.subscriptions = category.subscriptionlist
-        stage.feeds[sub.feed_id] = feed
-    return list_in_category(category_id)
+        raise FeedUrlNotFoundError
 
 
 @app.route('/', methods=['POST'], defaults={'category_id': ''})

From 17994beb4616fddbca5afbc4557d28f5f1237106 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 18:50:19 +0900
Subject: [PATCH 12/32] Replace Cursor with Category in add_category

---
 earthreader/web/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index bfc87da..233f46a 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -236,12 +236,13 @@ def get_feed_links(document, url):
 @app.route('/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/', methods=['POST'])
 def add_category(category_id):
-    cursor = Cursor(category_id)
+    subscription_list = get_subscription_list()
+    category = get_category(subscription_list, category_id)
     title = request.form['title']
     outline = Category(label=title)
-    cursor.add(outline)
+    category.add(outline)
     with stage:
-        stage.subscriptions = cursor.subscriptionlist
+        stage.subscriptions = subscription_list
     return list_in_category(category_id)
 
 

From 58538ff16bb0bd5d29903a9aa8bbb57a206d28d1 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 18:52:00 +0900
Subject: [PATCH 13/32] get_parent_category_id function

---
 earthreader/web/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 233f46a..8272b15 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -112,6 +112,10 @@ def get_category_path(category_id):
     return [key[1:] for key in category_id.split('/')]
 
 
+def get_parent_category_id(category_id):
+    return '/'.join(category_id.split('/')[:-1])
+
+
 def join_category_id(base, append):
     if base:
         return base + '/-' + append

From 68c374ea25d629127ab11651bbeab563a14d7c1b Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 18:52:57 +0900
Subject: [PATCH 14/32] Replace cursor in delete_category

---
 earthreader/web/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 8272b15..8e75214 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -252,10 +252,13 @@ def add_category(category_id):
 
 @app.route('/<path:category_id>/', methods=['DELETE'])
 def delete_category(category_id):
-    cursor = Cursor(category_id, True)
-    cursor.remove(cursor.target_child)
+    subscription_list = get_subscription_list()
+    parent_category_id = get_parent_category_id(category_id)
+    parent_category = get_category(subscription_list, parent_category_id)
+    target_category = get_category(subscription_list, category_id)
+    parent_category.remove(target_category)
     with stage:
-        stage.subscriptions = cursor.subscriptionlist
+        stage.subscriptions = subscription_list
     index = category_id.rfind('/')
     if index == -1:
         return list_in_category('')

From e6df50afa5b82a8d45b8a3960f4b474417727eb6 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 19:41:43 +0900
Subject: [PATCH 15/32] SubscriptionTransaction to manage subscriptions' change

---
 earthreader/web/transaction.py | 56 ++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 earthreader/web/transaction.py

diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
new file mode 100644
index 0000000..0884d09
--- /dev/null
+++ b/earthreader/web/transaction.py
@@ -0,0 +1,56 @@
+""":mod:`earthreader.web.transaction` --- Transact subscriptions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+"""
+from libearth.subscribe import SubscriptionList
+
+from .exceptions import InvalidCategoryID
+from .stage import stage
+
+
+class SubscriptionTransaction(object):
+    """Transaction manager to manage changes of subscriptions.
+    To save changes occurred in a subscription list,
+    the outlines which are target of the changes must be derived from a single
+    :class:`libearth.subscribe.SubscriptionList`, and save the list to
+    the stage. You can get outlines through an instance of this class,
+    and save the changes.
+
+    """
+
+    def __init__(self):
+        with stage:
+            self.subscriptions = (stage.subscriptions if stage.subscriptions
+                                  else SubscriptionList())
+            self.feeds = {}
+
+    def add_feed(self, category, feed):
+        subscription = category.subscribe(feed)
+        self.feeds[subscription.feed_id] = feed
+
+    def get_parent_category(self, category_id):
+        parent_category_path = self.get_path(category_id)[:-1]
+        return self.get_category_using_path(parent_category_path)
+
+    def get_category(self, category_id):
+        return self.get_category_using_path(self.get_path(category_id))
+
+    def get_category_using_path(self, category_path):
+        category = self.subscriptions
+        for key in category_path:
+            try:
+                category = category.categories[key]
+            except KeyError:
+                raise InvalidCategoryID('The given category ID is not valid')
+        return category
+
+    def get_path(self, category_id):
+        if not category_id:
+            return []
+        return [key[1:] for key in category_id.split('/')]
+
+    def save(self):
+        with stage:
+            stage.subscriptions = self.subscriptions
+            for feed_id, feed in self.feeds.iteritems():
+                stage.feeds[feed_id] = feed

From 4922c864c1eb3b14da5cda19c7c0969b4bb58ecc Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 21:50:14 +0900
Subject: [PATCH 16/32] Reset subscriptions when save

---
 earthreader/web/transaction.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
index 0884d09..4ca17fe 100644
--- a/earthreader/web/transaction.py
+++ b/earthreader/web/transaction.py
@@ -54,3 +54,4 @@ def save(self):
             stage.subscriptions = self.subscriptions
             for feed_id, feed in self.feeds.iteritems():
                 stage.feeds[feed_id] = feed
+            self.subscriptions = stage.subscriptions

From 6e248e656af2aca5d21eaa725eae0af5e2439de7 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 21:56:10 +0900
Subject: [PATCH 17/32] Use transaction

---
 earthreader/web/__init__.py | 59 +++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 8e75214..38b573c 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -21,6 +21,7 @@
                          FeedNotFound, EntryNotFound)
 from .worker import Worker
 from .stage import stage
+from .transaction import SubscriptionTransaction
 
 
 app = Flask(__name__)
@@ -174,7 +175,7 @@ def index():
 @app.route('/feeds/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/')
 def list_in_category(category_id):
-    category = get_category(get_subscription_list(), category_id)
+    category = SubscriptionTransaction().get_category(category_id)
     feeds = []
     categories = []
     for child in category:
@@ -206,17 +207,15 @@ def get_category_data(base_category_id, category):
 @app.route('/feeds/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/', methods=['POST'])
 def add_feed(category_id):
-    subscription_list = get_subscription_list()
-    category = get_category(subscription_list, category_id)
+    transaction = SubscriptionTransaction()
+    category = transaction.get_category(category_id)
     url = request.form['url']
     document = get_document(url)
     feed_links = get_feed_links(document, url)
     feed_url = feed_links[0].url
     feed_url, feed, hints = next(iter(crawl([feed_url], 1)))
-    with stage:
-        subscription = category.subscribe(feed)
-        stage.subscriptions = subscription_list
-        stage.feeds[subscription.feed_id] = feed
+    transaction.add_feed(category, feed)
+    transaction.save()
     return list_in_category(category_id)
 
 
@@ -240,25 +239,22 @@ def get_feed_links(document, url):
 @app.route('/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/', methods=['POST'])
 def add_category(category_id):
-    subscription_list = get_subscription_list()
-    category = get_category(subscription_list, category_id)
+    transaction = SubscriptionTransaction()
+    category = transaction.get_category(category_id)
     title = request.form['title']
     outline = Category(label=title)
     category.add(outline)
-    with stage:
-        stage.subscriptions = subscription_list
+    transaction.save()
     return list_in_category(category_id)
 
 
 @app.route('/<path:category_id>/', methods=['DELETE'])
 def delete_category(category_id):
-    subscription_list = get_subscription_list()
-    parent_category_id = get_parent_category_id(category_id)
-    parent_category = get_category(subscription_list, parent_category_id)
-    target_category = get_category(subscription_list, category_id)
+    transaction = SubscriptionTransaction()
+    parent_category = transaction.get_parent_category(category_id)
+    target_category = transaction.get_category(category_id)
     parent_category.remove(target_category)
-    with stage:
-        stage.subscriptions = subscription_list
+    transaction.save()
     index = category_id.rfind('/')
     if index == -1:
         return list_in_category('')
@@ -270,14 +266,15 @@ def delete_category(category_id):
            defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/<feed_id>/', methods=['DELETE'])
 def delete_feed(category_id, feed_id):
-    cursor = Cursor(category_id)
+    transaction = SubscriptionTransaction()
+    category = transaction.get_category(category_id)
     target = None
-    for subscription in cursor:
+    for subscription in category:
         if isinstance(subscription, Subscription):
             if feed_id == subscription.feed_id:
                 target = subscription
     if target:
-        cursor.discard(target)
+        category.discard(target)
     else:
         r = jsonify(
             error='feed-not-found-in-path',
@@ -285,28 +282,28 @@ def delete_feed(category_id, feed_id):
         )
         r.status_code = 400
         return r
-    with stage:
-        stage.subscriptions = cursor.subscriptionlist
+    transaction.save()
     return list_in_category(category_id)
 
 
 @app.route('/<path:category_id>/feeds/', methods=['PUT'])
 @app.route('/feeds/', methods=['PUT'], defaults={'category_id': ''})
 def move_outline(category_id):
+    transaction = SubscriptionTransaction()
     source_path = request.args.get('from')
     if '/feeds/' in source_path:
         parent_category_id, feed_id = source_path.split('/feeds/')
-        source = Cursor(parent_category_id)
+        source = transaction.get_category(parent_category_id)
         target = None
         for child in source:
             if child.feed_id == feed_id:
                 target = child
     else:
-        source = Cursor(source_path, True)
-        target = source.target_child
+        source = transaction.get_parent_category(source_path)
+        target = transaction.get_category(source_path)
 
-    dest = Cursor(category_id)
-    if isinstance(target, Category) and target.contains(dest.value):
+    dest = transaction.get_category(category_id)
+    if isinstance(target, Category) and target.contains(dest):
         r = jsonify(
             error='circular-reference',
             message='Cannot move into child element.'
@@ -314,12 +311,10 @@ def move_outline(category_id):
         r.status_code = 400
         return r
     source.discard(target)
-    with stage:
-        stage.subscriptions = source.subscriptionlist
-    dest = Cursor(category_id)
+    transaction.save()
+    dest = transaction.get_category(category_id)
     dest.add(target)
-    with stage:
-        stage.subscriptions = dest.subscriptionlist
+    transaction.save()
     return jsonify()
 
 

From f25d822d373c7ae6033a6726d7b3e9709c64a20b Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 23:42:57 +0900
Subject: [PATCH 18/32] Replace Cursor with SubscriptionTransaction

---
 earthreader/web/__init__.py | 78 ++++---------------------------------
 1 file changed, 7 insertions(+), 71 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 38b573c..804bb01 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -53,70 +53,6 @@ def initialize():
         worker.start_worker()
 
 
-class Cursor():
-
-    def __init__(self, category_id, return_parent=False):
-        with stage:
-            self.subscriptionlist = (stage.subscriptions if stage.subscriptions
-                                     else SubscriptionList())
-        self.value = self.subscriptionlist
-        self.path = ['/']
-        self.category_id = None
-
-        target_name = None
-        self.target_child = None
-
-        try:
-            if category_id:
-                self.category_id = category_id
-                self.path = [key[1:] for key in category_id.split('/')]
-                if return_parent:
-                    target_name = self.path.pop(-1)
-                for key in self.path:
-                    self.value = self.value.categories[key]
-                if target_name:
-                    self.target_child = self.value.categories[target_name]
-        except Exception:
-            raise InvalidCategoryID('The given category ID is not valid')
-
-    def __getattr__(self, attr):
-        return getattr(self.value, attr)
-
-    def __iter__(self):
-        return iter(self.value)
-
-    def join_id(self, append):
-        if self.category_id:
-            return self.category_id + '/-' + append
-        return '-' + append
-
-
-def get_subscription_list():
-    with stage:
-        return (stage.subscriptions if stage.subscriptions
-                else SubscriptionList())
-
-
-def get_category(subscription_list, category_id):
-    category = subscription_list
-    if category_id:
-        path = get_category_path(category_id)
-        for key in path:
-            try:
-                category = category.categories[key]
-            except KeyError:
-                raise InvalidCategoryID('The given category ID is not valid')
-    return category
-
-
-def get_category_path(category_id):
-    return [key[1:] for key in category_id.split('/')]
-
-
-def get_parent_category_id(category_id):
-    return '/'.join(category_id.split('/')[:-1])
-
-
 def join_category_id(base, append):
     if base:
         return base + '/-' + append
@@ -469,7 +405,7 @@ def get_entries(self):
 @app.route('/<path:category_id>/feeds/<feed_id>/entries/')
 def feed_entries(category_id, feed_id):
     try:
-        Cursor(category_id)
+        SubscriptionTransaction().get_category(category_id)
     except InvalidCategoryID:
         r = jsonify(
             error='category-id-invalid',
@@ -634,7 +570,7 @@ def get_entries(self):
 @app.route('/entries/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/entries/')
 def category_entries(category_id):
-    cursor = Cursor(category_id)
+    category = SubscriptionTransaction().get_category(category_id)
     generator = None
     url_token, entry_after, read, starred = get_optional_args()
     if url_token:
@@ -645,7 +581,7 @@ def category_entries(category_id):
     else:
         url_token = text_type(now())
     if not generator:
-        subscriptions = cursor.recursive_subscriptions
+        subscriptions = category.recursive_subscriptions
         generator = CategoryEntryGenerator()
         if entry_after:
             id_after, time_after = entry_after.split('@')
@@ -710,8 +646,8 @@ def category_entries(category_id):
 @app.route('/<path:category_id>/entries/', methods=['PUT'])
 def update_entries(category_id, feed_id=None):
     if worker.is_running():
-        cursor = Cursor(category_id)
-        worker.add_job(cursor, feed_id)
+        category = SubscriptionTransaction().get_category(category_id)
+        worker.add_job(category, feed_id)
         r = jsonify()
         r.status_code = 202
         return r
@@ -803,8 +739,8 @@ def read_all_entries(category_id='', feed_id=None):
     if feed_id:
         feed_ids = [feed_id]
     else:
-        cursor = Cursor(category_id)
-        feed_ids = [sub.feed_id for sub in cursor.recursive_subscriptions]
+        category = SubscriptionTransaction().get_category(category_id)
+        feed_ids = [sub.feed_id for sub in category.recursive_subscriptions]
 
     try:
         codec = Rfc3339()

From 105016ec0878ff633b1d788883f1a54fc9d2f5fe Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Thu, 16 Oct 2014 23:51:45 +0900
Subject: [PATCH 19/32] PEP 8

---
 earthreader/web/exceptions.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/earthreader/web/exceptions.py b/earthreader/web/exceptions.py
index 2adbc25..d7a5a6f 100644
--- a/earthreader/web/exceptions.py
+++ b/earthreader/web/exceptions.py
@@ -53,12 +53,12 @@ class WorkerNotRunning(ValueError, JsonException):
 class DocumentNotFound(ValueError, JsonException):
     """Raised when the document is not reachable"""
 
-    error='unreachable-url',
-    message='Cannot connect to given url'
+    error = 'unreachable-url',
+    message = 'Cannot connect to given url'
 
 
 class AutodiscoveryFailed(ValueError, JsonException):
     """Raised when a feed url is not found"""
 
-    error='unreachable-feed-url',
-    message='Cannot find feed url'
+    error = 'unreachable-feed-url',
+    message = 'Cannot find feed url'

From efdb72fa79477fbed7b315a92c46458e32ee2d7b Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Fri, 17 Oct 2014 00:16:32 +0900
Subject: [PATCH 20/32] Simplify exception handling when feed not found in
 category

---
 earthreader/web/__init__.py   | 9 ++-------
 earthreader/web/exceptions.py | 7 +++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 804bb01..f516669 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -18,7 +18,7 @@
 from .wsgi import MethodRewriteMiddleware
 from .exceptions import (AutodiscoveryFailed, DocumentNotFound,
                          InvalidCategoryID, IteratorNotFound, WorkerNotRunning,
-                         FeedNotFound, EntryNotFound)
+                         FeedNotFound, FeedNotFoundInCategory, EntryNotFound)
 from .worker import Worker
 from .stage import stage
 from .transaction import SubscriptionTransaction
@@ -212,12 +212,7 @@ def delete_feed(category_id, feed_id):
     if target:
         category.discard(target)
     else:
-        r = jsonify(
-            error='feed-not-found-in-path',
-            message='Given feed does not exist in the path'
-        )
-        r.status_code = 400
-        return r
+        raise FeedNotFoundInCategory
     transaction.save()
     return list_in_category(category_id)
 
diff --git a/earthreader/web/exceptions.py b/earthreader/web/exceptions.py
index d7a5a6f..d006b89 100644
--- a/earthreader/web/exceptions.py
+++ b/earthreader/web/exceptions.py
@@ -62,3 +62,10 @@ class AutodiscoveryFailed(ValueError, JsonException):
 
     error = 'unreachable-feed-url',
     message = 'Cannot find feed url'
+
+
+class FeedNotFoundInCategory(ValueError, JsonException):
+    """Raised whan the feed does not exist in category"""
+
+    error = 'feed-not-found-in-path',
+    message = 'Given feed does not exist in the path'

From d1349f3deb71cda32157fceeba8ef901f0b9be61 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Fri, 17 Oct 2014 00:18:00 +0900
Subject: [PATCH 21/32] Add status_code field in JsonException

---
 earthreader/web/exceptions.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/earthreader/web/exceptions.py b/earthreader/web/exceptions.py
index d006b89..3f2e157 100644
--- a/earthreader/web/exceptions.py
+++ b/earthreader/web/exceptions.py
@@ -12,12 +12,13 @@ class IteratorNotFound(ValueError):
 
 class JsonException(HTTPException):
     """Base exception to return json response when raised.
-    Exceptions inherit this class must declare `error` and `message`.
+    Exceptions inherit this class must declare `error`, `message`,
+    and `status_code`.
 
     """
     def get_response(self, environ=None):
         r = jsonify(error=self.error, message=self.message)
-        r.status_code = 404
+        r.status_code = self.status_code
         return r
 
 
@@ -26,6 +27,7 @@ class InvalidCategoryID(ValueError, JsonException):
 
     error = 'category-id-invalid'
     message = 'Given category id is not valid'
+    status_code = 404
 
 
 class FeedNotFound(ValueError, JsonException):
@@ -33,6 +35,7 @@ class FeedNotFound(ValueError, JsonException):
 
     error = 'feed-not-found'
     message = 'The feed you request does not exsist'
+    status_code = 404
 
 
 class EntryNotFound(ValueError, JsonException):
@@ -40,6 +43,7 @@ class EntryNotFound(ValueError, JsonException):
 
     error = 'entry-not-found'
     message = 'The entry you request does not exist'
+    status_code = 404
 
 
 class WorkerNotRunning(ValueError, JsonException):
@@ -48,6 +52,7 @@ class WorkerNotRunning(ValueError, JsonException):
     error = 'worker-not-running'
     message = 'The worker thread that crawl feeds in background is not' \
               'running.'
+    status_code = 404
 
 
 class DocumentNotFound(ValueError, JsonException):
@@ -55,6 +60,7 @@ class DocumentNotFound(ValueError, JsonException):
 
     error = 'unreachable-url',
     message = 'Cannot connect to given url'
+    status_code = 404
 
 
 class AutodiscoveryFailed(ValueError, JsonException):
@@ -62,6 +68,7 @@ class AutodiscoveryFailed(ValueError, JsonException):
 
     error = 'unreachable-feed-url',
     message = 'Cannot find feed url'
+    status_code = 404
 
 
 class FeedNotFoundInCategory(ValueError, JsonException):
@@ -69,3 +76,4 @@ class FeedNotFoundInCategory(ValueError, JsonException):
 
     error = 'feed-not-found-in-path',
     message = 'Given feed does not exist in the path'
+    status_code = 400

From 0aaf199d91856aa85236af4e4a7ffe8cb7eca4fc Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Fri, 17 Oct 2014 00:25:17 +0900
Subject: [PATCH 22/32] typo

---
 earthreader/web/exceptions.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/earthreader/web/exceptions.py b/earthreader/web/exceptions.py
index 3f2e157..9ef49aa 100644
--- a/earthreader/web/exceptions.py
+++ b/earthreader/web/exceptions.py
@@ -19,6 +19,7 @@ class JsonException(HTTPException):
     def get_response(self, environ=None):
         r = jsonify(error=self.error, message=self.message)
         r.status_code = self.status_code
+        print r.error
         return r
 
 
@@ -58,7 +59,7 @@ class WorkerNotRunning(ValueError, JsonException):
 class DocumentNotFound(ValueError, JsonException):
     """Raised when the document is not reachable"""
 
-    error = 'unreachable-url',
+    error = 'unreachable-url'
     message = 'Cannot connect to given url'
     status_code = 404
 
@@ -66,7 +67,7 @@ class DocumentNotFound(ValueError, JsonException):
 class AutodiscoveryFailed(ValueError, JsonException):
     """Raised when a feed url is not found"""
 
-    error = 'unreachable-feed-url',
+    error = 'unreachable-feed-url'
     message = 'Cannot find feed url'
     status_code = 404
 
@@ -74,6 +75,6 @@ class AutodiscoveryFailed(ValueError, JsonException):
 class FeedNotFoundInCategory(ValueError, JsonException):
     """Raised whan the feed does not exist in category"""
 
-    error = 'feed-not-found-in-path',
+    error = 'feed-not-found-in-path'
     message = 'Given feed does not exist in the path'
     status_code = 400

From fa3eec501a9a32495d2a1be9e50d88e2cc9e4f86 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Fri, 17 Oct 2014 00:38:59 +0900
Subject: [PATCH 23/32] Simplify exception handlings

---
 earthreader/web/__init__.py   | 55 ++++++++++-------------------------
 earthreader/web/exceptions.py |  9 +++++-
 2 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index f516669..cc229dd 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -16,9 +16,10 @@
 
 from .util import autofix_repo_url, get_hash
 from .wsgi import MethodRewriteMiddleware
-from .exceptions import (AutodiscoveryFailed, DocumentNotFound,
-                         InvalidCategoryID, IteratorNotFound, WorkerNotRunning,
-                         FeedNotFound, FeedNotFoundInCategory, EntryNotFound)
+from .exceptions import (AutodiscoveryFailed, CategoryCircularReference,
+                         DocumentNotFound, InvalidCategoryID, IteratorNotFound,
+                         WorkerNotRunning, FeedNotFound, FeedNotFoundInCategory,
+                         EntryNotFound)
 from .worker import Worker
 from .stage import stage
 from .transaction import SubscriptionTransaction
@@ -235,12 +236,7 @@ def move_outline(category_id):
 
     dest = transaction.get_category(category_id)
     if isinstance(target, Category) and target.contains(dest):
-        r = jsonify(
-            error='circular-reference',
-            message='Cannot move into child element.'
-        )
-        r.status_code = 400
-        return r
+        raise CategoryCircularReference
     source.discard(target)
     transaction.save()
     dest = transaction.get_category(category_id)
@@ -399,25 +395,12 @@ def get_entries(self):
 @app.route('/feeds/<feed_id>/entries/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/<feed_id>/entries/')
 def feed_entries(category_id, feed_id):
-    try:
-        SubscriptionTransaction().get_category(category_id)
-    except InvalidCategoryID:
-        r = jsonify(
-            error='category-id-invalid',
-            message='Given category does not exist'
-        )
-        r.status_code = 404
-        return r
+    SubscriptionTransaction().get_category(category_id)
     try:
         with stage:
             feed = stage.feeds[feed_id]
     except KeyError:
-        r = jsonify(
-            error='feed-not-found',
-            message='Given feed does not exist'
-        )
-        r.status_code = 404
-        return r
+        raise FeedNotFound
     if feed.__revision__:
         updated_at = feed.__revision__.updated_at
         if request.if_modified_since:
@@ -744,23 +727,15 @@ def read_all_entries(category_id='', feed_id=None):
         last_updated = None
 
     for feed_id in feed_ids:
-        try:
-            with stage:
+        with stage:
+            try:
                 feed = stage.feeds[feed_id]
-                for entry in feed.entries:
-                    if not last_updated or entry.updated_at <= last_updated:
-                        entry.read = True
-                stage.feeds[feed_id] = feed
-        except KeyError:
-            if feed_id:
-                r = jsonify(
-                    error='feed-not-found',
-                    message='Given feed does not exist'
-                )
-                r.status_code = 404
-                return r
-            else:
-                continue
+            except KeyError:
+                raise FeedNotFound
+            for entry in feed.entries:
+                if not last_updated or entry.updated_at <= last_updated:
+                    entry.read = True
+            stage.feeds[feed_id] = feed
     return jsonify()
 
 
diff --git a/earthreader/web/exceptions.py b/earthreader/web/exceptions.py
index 9ef49aa..a26f64b 100644
--- a/earthreader/web/exceptions.py
+++ b/earthreader/web/exceptions.py
@@ -19,7 +19,6 @@ class JsonException(HTTPException):
     def get_response(self, environ=None):
         r = jsonify(error=self.error, message=self.message)
         r.status_code = self.status_code
-        print r.error
         return r
 
 
@@ -78,3 +77,11 @@ class FeedNotFoundInCategory(ValueError, JsonException):
     error = 'feed-not-found-in-path'
     message = 'Given feed does not exist in the path'
     status_code = 400
+
+
+class CategoryCircularReference(ValueError, JsonException):
+    """Raised when category structure does not make sense"""
+
+    error = 'circular-reference'
+    message = 'Cannot move into child element.'
+    status_code = 400

From 384305dc23dbf785e58abc0a21f8d9274d104e30 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Fri, 17 Oct 2014 00:39:49 +0900
Subject: [PATCH 24/32] Use items(), not iteritems()

---
 earthreader/web/transaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
index 4ca17fe..7ad1051 100644
--- a/earthreader/web/transaction.py
+++ b/earthreader/web/transaction.py
@@ -52,6 +52,6 @@ def get_path(self, category_id):
     def save(self):
         with stage:
             stage.subscriptions = self.subscriptions
-            for feed_id, feed in self.feeds.iteritems():
+            for feed_id, feed in self.feeds.items():
                 stage.feeds[feed_id] = feed
             self.subscriptions = stage.subscriptions

From 76320b8cded0884a82511cf6e550fb8d959cd3e6 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Mon, 20 Oct 2014 22:42:34 +0900
Subject: [PATCH 25/32] Rename field

---
 earthreader/web/transaction.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
index 7ad1051..25813b4 100644
--- a/earthreader/web/transaction.py
+++ b/earthreader/web/transaction.py
@@ -22,11 +22,11 @@ def __init__(self):
         with stage:
             self.subscriptions = (stage.subscriptions if stage.subscriptions
                                   else SubscriptionList())
-            self.feeds = {}
+        self.feeds_added = {}
 
     def add_feed(self, category, feed):
         subscription = category.subscribe(feed)
-        self.feeds[subscription.feed_id] = feed
+        self.feeds_added[subscription.feed_id] = feed
 
     def get_parent_category(self, category_id):
         parent_category_path = self.get_path(category_id)[:-1]
@@ -52,6 +52,6 @@ def get_path(self, category_id):
     def save(self):
         with stage:
             stage.subscriptions = self.subscriptions
-            for feed_id, feed in self.feeds.items():
+            for feed_id, feed in self.feeds_added.items():
                 stage.feeds[feed_id] = feed
             self.subscriptions = stage.subscriptions

From 8666d0bc3da6c1381cc165096b138d5f9b09a2c1 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Mon, 20 Oct 2014 23:07:22 +0900
Subject: [PATCH 26/32] Get feed from transaction

---
 earthreader/web/__init__.py    | 35 ++++++++++++----------------------
 earthreader/web/transaction.py | 11 ++++++++++-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index cc229dd..5ce67f2 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -395,12 +395,7 @@ def get_entries(self):
 @app.route('/feeds/<feed_id>/entries/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/<feed_id>/entries/')
 def feed_entries(category_id, feed_id):
-    SubscriptionTransaction().get_category(category_id)
-    try:
-        with stage:
-            feed = stage.feeds[feed_id]
-    except KeyError:
-        raise FeedNotFound
+    feed = SubscriptionTransaction().get_feed(feed_id, category_id)
     if feed.__revision__:
         updated_at = feed.__revision__.updated_at
         if request.if_modified_since:
@@ -548,7 +543,8 @@ def get_entries(self):
 @app.route('/entries/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/entries/')
 def category_entries(category_id):
-    category = SubscriptionTransaction().get_category(category_id)
+    transaction = SubscriptionTransaction()
+    category = transaction.get_category(category_id)
     generator = None
     url_token, entry_after, read, starred = get_optional_args()
     if url_token:
@@ -568,9 +564,8 @@ def category_entries(category_id):
             id_after = None
         for subscription in subscriptions:
             try:
-                with stage:
-                    feed = stage.feeds[subscription.feed_id]
-            except KeyError:
+                feed = transaction.get_feed(subscription.feed_id)
+            except FeedNotFound:
                 continue
             feed_title = text_type(feed.title)
             it = iter(feed.entries)
@@ -634,11 +629,7 @@ def update_entries(category_id, feed_id=None):
 
 
 def find_feed_and_entry(feed_id, entry_id):
-    try:
-        with stage:
-            feed = stage.feeds[feed_id]
-    except KeyError:
-        raise FeedNotFound('The feed is not reachable')
+    feed = SubscriptionTransaction().get_feed(feed_id)
     feed_permalink = get_permalink(feed)
     for entry in feed.entries:
         entry_permalink = get_permalink(entry)
@@ -714,10 +705,11 @@ def unread_entry(category_id, feed_id, entry_id):
 @app.route('/entries/read/', methods=['PUT'])
 @app.route('/<path:category_id>/entries/read/', methods=['PUT'])
 def read_all_entries(category_id='', feed_id=None):
+    transaction = SubscriptionTransaction()
     if feed_id:
         feed_ids = [feed_id]
     else:
-        category = SubscriptionTransaction().get_category(category_id)
+        category = transaction.get_category(category_id)
         feed_ids = [sub.feed_id for sub in category.recursive_subscriptions]
 
     try:
@@ -727,14 +719,11 @@ def read_all_entries(category_id='', feed_id=None):
         last_updated = None
 
     for feed_id in feed_ids:
+        feed = transaction.get_feed(feed_id)
+        for entry in feed.entries:
+            if not last_updated or entry.updated_at <= last_updated:
+                entry.read = True
         with stage:
-            try:
-                feed = stage.feeds[feed_id]
-            except KeyError:
-                raise FeedNotFound
-            for entry in feed.entries:
-                if not last_updated or entry.updated_at <= last_updated:
-                    entry.read = True
             stage.feeds[feed_id] = feed
     return jsonify()
 
diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
index 25813b4..97f4b0d 100644
--- a/earthreader/web/transaction.py
+++ b/earthreader/web/transaction.py
@@ -4,7 +4,7 @@
 """
 from libearth.subscribe import SubscriptionList
 
-from .exceptions import InvalidCategoryID
+from .exceptions import InvalidCategoryID, FeedNotFound, FeedNotFoundInCategory
 from .stage import stage
 
 
@@ -24,6 +24,15 @@ def __init__(self):
                                   else SubscriptionList())
         self.feeds_added = {}
 
+    def get_feed(self, feed_id, category_id=None):
+        if category_id:
+            self.get_category(category_id)
+        try:
+            with stage:
+                return stage.feeds[feed_id]
+        except KeyError:
+            raise FeedNotFound
+
     def add_feed(self, category, feed):
         subscription = category.subscribe(feed)
         self.feeds_added[subscription.feed_id] = feed

From 28dd713b81ddc7ca32fcd58c754c25b0fd0d4596 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Wed, 22 Oct 2014 14:32:54 +0900
Subject: [PATCH 27/32] Update feed through transaction

---
 earthreader/web/__init__.py    | 25 ++++++++++++++-----------
 earthreader/web/transaction.py |  9 ++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 5ce67f2..d55631c 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -21,7 +21,6 @@
                          WorkerNotRunning, FeedNotFound, FeedNotFoundInCategory,
                          EntryNotFound)
 from .worker import Worker
-from .stage import stage
 from .transaction import SubscriptionTransaction
 
 
@@ -682,8 +681,9 @@ def feed_entry(category_id, feed_id, entry_id):
 def read_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = True
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
 
 
@@ -694,8 +694,9 @@ def read_entry(category_id, feed_id, entry_id):
 def unread_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = False
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
 
 
@@ -723,8 +724,8 @@ def read_all_entries(category_id='', feed_id=None):
         for entry in feed.entries:
             if not last_updated or entry.updated_at <= last_updated:
                 entry.read = True
-        with stage:
-            stage.feeds[feed_id] = feed
+        transaction.update_feed(feed_id, feed)
+        transaction.save()
     return jsonify()
 
 
@@ -735,8 +736,9 @@ def read_all_entries(category_id='', feed_id=None):
 def star_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = True
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
 
 
@@ -747,6 +749,7 @@ def star_entry(category_id, feed_id, entry_id):
 def unstar_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = False
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
index 97f4b0d..136103b 100644
--- a/earthreader/web/transaction.py
+++ b/earthreader/web/transaction.py
@@ -22,7 +22,7 @@ def __init__(self):
         with stage:
             self.subscriptions = (stage.subscriptions if stage.subscriptions
                                   else SubscriptionList())
-        self.feeds_added = {}
+        self.feeds_updated = {}
 
     def get_feed(self, feed_id, category_id=None):
         if category_id:
@@ -35,7 +35,10 @@ def get_feed(self, feed_id, category_id=None):
 
     def add_feed(self, category, feed):
         subscription = category.subscribe(feed)
-        self.feeds_added[subscription.feed_id] = feed
+        self.feeds_updated[subscription.feed_id] = feed
+
+    def update_feed(self, feed_id, feed):
+        self.feeds_updated[feed_id] = feed
 
     def get_parent_category(self, category_id):
         parent_category_path = self.get_path(category_id)[:-1]
@@ -61,6 +64,6 @@ def get_path(self, category_id):
     def save(self):
         with stage:
             stage.subscriptions = self.subscriptions
-            for feed_id, feed in self.feeds_added.items():
+            for feed_id, feed in self.feeds_updated.items():
                 stage.feeds[feed_id] = feed
             self.subscriptions = stage.subscriptions

From a2164f682171e957b8bc8cd570c19fc984a3215d Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Sat, 25 Oct 2014 15:10:28 +0900
Subject: [PATCH 28/32] Revert "Update feed through transaction"

This reverts commit 28dd713b81ddc7ca32fcd58c754c25b0fd0d4596.
Subscription merging fails in certain condition in Python3
---
 earthreader/web/__init__.py    | 25 +++++++++++--------------
 earthreader/web/transaction.py |  9 +++------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index d55631c..5ce67f2 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -21,6 +21,7 @@
                          WorkerNotRunning, FeedNotFound, FeedNotFoundInCategory,
                          EntryNotFound)
 from .worker import Worker
+from .stage import stage
 from .transaction import SubscriptionTransaction
 
 
@@ -681,9 +682,8 @@ def feed_entry(category_id, feed_id, entry_id):
 def read_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = True
-    transaction = SubscriptionTransaction()
-    transaction.update_feed(feed_id, feed)
-    transaction.save()
+    with stage:
+        stage.feeds[feed_id] = feed
     return jsonify()
 
 
@@ -694,9 +694,8 @@ def read_entry(category_id, feed_id, entry_id):
 def unread_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = False
-    transaction = SubscriptionTransaction()
-    transaction.update_feed(feed_id, feed)
-    transaction.save()
+    with stage:
+        stage.feeds[feed_id] = feed
     return jsonify()
 
 
@@ -724,8 +723,8 @@ def read_all_entries(category_id='', feed_id=None):
         for entry in feed.entries:
             if not last_updated or entry.updated_at <= last_updated:
                 entry.read = True
-        transaction.update_feed(feed_id, feed)
-        transaction.save()
+        with stage:
+            stage.feeds[feed_id] = feed
     return jsonify()
 
 
@@ -736,9 +735,8 @@ def read_all_entries(category_id='', feed_id=None):
 def star_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = True
-    transaction = SubscriptionTransaction()
-    transaction.update_feed(feed_id, feed)
-    transaction.save()
+    with stage:
+        stage.feeds[feed_id] = feed
     return jsonify()
 
 
@@ -749,7 +747,6 @@ def star_entry(category_id, feed_id, entry_id):
 def unstar_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = False
-    transaction = SubscriptionTransaction()
-    transaction.update_feed(feed_id, feed)
-    transaction.save()
+    with stage:
+        stage.feeds[feed_id] = feed
     return jsonify()
diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
index 136103b..97f4b0d 100644
--- a/earthreader/web/transaction.py
+++ b/earthreader/web/transaction.py
@@ -22,7 +22,7 @@ def __init__(self):
         with stage:
             self.subscriptions = (stage.subscriptions if stage.subscriptions
                                   else SubscriptionList())
-        self.feeds_updated = {}
+        self.feeds_added = {}
 
     def get_feed(self, feed_id, category_id=None):
         if category_id:
@@ -35,10 +35,7 @@ def get_feed(self, feed_id, category_id=None):
 
     def add_feed(self, category, feed):
         subscription = category.subscribe(feed)
-        self.feeds_updated[subscription.feed_id] = feed
-
-    def update_feed(self, feed_id, feed):
-        self.feeds_updated[feed_id] = feed
+        self.feeds_added[subscription.feed_id] = feed
 
     def get_parent_category(self, category_id):
         parent_category_path = self.get_path(category_id)[:-1]
@@ -64,6 +61,6 @@ def get_path(self, category_id):
     def save(self):
         with stage:
             stage.subscriptions = self.subscriptions
-            for feed_id, feed in self.feeds_updated.items():
+            for feed_id, feed in self.feeds_added.items():
                 stage.feeds[feed_id] = feed
             self.subscriptions = stage.subscriptions

From ece5e73b0ab3b01781362b75a2d0d447f20e9ae1 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Sun, 26 Oct 2014 14:35:14 +0900
Subject: [PATCH 29/32] Revert "Revert "Update feed through transaction""

This reverts commit a2164f682171e957b8bc8cd570c19fc984a3215d.
Bug fixed in libearth-0.3
---
 earthreader/web/__init__.py    | 25 ++++++++++++++-----------
 earthreader/web/transaction.py |  9 ++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 5ce67f2..d55631c 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -21,7 +21,6 @@
                          WorkerNotRunning, FeedNotFound, FeedNotFoundInCategory,
                          EntryNotFound)
 from .worker import Worker
-from .stage import stage
 from .transaction import SubscriptionTransaction
 
 
@@ -682,8 +681,9 @@ def feed_entry(category_id, feed_id, entry_id):
 def read_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = True
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
 
 
@@ -694,8 +694,9 @@ def read_entry(category_id, feed_id, entry_id):
 def unread_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = False
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
 
 
@@ -723,8 +724,8 @@ def read_all_entries(category_id='', feed_id=None):
         for entry in feed.entries:
             if not last_updated or entry.updated_at <= last_updated:
                 entry.read = True
-        with stage:
-            stage.feeds[feed_id] = feed
+        transaction.update_feed(feed_id, feed)
+        transaction.save()
     return jsonify()
 
 
@@ -735,8 +736,9 @@ def read_all_entries(category_id='', feed_id=None):
 def star_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = True
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
 
 
@@ -747,6 +749,7 @@ def star_entry(category_id, feed_id, entry_id):
 def unstar_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = False
-    with stage:
-        stage.feeds[feed_id] = feed
+    transaction = SubscriptionTransaction()
+    transaction.update_feed(feed_id, feed)
+    transaction.save()
     return jsonify()
diff --git a/earthreader/web/transaction.py b/earthreader/web/transaction.py
index 97f4b0d..136103b 100644
--- a/earthreader/web/transaction.py
+++ b/earthreader/web/transaction.py
@@ -22,7 +22,7 @@ def __init__(self):
         with stage:
             self.subscriptions = (stage.subscriptions if stage.subscriptions
                                   else SubscriptionList())
-        self.feeds_added = {}
+        self.feeds_updated = {}
 
     def get_feed(self, feed_id, category_id=None):
         if category_id:
@@ -35,7 +35,10 @@ def get_feed(self, feed_id, category_id=None):
 
     def add_feed(self, category, feed):
         subscription = category.subscribe(feed)
-        self.feeds_added[subscription.feed_id] = feed
+        self.feeds_updated[subscription.feed_id] = feed
+
+    def update_feed(self, feed_id, feed):
+        self.feeds_updated[feed_id] = feed
 
     def get_parent_category(self, category_id):
         parent_category_path = self.get_path(category_id)[:-1]
@@ -61,6 +64,6 @@ def get_path(self, category_id):
     def save(self):
         with stage:
             stage.subscriptions = self.subscriptions
-            for feed_id, feed in self.feeds_added.items():
+            for feed_id, feed in self.feeds_updated.items():
                 stage.feeds[feed_id] = feed
             self.subscriptions = stage.subscriptions

From 28c96554c622c090b798005f38934c420c9e0007 Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Sun, 26 Oct 2014 14:47:13 +0900
Subject: [PATCH 30/32] Use transaction in request context

---
 earthreader/web/__init__.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index d55631c..6d31c41 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -6,13 +6,14 @@
 import os
 from six.moves import urllib
 
-from flask import Flask, jsonify, render_template, request, url_for
+from flask import Flask, g, jsonify, render_template, request, url_for
 from libearth.codecs import Rfc3339
 from libearth.compat import text_type
 from libearth.crawler import crawl
 from libearth.parser.autodiscovery import autodiscovery, FeedUrlNotFoundError
 from libearth.subscribe import Category, Subscription, SubscriptionList
 from libearth.tz import now, utc
+from werkzeug.local import LocalProxy
 
 from .util import autofix_repo_url, get_hash
 from .wsgi import MethodRewriteMiddleware
@@ -53,6 +54,14 @@ def initialize():
         worker.start_worker()
 
 
+@app.before_request
+def before_request():
+    g.transaction = SubscriptionTransaction()
+
+
+transaction = LocalProxy(lambda: g.transaction)
+
+
 def join_category_id(base, append):
     if base:
         return base + '/-' + append
@@ -111,7 +120,7 @@ def index():
 @app.route('/feeds/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/')
 def list_in_category(category_id):
-    category = SubscriptionTransaction().get_category(category_id)
+    category = transaction.get_category(category_id)
     feeds = []
     categories = []
     for child in category:
@@ -143,7 +152,6 @@ def get_category_data(base_category_id, category):
 @app.route('/feeds/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/', methods=['POST'])
 def add_feed(category_id):
-    transaction = SubscriptionTransaction()
     category = transaction.get_category(category_id)
     url = request.form['url']
     document = get_document(url)
@@ -175,7 +183,6 @@ def get_feed_links(document, url):
 @app.route('/', methods=['POST'], defaults={'category_id': ''})
 @app.route('/<path:category_id>/', methods=['POST'])
 def add_category(category_id):
-    transaction = SubscriptionTransaction()
     category = transaction.get_category(category_id)
     title = request.form['title']
     outline = Category(label=title)
@@ -186,7 +193,6 @@ def add_category(category_id):
 
 @app.route('/<path:category_id>/', methods=['DELETE'])
 def delete_category(category_id):
-    transaction = SubscriptionTransaction()
     parent_category = transaction.get_parent_category(category_id)
     target_category = transaction.get_category(category_id)
     parent_category.remove(target_category)
@@ -202,7 +208,6 @@ def delete_category(category_id):
            defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/<feed_id>/', methods=['DELETE'])
 def delete_feed(category_id, feed_id):
-    transaction = SubscriptionTransaction()
     category = transaction.get_category(category_id)
     target = None
     for subscription in category:
@@ -220,7 +225,6 @@ def delete_feed(category_id, feed_id):
 @app.route('/<path:category_id>/feeds/', methods=['PUT'])
 @app.route('/feeds/', methods=['PUT'], defaults={'category_id': ''})
 def move_outline(category_id):
-    transaction = SubscriptionTransaction()
     source_path = request.args.get('from')
     if '/feeds/' in source_path:
         parent_category_id, feed_id = source_path.split('/feeds/')
@@ -394,7 +398,7 @@ def get_entries(self):
 @app.route('/feeds/<feed_id>/entries/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/feeds/<feed_id>/entries/')
 def feed_entries(category_id, feed_id):
-    feed = SubscriptionTransaction().get_feed(feed_id, category_id)
+    feed = transaction.get_feed(feed_id, category_id)
     if feed.__revision__:
         updated_at = feed.__revision__.updated_at
         if request.if_modified_since:
@@ -542,7 +546,6 @@ def get_entries(self):
 @app.route('/entries/', defaults={'category_id': ''})
 @app.route('/<path:category_id>/entries/')
 def category_entries(category_id):
-    transaction = SubscriptionTransaction()
     category = transaction.get_category(category_id)
     generator = None
     url_token, entry_after, read, starred = get_optional_args()
@@ -618,7 +621,7 @@ def category_entries(category_id):
 @app.route('/<path:category_id>/entries/', methods=['PUT'])
 def update_entries(category_id, feed_id=None):
     if worker.is_running():
-        category = SubscriptionTransaction().get_category(category_id)
+        category = transaction.get_category(category_id)
         worker.add_job(category, feed_id)
         r = jsonify()
         r.status_code = 202
@@ -628,7 +631,7 @@ def update_entries(category_id, feed_id=None):
 
 
 def find_feed_and_entry(feed_id, entry_id):
-    feed = SubscriptionTransaction().get_feed(feed_id)
+    feed = transaction.get_feed(feed_id)
     feed_permalink = get_permalink(feed)
     for entry in feed.entries:
         entry_permalink = get_permalink(entry)
@@ -681,7 +684,6 @@ def feed_entry(category_id, feed_id, entry_id):
 def read_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = True
-    transaction = SubscriptionTransaction()
     transaction.update_feed(feed_id, feed)
     transaction.save()
     return jsonify()
@@ -694,7 +696,6 @@ def read_entry(category_id, feed_id, entry_id):
 def unread_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.read = False
-    transaction = SubscriptionTransaction()
     transaction.update_feed(feed_id, feed)
     transaction.save()
     return jsonify()
@@ -706,7 +707,6 @@ def unread_entry(category_id, feed_id, entry_id):
 @app.route('/entries/read/', methods=['PUT'])
 @app.route('/<path:category_id>/entries/read/', methods=['PUT'])
 def read_all_entries(category_id='', feed_id=None):
-    transaction = SubscriptionTransaction()
     if feed_id:
         feed_ids = [feed_id]
     else:
@@ -736,7 +736,6 @@ def read_all_entries(category_id='', feed_id=None):
 def star_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = True
-    transaction = SubscriptionTransaction()
     transaction.update_feed(feed_id, feed)
     transaction.save()
     return jsonify()
@@ -749,7 +748,6 @@ def star_entry(category_id, feed_id, entry_id):
 def unstar_entry(category_id, feed_id, entry_id):
     feed, _, entry, _ = find_feed_and_entry(feed_id, entry_id)
     entry.starred = False
-    transaction = SubscriptionTransaction()
     transaction.update_feed(feed_id, feed)
     transaction.save()
     return jsonify()

From bd63b2f95811a6095ca737c058ea6d9be3acc05e Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Sun, 26 Oct 2014 15:09:29 +0900
Subject: [PATCH 31/32] Index page does not need transaction

---
 earthreader/web/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 6d31c41..6e998cf 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -56,6 +56,8 @@ def initialize():
 
 @app.before_request
 def before_request():
+    if request.path == '/':
+        return
     g.transaction = SubscriptionTransaction()
 
 

From 6d2ec81ecbd9054783d5506546c018bc78be5f3b Mon Sep 17 00:00:00 2001
From: Choi Bochul <vio.bo94@gmail.com>
Date: Sun, 26 Oct 2014 15:19:01 +0900
Subject: [PATCH 32/32] Need to check request.method

---
 earthreader/web/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/earthreader/web/__init__.py b/earthreader/web/__init__.py
index 6e998cf..5016066 100644
--- a/earthreader/web/__init__.py
+++ b/earthreader/web/__init__.py
@@ -56,7 +56,7 @@ def initialize():
 
 @app.before_request
 def before_request():
-    if request.path == '/':
+    if request.path == '/' and request.method == 'GET':
         return
     g.transaction = SubscriptionTransaction()