In the API application, h.notification is included at pyramid boot time,
while h.accounts is not. This means that when the
h.notifications.Subscriptions model tries to query the database, it
explodes because there is no active session.

This change makes it possible to load h.notification and h.account in
either order.

h/__init__.py

@@ -7,13 +7,3 @@
del get_versions

__all__ = ['main']


def includeme(config):
    """Include config sections and setup Jinja."""
    config.include('.views')

    config.include('pyramid_jinja2')
    config.add_jinja2_renderer('.js')
    config.add_jinja2_renderer('.txt')
    config.add_jinja2_renderer('.html')

h/app.py

@@ -37,8 +37,13 @@ def create_app(settings):
    config.add_subscriber('h.subscribers.add_renderer_globals',
                          'pyramid.events.BeforeRender')

    config.include('.')
    config.include('.features')
    config.include('.views')

    config.include('pyramid_jinja2')
    config.add_jinja2_renderer('.js')
    config.add_jinja2_renderer('.txt')
    config.add_jinja2_renderer('.html')

    if config.registry.feature('accounts'):
        config.include('.accounts')
@@ -80,6 +85,15 @@ def create_api(settings):
    if config.registry.feature('streamer'):
        config.include('.streamer')

    if config.registry.feature('notification'):
        config.include('pyramid_jinja2')
        config.add_jinja2_renderer('.txt')
        config.add_jinja2_renderer('.html')

        # FIXME: move subscribers into .notification.subscribers so we don't
        # have to include the whole package
        config.include('.notification')

    return config.make_wsgi_app()

h/notification/models.py

@@ -4,9 +4,11 @@
from sqlalchemy.ext.declarative import declared_attr
from sqlalchemy import func, and_

from pyramid_basemodel import Base
from hem.db import get_session
from hem.interfaces import IDBSession
from horus.models import BaseModel
from pyramid_basemodel import Base
from pyramid_basemodel import Session

log = logging.getLogger(__name__)

@@ -69,4 +71,9 @@ class Subscriptions(SubscriptionsMixin, Base):


def includeme(config):
    registry = config.registry

    if not registry.queryUtility(IDBSession):
        registry.registerUtility(Session, IDBSession)

    config.scan(__name__)

h/notification/reply_template.py

@@ -30,9 +30,6 @@
def parent_values(annotation):
    if 'references' in annotation:
        parent = Annotation.fetch(annotation['references'][-1])
        if 'references' in parent:
            grandparent = Annotation.fetch(parent['references'][-1])
            parent['quote'] = grandparent['text']
        return parent
    else:
        return {}

h/notification/test/reply_template_test.py

@@ -85,7 +85,6 @@ def test_parent_values_reply():
        parent = rt.parent_values(annotation)

        assert parent['id'] == '0'
        assert 'quote' not in parent


def test_parent_values_root_annotation():
@@ -98,17 +97,6 @@ def test_parent_values_root_annotation():
        assert len(parent.items()) == 0


def test_parent_values_second_level_reply():
    """Test if it the grandparent values are filled for a second level reply"""
    with patch('h.notification.reply_template.Annotation') as mock_annotation:
        mock_annotation.fetch = MagicMock(side_effect=fake_fetch)
        annotation = store_fake_data[2]
        parent = rt.parent_values(annotation)

        assert parent['id'] == '1'
        assert parent['quote'] == store_fake_data[0]['text']


# Tests for the create_template_map function
def test_all_keys_are_there():
    """Checks for the existence of every needed key for the template"""