From a322a9060aaec543c73165291e91afe04c200a0f Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:54:10 +0000
Subject: [PATCH 1/45] Add a CachedFunction class


This class is a wrapper for a function that will cache its results until a
relevant message is emitted on the bus.

---

diff --git a/hubs/hinting.py b/hubs/hinting.py
deleted file mode 100755
index b1a8c2f..0000000
--- a/hubs/hinting.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from __future__ import unicode_literals
-
-import decorator
-
-import fedmsg.config
-
-import logging
-log = logging.getLogger('hubs.hinting')
-
-
-def hint(topics=None, categories=None, usernames=None, ubiquitous=False):
-    topics = topics or []
-    categories = categories or []
-    default_usernames = lambda x: []
-    usernames = usernames or default_usernames
-    ubiquitous = ubiquitous
-
-    @decorator.decorator
-    def wrapper(fn, *args, **kwargs):
-        return fn(*args, **kwargs)
-
-    def wrapper_wrapper(fn):
-        wrapped = wrapper(fn)
-        wrapped.hints = dict(
-            topics=topics,
-            categories=categories,
-            usernames_function=usernames,
-            ubiquitous=ubiquitous,
-        )
-        return wrapped
-
-    return wrapper_wrapper
-
-
-def prefixed(topic, prefix='org.fedoraproject'):
-    config = fedmsg.config.load_config()  # This is memoized for us.
-    return '.'.join([prefix, config['environment'], topic])
diff --git a/hubs/tests/__init__.py b/hubs/tests/__init__.py
index 2394c1e..d761381 100644
--- a/hubs/tests/__init__.py
+++ b/hubs/tests/__init__.py
@@ -35,7 +35,7 @@ class APPTest(unittest.TestCase):
         self.app = hubs.app.app.test_client()
         self.app.testing = True
         self.session = hubs.app.session
-        from hubs.widgets.base import cache
+        from hubs.widgets.caching import cache
         cache.configure(backend='dogpile.cache.null',
                         replace_existing_backend=True)
         self.populate()
diff --git a/hubs/tests/test_widget_caching.py b/hubs/tests/test_widget_caching.py
new file mode 100644
index 0000000..967db0e
--- /dev/null
+++ b/hubs/tests/test_widget_caching.py
@@ -0,0 +1,73 @@
+from __future__ import unicode_literals
+
+from hubs.widgets.caching import cache, CachedFunction
+
+from mock import Mock
+from hubs.tests import APPTest
+from hubs.models import Hub, Widget
+
+
+class DummyFunction(CachedFunction):
+
+    def __init__(self, *args, **kwargs):
+        super(DummyFunction, self).__init__(*args, **kwargs)
+        self.execute_mock = Mock()
+
+    def execute(self, *args, **kwargs):
+        return self.execute_mock(*args, **kwargs)
+
+
+class CachedFunctionTest(APPTest):
+
+    def setUp(self):
+        super(CachedFunctionTest, self).setUp()
+        # Use a memory backend, not the default null backend, or we can't test
+        # anything.
+        cache.configure(backend='dogpile.cache.memory',
+                        replace_existing_backend=True)
+        self.w_instance = Widget.query.filter(
+            Hub.name == "ralph",
+            Widget.plugin == "about",
+            ).one()
+        self.fn = DummyFunction(self.w_instance)
+        cache.delete(self.fn.get_cache_key())
+
+    def tearDown(self):
+        cache.delete(self.fn.get_cache_key())
+        super(CachedFunctionTest, self).tearDown()
+
+    def test_get_cache_key(self):
+        self.assertEqual(
+            self.fn.get_cache_key(),
+            b"%d|DummyFunction" % self.w_instance.idx
+            )
+
+    def test_result_cached(self):
+        self.fn.execute_mock.return_value = "testing"
+        result = self.fn()
+        self.fn.execute_mock.assert_called_once_with()
+        self.assertEqual(result, "testing")
+        result = self.fn()
+        self.assertEqual(result, "testing")
+        # Check it hasn't been called a second time.
+        self.fn.execute_mock.assert_called_once()
+
+    def test_is_cached(self):
+        key = self.fn.get_cache_key()
+        self.assertFalse(self.fn.is_cached())
+        cache.set(key, "testing is_cached")
+        self.assertTrue(self.fn.is_cached())
+
+    def test_invalidate(self):
+        key = self.fn.get_cache_key()
+        cache.set(key, "testing invalidate")
+        self.fn.invalidate()
+        self.assertFalse(self.fn.is_cached())
+
+    def test_rebuild(self):
+        key = self.fn.get_cache_key()
+        cache.set(key, "testing rebuild")
+        self.fn.execute_mock.return_value = "testing"
+        self.fn.rebuild()
+        self.fn.execute_mock.assert_called_once()
+        self.assertEqual(cache.get(key), "testing")
diff --git a/hubs/widgets/caching.py b/hubs/widgets/caching.py
new file mode 100644
index 0000000..2eded91
--- /dev/null
+++ b/hubs/widgets/caching.py
@@ -0,0 +1,147 @@
+"""
+Attributes:
+    cache (dogpile.cache.region.CacheRegion): The cache where function results
+        will be stored. It is configured with the `fedora-hubs.cache` key in
+        fedmsg configuration.
+"""
+from __future__ import unicode_literals
+
+import datetime
+import dogpile
+import dogpile.cache
+import fedmsg.config
+import logging
+
+log = logging.getLogger(__name__)
+
+
+def _get_cache():
+    config = fedmsg.config.load_config()
+    cache_defaults = {
+        "backend": "dogpile.cache.dbm",
+        "expiration_time": 1,  # Expire every 1 second, for development
+        "arguments": {
+            "filename": "/var/tmp/fedora-hubs-cache.db",
+        },
+    }
+    cache = dogpile.cache.make_region()
+    cache.configure(**config.get('fedora-hubs.cache', cache_defaults))
+    return cache
+
+cache = _get_cache()
+
+
+class CachedFunction(object):
+    """
+    A function that has automatic caching and invalidation features.
+
+    This class is a wrapper for a function that will cache its results until a
+    relevant message is emitted on the bus.
+
+    To use this class, you must subclass it and implement a couple methods.
+    It is instantiated by passing a widget instance (database record) as only
+    argument, which lets it access the `.config` property and act accordingly.
+
+    You must implement the `execute()` method, which must return a
+    JSON-serializable value.
+
+    You must also implement the `should_invalidate()` method, which takes the
+    bus message as only argument, and returns `True` if the cache should be
+    rebuild, `False` otherwise.
+
+    To call the function, instanciate the class and execute it. You may also
+    call the `.get_data()` method.
+
+    Args:
+        instance (hubs.models.Widget): The widget instance.
+    """
+
+    # invalidate_filter = {}
+
+    def __init__(self, instance):
+        self.instance = instance
+
+    def execute(self):
+        """
+        The function to cache.
+
+        This is the main method, it must be implemented.
+
+        Returns:
+            dict or list: A JSON-serializable value that will be cached.
+        """
+        raise NotImplementedError
+
+    def get_cache_key(self):
+        return "|".join([
+            str(self.instance.idx),
+            self.__class__.__name__,
+        ]).encode('utf-8')
+
+    def get_data(self):
+        key = self.get_cache_key()
+        # log.debug("Accessing cache key %s", key)
+        return cache.get_or_create(
+            key, lambda: self.execute())
+
+    __call__ = get_data
+
+    # def _get_topic(self, message):
+    #     return message['topic']
+
+    # def _get_category(self, message):
+    #     return message['topic'].split('.')[3]
+
+    # def pass_filter(self, message):
+    #     topic_filter = self.invalidate_filter.get("topic")
+    #     if topic_filter and self._get_topic(message) not in topic_filter:
+    #         return False
+    #     category_filter = self.invalidate_filter.get("category")
+    #     if category_filter and \
+    #             self._get_category(message) not in category_filter:
+    #         return False
+    #     return True
+
+    def should_invalidate(self, message):
+        """
+        Tell the cache invalidator if the received message should invalidate
+        this function's cache.
+
+        Args:
+            message (dict): The recieved bus message.
+
+        Returns:
+            bool: If `True`, the cache will be rebuilt.
+        """
+        # if not self._pass_filter(message):
+        #     return False
+        return True
+
+    def is_cached(self):
+        """
+        Return a boolean indicating if the function's result is currently in the cache.
+
+        Returns:
+            bool: Whether the cache currently contains the function result.
+        """
+        result = cache.get(self.get_cache_key(), ignore_expiration=True)
+        return not isinstance(result, dogpile.cache.api.NoValue)
+
+    def invalidate(self):
+        """
+        Invalidate this function's cache.
+        """
+        key = self.get_cache_key()
+        if not self.is_cached():
+            log.debug("Not deleting cache key %s.  It is absent.", key)
+            return
+        log.debug("Deleting cache key %s.", key)
+        cache.delete(key)
+
+    def rebuild(self):
+        """
+        Rebuild this function's cache.
+        """
+        self.invalidate()
+        self.instance.hub.last_refreshed = datetime.datetime.utcnow()
+        self.get_data()

From 81125b1f916295de027e835048eeb6534a00e764 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:54:10 +0000
Subject: [PATCH 2/45] Add a class for widget-specific views


---

diff --git a/hubs/widgets/chrome.py b/hubs/widgets/chrome.py
old mode 100755
new mode 100644
index b869094..cc9b4ca
--- a/hubs/widgets/chrome.py
+++ b/hubs/widgets/chrome.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from hubs.widgets.base import wraps
+from functools import wraps
 from hubs.widgets import templating
 
 _panel_template = templating.environment.get_template(
@@ -9,8 +9,9 @@ _panel_heading_template = templating.environment.get_template(
     'templates/panel_heading.html')
 
 
+# FIXME: replace with template block extension
 def panel(title=None, klass="panel-default", key=None, footer_template=None):
-    def decorator(func):
+    def decorator(view, func):
         @wraps(func)
         def inner(*args, **kwargs):
             heading = ''
@@ -18,7 +19,8 @@ def panel(title=None, klass="panel-default", key=None, footer_template=None):
             if title:
                 heading = _panel_heading_template.render(title=title)
             if footer_template:
-                footer = footer_template.render(**kwargs)
+                footer = templating.environment.get_template(
+                    footer_template).render(**kwargs)
             content = func(*args, **kwargs)
             if key and not kwargs.get(key):
                 return content
diff --git a/hubs/widgets/view.py b/hubs/widgets/view.py
new file mode 100644
index 0000000..f6f486a
--- /dev/null
+++ b/hubs/widgets/view.py
@@ -0,0 +1,111 @@
+from __future__ import unicode_literals, absolute_import
+
+import flask
+from flask.views import View
+
+
+class WidgetView(View):
+    """
+    This class is the skeleton of a widget-specific view.
+
+    You must subclass this class to use it in your view:
+
+    - the `name` attribute must be defined
+    - the `template_name` attribute must be defined, or the `get_template()`
+      method must be implemented
+    - the `get_context()` method must be implemented
+
+    Every widget must have a view with the name "`root`" registered to `['/']`,
+    which will be the main entry point for the widget.
+
+    The resulting endpoint will be composed using the widget name and the view
+    name as `<widget_name>_<view_name>`, for example `meetings_root`.
+    Remember that when you want to reverse the URL with `url_for`.
+
+    When reversing the URL, you need to pass the ``hub`` and ``idx`` kwargs,
+    which are respectively the hub name (`Hub.name`) and the widget instance
+    (the database record) primary key (`Widget.idx`).
+
+    Attributes:
+        name (str): The view name. It will be used to compose the URL endpoint,
+            following the "`<widget.name>_<view.name>`" convention.
+        url_rules (list): A list of URL rules that this view must be registered
+            for (like the `rule` parameter of Flask's `add_url_rule()`).
+        template_name (str): The template name to use for this view. It will be
+            looked for in the widget's template environment.
+        chrome (function): An optional chrome template wrapper.
+
+    This class is Flask-specific. If another framework were to be switched to,
+    it would have to be re-implemented.
+    """
+
+    name = None
+    url_rules = []
+    template_name = None
+    chrome = None
+
+    def __init__(self, widget):
+        """
+        Args:
+            widget (hubs.widgets.base.Widget): the widget that uses this view.
+        """
+        self.widget = widget
+        if self.name is None:
+            raise NotImplementedError
+
+    def get_context(self, instance, *args, **kwargs):
+        """
+        Return the template context for this view.
+
+        Args:
+            instance (hubs.models.Widget): the widget instance.
+        """
+        raise NotImplementedError
+
+    def get_template(self):
+        """
+        Return the template object, looking for `template_name` in the widget's
+        template environment.
+        """
+        if self.template_name is None:
+            return NotImplementedError
+        tpl_env = self.widget.get_template_environment()
+        template = tpl_env.get_template(self.template_name)
+        return template
+
+    def get_extra_context(self, instance, *args, **kwargs):
+        """
+        Add extra data to the template context.
+        """
+        # Put source links in all API results
+        return {
+            'source_url': flask.url_for(
+                'widget_source', name=self.widget.name),
+            'widget_url': flask.url_for(
+                '%s_root' % self.widget.name,
+                hub=instance.hub.name, idx=instance.idx),
+            'edit_url': flask.url_for(
+                'widget_edit', hub=instance.hub.name, idx=instance.idx),
+            'widget': self.widget,
+            'widget_instance': instance,
+        }
+
+    def _get_instance(self, *args, **kwargs):
+        from hubs.views.utils import get_widget_instance
+        hubname = kwargs.pop("hub")
+        widgetidx = kwargs.pop("idx")
+        return get_widget_instance(hubname, widgetidx)
+
+    def dispatch_request(self, *args, **kwargs):
+        """
+        The `dispatch_request` method that subclasses of `flask.views.View`
+        must implement. It binds the other methods together.
+        """
+        instance = self._get_instance(*args, **kwargs)
+        context = self.get_context(instance, *args, **kwargs)
+        context.update(self.get_extra_context(instance, *args, **kwargs))
+        template = self.get_template()
+        if self.chrome is None:
+            return self.get_template().render(**context)
+        else:
+            return self.chrome(template.render)(**context)

From b96f6eee158de1599ab70a74b2422ca7dbb8962f Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:54:10 +0000
Subject: [PATCH 3/45] Create a base class for widgets


---

diff --git a/hubs/tests/test_widget_base.py b/hubs/tests/test_widget_base.py
new file mode 100644
index 0000000..fd6b3b3
--- /dev/null
+++ b/hubs/tests/test_widget_base.py
@@ -0,0 +1,110 @@
+from __future__ import unicode_literals
+
+from hubs.widgets.base import Widget
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.view import WidgetView
+
+from mock import Mock
+from hubs.tests import APPTest
+#import hubs.models
+
+
+class TestingWidget(Widget):
+    name = "testing"
+
+class TestingView(WidgetView):
+    name = "root"
+
+class TestingFunction(CachedFunction):
+    pass
+
+
+class WidgetTest(APPTest):
+
+    def setUp(self):
+        super(WidgetTest, self).setUp()
+        # Backup the URL map
+        self._old_url_map = (
+            self.app.application.url_map._rules[:],
+            self.app.application.url_map._rules_by_endpoint.copy()
+            )
+
+    def tearDown(self):
+        # Restore the URL map
+        self.app.application.url_map._rules = self._old_url_map[0]
+        self.app.application.url_map._rules_by_endpoint = self._old_url_map[1]
+        super(WidgetTest, self).tearDown()
+
+    def test_validate(self):
+        class LocalTestWidget(Widget):
+            views = {}
+            def get_views(self):
+                return self.views
+        test_widget = LocalTestWidget()
+        self.assertRaisesRegexp(
+            AttributeError, '.* "name" .*', test_widget.validate)
+        test_widget.name = "învalid næme"
+        self.assertRaisesRegexp(
+            AttributeError, '^Invalid widget name: ', test_widget.validate)
+        test_widget.name = "localtest"
+        self.assertRaisesRegexp(
+            AttributeError, '.* "position" .*', test_widget.validate)
+        test_widget.position = "invalid"
+        self.assertRaisesRegexp(
+            AttributeError, '.* "position" .*', test_widget.validate)
+        test_widget.position = "both"
+        self.assertRaisesRegexp(
+            AttributeError, '.* "root" .*', test_widget.validate)
+        test_widget.views["root"] = Mock()
+        test_widget.views["root"].url_rules = ["/invalid"]
+        self.assertRaisesRegexp(
+            AttributeError, '.* "/" .*', test_widget.validate)
+        test_widget.views["root"].url_rules = ["/"]
+        try:
+            test_widget.validate()
+        except AttributeError as e:
+            self.fail(e)
+
+    def test_list_views(self):
+        testing_widget = TestingWidget()
+        self.assertEqual(
+            testing_widget.get_views(),
+            {"root": TestingView}
+            )
+
+    def test_list_functions(self):
+        testing_widget = TestingWidget()
+        self.assertEqual(
+            testing_widget.get_cached_functions(),
+            {"TestingFunction": TestingFunction}
+            )
+
+    def test_list_views(self):
+        class TestView1(WidgetView):
+            name = "root"
+            url_rules = ["/", "/test-1/"]
+        class TestView2(WidgetView):
+            name = "test2"
+            url_rules = ["/test-2"]
+        testing_widget = TestingWidget()
+        testing_widget.get_views = Mock()
+        testing_widget.get_views.return_value = {
+            "root": TestView1(testing_widget),
+            "test2": TestView2(testing_widget),
+        }
+        testing_widget.register_routes(self.app.application)
+        # TestView1
+        self.assertIn("testing_root",
+                      self.app.application.url_map._rules_by_endpoint)
+        self.assertIn("testing_root", self.app.application.view_functions)
+        rules = list(self.app.application.url_map.iter_rules(endpoint="testing_root"))
+        self.assertEqual(len(rules), 2)
+        self.assertEqual(rules[0].rule, "/<hub>/w/testing/<int:idx>/")
+        self.assertEqual(rules[1].rule, "/<hub>/w/testing/<int:idx>/test-1/")
+        # TestView2
+        self.assertIn("testing_test2",
+                      self.app.application.url_map._rules_by_endpoint)
+        self.assertIn("testing_test2", self.app.application.view_functions)
+        rules = list(self.app.application.url_map.iter_rules(endpoint="testing_test2"))
+        self.assertEqual(len(rules), 1)
+        self.assertEqual(rules[0].rule, "/<hub>/w/testing/<int:idx>/test-2")
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
old mode 100755
new mode 100644
index 581532e..ecccf46
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -1,117 +1,129 @@
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import
 
 import collections
-import datetime
-import functools
-import hashlib
-import json
-import sys
+import logging
+import re
 
-import dogpile.cache
-import flask
-import six.moves.urllib_parse
+from importlib import import_module
+from .caching import CachedFunction
+from .view import WidgetView
 
-import fedmsg.config
 
-import logging
 log = logging.getLogger(__name__)
 
-config = fedmsg.config.load_config()
-cache_defaults = {
-    "backend": "dogpile.cache.dbm",
-    "expiration_time": 1,  # Expire every 1 second, for development
-    "arguments": {
-        "filename": "/var/tmp/fedora-hubs-cache.db",
-    },
-}
-cache = dogpile.cache.make_region()
-cache.configure(**config.get('fedora-hubs.cache', cache_defaults))
-
-
 Argument = collections.namedtuple(
-    'Argument', ('name', 'default', 'validator', 'help'))
-
-
-def argument(name, default, validator, help):
-    def decorator(func):
-        @wraps(func)
-        def inner(*args, **kwargs):
-            return func(*args, **kwargs)
-
-        inner.widget_arguments.append(Argument(name, default, validator, help))
-        return inner
-    return decorator
-
-
-def AGPLv3(name):
-    def decorator(func):
-        @wraps(func)
-        def inner(session, widget, *args, **kwargs):
-            result = func(session, widget, *args, **kwargs)
-            result['source_url'] = flask.url_for('widget_source', name=name)
-            result['widget_url'] = flask.url_for(
-                'widget_render', hub=widget.hub.name, idx=widget.idx)
-            result['edit_url'] = flask.url_for(
-                'widget_edit', hub=widget.hub.name, idx=widget.idx)
-            result['widget'] = widget
-            return result
-
-        return inner
-    return decorator
-
-
-def smartcache(func):
-    @wraps(func)
-    def inner(session, widget, *args, **kwargs):
-        key = cache_key_generator(widget, *args, **kwargs)
-        creator = lambda: func(session, widget, *args, **kwargs)
-        #log.debug("Accessing cache key %s", key)
-        return cache.get_or_create(key, creator)
+    'Argument', ('name', 'label', 'default', 'validator', 'help'))
 
-    return inner
 
-
-def invalidate_cache(widget, *args, **kwargs):
-    key = cache_key_generator(widget, *args, **kwargs)
-
-    value = cache.get(key, ignore_expiration=True)
-    if isinstance(value, dogpile.cache.api.NoValue):
-        log.debug("Not deleting cache key %s.  It is absent.", key)
-        return
-
-    widget.hub.last_refreshed = datetime.datetime.utcnow()
-    log.debug("Deleting cache key %s.", key)
-    cache.delete(key)
-
-
-def cache_key_generator(widget, *args, **kwargs):
-    return "|".join([
-        str(widget.idx),
-        json.dumps(args),
-        json.dumps(kwargs),
-    ]).encode('utf-8')
-
-
-def wraps(original):
-    @functools.wraps(original)
-    def decorator(subsequent):
-        subsequent = functools.wraps(original)(subsequent)
-        subsequent.widget_arguments = getattr(original, 'widget_arguments', [])
-        return subsequent
-    return decorator
-
-
-def widget_route(**options):
-    """Register a view for the current widget.
-
-    This decorator can be used to expose a specific function below a widget's
-    URL endpoint. Refer to the "Widget-specific views" section in the
-    documentation to learn how to construct the corresponding URL.
+class Widget(object):
+    """
+    The main widget class, you must subclass it to create a widget.
+
+    Args:
+        name (str): The widget name. It will not be displayed in the UI, but
+            will appear in some URLs, so be careful to only use simple,
+            URL-compatible characters.
+        position (str): The position of the widget in the rendered page. It
+            should be one of the following values: 'left', 'right', or 'both'.
+        arguments (list): A list of dictionaries that describe a widget's
+            configuration. See `hubs.widgets.base.Argument`.
     """
-    def decorator(func):
-        options["view_func_name"] = func.__name__
-        mdict = sys.modules[func.__module__].__dict__
-        mroutes = mdict.setdefault('ROUTES', [])
-        mroutes.append(options)
-        return func
-    return decorator
+
+    name = None
+    position = None
+    arguments = []
+
+    def validate(self):
+        """Ensure that the widget has the bits it needs."""
+        if self.name is None:
+            raise AttributeError('Widgets must have a "name" attribute')
+        if not re.match('^[\w_.-]+$', self.name):
+            raise AttributeError(
+                'Invalid widget name: %r. ' % self.name +
+                'Please use URL-compatible characters.')
+        if self.position not in ['left', 'right', 'both']:
+            raise AttributeError(
+                '%r\'s "position" is not: `left`, `right` or `both`'
+                % self.name)
+        root_view = self.get_views().get("root")
+        if root_view is None:
+            raise AttributeError(
+                'Widgets must have a "root" view, please refer to the '
+                'documentation.')
+        if "/" not in root_view.url_rules:
+            raise AttributeError(
+                'The root view must be registered for the "/" URL rule.')
+
+    def get_arguments(self):
+        return [Argument(**arg) for arg in self.arguments]
+
+    def get_template_environment(self):
+        """
+        Get the template environment that widget-specific views will use.
+        """
+        # We may have widget-specific template environment one day
+        # (when widget templates are stored in the widget's directory
+        # instead of a common widget template directory).
+        # When that happens, it should be cached in a Widget attribute.
+        from hubs.widgets.templating import environment
+        return environment
+
+    def _get_local_subclasses(self, parent_class):
+        """
+        Returns the subclasses of the `parent_class` defined in this widget's
+        Python module.
+        """
+        result = []
+        widget_module = import_module(self.__module__)
+        for objname in dir(widget_module):
+            obj = getattr(widget_module, objname)
+            if type(obj) != type(object):
+                continue  # we only look for classes
+            if not issubclass(obj, parent_class):
+                continue  # we only want subclasses of the parent_class
+            if obj.__module__ != self.__module__:
+                # we don't want locally imported classes (like the
+                # parent_class itself)
+                continue
+            result.append(obj)
+        return result
+
+    def get_views(self):
+        """
+        Returns:
+            dict: A dictionary of the widget-specific views, indexed by their
+                `name` attribute.
+        """
+        return dict([
+            (view.name, view) for view in
+            self._get_local_subclasses(WidgetView)
+            ])
+
+    def register_routes(self, app):
+        """
+        Register the widget-specific views in the web framework.
+
+        Args:
+            app (flask.Flask): The Flask application to register the views
+                with.
+
+        This function is Flask-specific.
+        """
+        for view_name, view_class in self.get_views().items():
+            endpoint = "%s_%s" % (self.name, view_name)
+            view_func = view_class.as_view(endpoint, self)
+            for url_rule in view_class.url_rules:
+                rule = "/<hub>/w/%s/<int:idx>/%s" % (
+                    self.name, url_rule.lstrip("/"))
+                app.add_url_rule(rule, view_func=view_func)
+
+    def get_cached_functions(self):
+        """
+        Returns:
+            dict: A dictionary of the widget's cached functions, indexed by
+                their class name.
+        """
+        result = {}
+        for fn_class in self._get_local_subclasses(CachedFunction):
+            result[fn_class.__name__] = fn_class
+        return result

From c178b3e690b989153cbc0572c0c78b30eba211dd Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:54:10 +0000
Subject: [PATCH 4/45] Create a widget registry class


---

diff --git a/hubs/app.py b/hubs/app.py
old mode 100755
new mode 100644
index 60981cf..0e81a8d
--- a/hubs/app.py
+++ b/hubs/app.py
@@ -104,5 +104,12 @@ def check_auth():
     else:
         flask.g.auth = munch.Munch(logged_in=False)
 
+# Register widgets
+import hubs.widgets
+hubs.widgets.registry.register_list(app.config["WIDGETS"])
 
+# Register routes
 import hubs.views
+
+# Add widget-specific routes
+hubs.widgets.registry.register_routes(app)
diff --git a/hubs/default_config.py b/hubs/default_config.py
old mode 100755
new mode 100644
index e540ad9..be038ad
--- a/hubs/default_config.py
+++ b/hubs/default_config.py
@@ -32,3 +32,29 @@ OIDC_SCOPES = [
 # TODO - instead of 'develop', use the version from pkg_resources to figure out
 #        the right tag to link people to.  AGPL ftw.
 SOURCE_URL = 'https://pagure.io/fedora-hubs/blob/develop/f'  # /hubs/widgets/badges.py'
+
+
+WIDGETS = [
+    'hubs.widgets.dummy.Dummy',
+    'hubs.widgets.stats.Stats',
+    'hubs.widgets.rules.Rules',
+    'hubs.widgets.sticky.Sticky',
+    'hubs.widgets.about.About',
+    'hubs.widgets.badges.Badges',
+    'hubs.widgets.library.Library',
+    'hubs.widgets.linechart.Linechart',
+    'hubs.widgets.fedmsgstats.FedmsgStats',
+    'hubs.widgets.feed.Feed',
+    'hubs.widgets.subscriptions.Subscriptions',
+    'hubs.widgets.meetings.Meetings',
+    'hubs.widgets.pagure_pr.PagurePRs',
+    'hubs.widgets.github_pr.GitHubPRs',
+    'hubs.widgets.pagureissues.PagureIssues',
+    'hubs.widgets.githubissues.GitHubIssues',
+    'hubs.widgets.bugzilla.Bugzilla',
+    'hubs.widgets.fhosted.FedoraHosted',
+    'hubs.widgets.memberships.Memberships',
+    'hubs.widgets.contact.Contact',
+    'hubs.widgets.workflow.pendingacls.PendingACLs',
+    'hubs.widgets.workflow.updates2stable.Updates2Stable',
+    ]
diff --git a/hubs/tests/test_widget_routes.py b/hubs/tests/test_widget_routes.py
deleted file mode 100644
index 7eae714..0000000
--- a/hubs/tests/test_widget_routes.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from __future__ import unicode_literals
-
-import hubs.widgets
-
-from mock import Mock
-from hubs.models import Hub, Widget
-from hubs.tests import APPTest
-
-class WidgetRoutesTest(APPTest):
-
-    def setUp(self):
-        super(WidgetRoutesTest, self).setUp()
-        # Backup the URL map
-        self._old_url_map = (
-            self.app.application.url_map._rules[:],
-            self.app.application.url_map._rules_by_endpoint.copy()
-            )
-
-    def tearDown(self):
-        for module in hubs.widgets.registry.values():
-            if hasattr(module, 'ROUTES'):
-                delattr(module, 'ROUTES')
-        # Restore the URL map
-        self.app.application.url_map._rules = self._old_url_map[0]
-        self.app.application.url_map._rules_by_endpoint = self._old_url_map[1]
-        super(WidgetRoutesTest, self).tearDown()
-
-    def test_routes_variable(self):
-        calls = []
-        def mock_view(*args, **kw):
-            calls.append({'args': args, 'kw': kw})
-            return ''
-        mock_view.__module__ = 'hubs.widgets.contact'
-        hubs.widgets.contact.mock_view = mock_view
-        hubs.widgets.contact.ROUTES = [{
-            'rule': 'dummy-url',
-            'endpoint': 'dummy-endpoint',
-            'view_func_name': 'mock_view',
-        }]
-        hubs.views._load_widget_views()
-        added_rules = list(
-            self.app.application.url_map.iter_rules(
-                endpoint='contact_dummy-endpoint')
-            )
-        self.assertEqual(len(added_rules), 1)
-        self.assertEqual(
-            added_rules[0].rule,
-            '/<hub>/<int:idx>/widget/dummy-url'
-            )
-        widget = self.session.query(Widget).filter_by(
-            plugin="contact").first()
-        self.app.get('/%s/%s/widget/dummy-url'
-                     % (widget.hub.name, widget.idx))
-        self.assertEqual(len(calls), 1)
-        # Check arguments: session and widget
-        self.assertEqual(calls[0]["args"][0].__class__, self.session.__class__)
-        self.assertEqual(calls[0]["args"][1], widget)
-
-    def test_decorator(self):
-        def mock_view(*args, **kw):
-            return ''
-        mock_view.__module__ = 'hubs.widgets.feed'
-        hubs.widgets.feed.mock_view = hubs.widgets.base.widget_route(
-            rule='dummy-url', endpoint='dummy-endpoint')(mock_view)
-        self.assertEqual(
-            hubs.widgets.feed.ROUTES,
-            [{'view_func_name': 'mock_view',
-              'endpoint': 'dummy-endpoint',
-              'rule': 'dummy-url'}]
-            )
diff --git a/hubs/views/__init__.py b/hubs/views/__init__.py
index 54f6bd1..1c97db4 100644
--- a/hubs/views/__init__.py
+++ b/hubs/views/__init__.py
@@ -6,45 +6,3 @@ from .widget import *
 from .user import *
 from .api import *
 from .plus_plus import *
-
-#
-# Add widget-specific routes
-#
-
-import flask
-import functools
-import hubs.models
-import hubs.widgets
-from sqlalchemy.orm.exc import NoResultFound
-from hubs.app import app, session
-from .utils import get_widget
-
-def _widget_view_decorator(func):
-    """
-    This internal decorator will edit the view function arguments.
-
-    It will:
-    - remove the hub name and the widget primary key
-    - add the database session and the widget instance
-    """
-    @functools.wraps(func)
-    def inner(*args, **kwargs):
-        hubname = kwargs.pop("hub")
-        widgetidx = kwargs.pop("idx")
-        widget = get_widget(hubname, widgetidx)
-        return func(session, widget, *args, **kwargs)
-    return inner
-
-def _load_widget_views():
-    for name, module in hubs.widgets.registry.items():
-        for params in getattr(module, 'ROUTES', []):
-            params["rule"] = "/<hub>/<int:idx>/widget/" \
-                             + params["rule"].lstrip("/")
-            if not params.get("endpoint"):
-                params["endpoint"] = params["view_func_name"]
-            params["endpoint"] = "%s_%s" % (name, params["endpoint"])
-            params["view_func"] = _widget_view_decorator(
-                getattr(module, params.pop("view_func_name")))
-            app.add_url_rule(**params)
-
-_load_widget_views()
diff --git a/hubs/widgets/__init__.py b/hubs/widgets/__init__.py
old mode 100755
new mode 100644
index 95253e7..6d5f257
--- a/hubs/widgets/__init__.py
+++ b/hubs/widgets/__init__.py
@@ -1,132 +1,10 @@
+"""
+Attributes:
+    registry (dict): This dictionary is a registry of available widgets in
+        Fedora Hubs.
+"""
 from __future__ import unicode_literals
 
-from hubs.widgets import dummy
-from hubs.widgets import stats
-from hubs.widgets import rules
-from hubs.widgets import sticky
-from hubs.widgets import about
-from hubs.widgets import badges
-from hubs.widgets import library
-from hubs.widgets import linechart
-from hubs.widgets import fedmsgstats
-from hubs.widgets import feed
-from hubs.widgets import subscriptions
-from hubs.widgets import meetings
-from hubs.widgets import pagure_pr
-from hubs.widgets import github_pr
-from hubs.widgets import pagureissues
-from hubs.widgets import githubissues
-from hubs.widgets import bugzilla
-from hubs.widgets import fhosted
-from hubs.widgets import memberships
-from hubs.widgets import contact
+from .registry import WidgetRegistry
 
-from hubs.widgets.workflow import pendingacls
-from hubs.widgets.workflow import updates2stable
-
-from hubs.widgets.base import AGPLv3, smartcache
-
-registry = {
-    'dummy': dummy,
-    'stats': stats,
-    'rules': rules,
-    'sticky': sticky,
-    'about': about,
-    'badges': badges,
-    'library': library,
-    'linechart': linechart,
-    'fedmsgstats': fedmsgstats,
-    'feed': feed,
-    'subscriptions': subscriptions,
-    'meetings': meetings,
-    'pagure_pr': pagure_pr,
-    'github_pr': github_pr,
-    'pagureissues': pagureissues,
-    'githubissues': githubissues,
-    'bugzilla': bugzilla,
-    'fedorahosted': fhosted,
-    'memberships': memberships,
-    'contact': contact,
-
-    'workflow.pendingacls': pendingacls,
-    'workflow.updates2stable': updates2stable,
-}
-
-
-def validate_registry(registry):
-    """ Ensure that the widgets in the registry have the bits they need.
-
-    - Check that a template is available and has a render callable.
-    - Look for a data function, etc..
-    """
-    for name, module in registry.items():
-        if not hasattr(module, 'template'):
-            raise AttributeError('%r has no "template"' % module)
-        if not hasattr(module.template, 'render'):
-            raise AttributeError('%r\'s template has no "render"' % module)
-        if not callable(module.template.render):
-            raise TypeError('%r\'s template.render not callable' % module)
-
-        if not hasattr(module, 'position'):
-            raise AttributeError('%r has not "position" function' % module)
-        if module.position not in ['left', 'right', 'both']:
-            raise TypeError(
-                '%r\'s "position" is not: `left`, `right` or `both`'
-                % module)
-
-        if not hasattr(module, 'data'):
-            raise AttributeError('%r has not "data" function' % module)
-        if not callable(module.data):
-            raise TypeError('%r\'s "data" is not callable' % module)
-
-        if hasattr(module, 'chrome'):
-            if not callable(module.chrome):
-                raise TypeError('%r\'s "chrome" is not callable' % module)
-
-
-def prepare_registry(registry):
-    """ Do things ahead of time that we can to the registry.
-
-    - Wrap a cache layer around the data functions.
-    - Wrap any chrome around the render functions.
-    """
-    for name, module in registry.items():
-        # Wrap chrome around the render function
-        module.render = module.template.render
-        if hasattr(module, 'chrome'):
-            module.render = module.chrome(module.render)
-
-        # Put source links in all API results
-        module.data = AGPLv3(name)(module.data)
-
-        # Wrap the data functions in a cache layer to be invalidated by fedmsg
-        # TODO -- we could just do this with a decorator to be explicit..
-        module.data = smartcache(module.data)
-
-
-validate_registry(registry)
-prepare_registry(registry)
-
-
-def get_site_vars():
-    import flask
-    return dict(
-        session=flask.app.session,
-        g=flask.g,
-        url_for=flask.url_for,
-    )
-
-
-def render(module, session, widget, *args, **kwargs):
-    """ Main API entry point.
-
-    Call this to render a widget into HTML
-    """
-    # The API returns exactly this data.  Shared cache
-    data = module.data(session, widget, *args, **kwargs)
-
-    # Also expose some site-level info to the widget here at render-time
-    data.update(get_site_vars())
-
-    # Use the API data to fill out a template, and potentially decorate it.
-    return module.render(**data)
+registry = WidgetRegistry()
diff --git a/hubs/widgets/registry.py b/hubs/widgets/registry.py
new file mode 100644
index 0000000..006eced
--- /dev/null
+++ b/hubs/widgets/registry.py
@@ -0,0 +1,68 @@
+from __future__ import unicode_literals
+
+from importlib import import_module
+from six.moves import UserDict
+from hubs.widgets.base import Widget
+
+
+class WidgetRegistry(UserDict):
+    """
+    The widget registry.
+
+    It behaves like a dictionary where widget names are keys and widget class
+    instances are values.  There are additional methods to register widgets and
+    widget-specific routes.
+    """
+
+    def register_list(self, widget_list):
+        """
+        Register a list of widget class paths.
+
+        Args:
+            widget_list (list): List of Python paths to widget classes that
+                must be registered.
+        """
+        for widget_path in widget_list:
+            self.register(widget_path)
+
+    def register(self, widget_path):
+        """
+        Register a widget.
+
+        Args:
+            widget_path (str): Python path to the subclass of
+                `hubs.widgets.base.Widget`.
+        """
+        mod_path, _, cls_name = widget_path.rpartition('.')
+        mod = import_module(mod_path)
+        try:
+            widget_class = getattr(mod, cls_name)
+        except AttributeError:
+            raise ValueError("Can't find widget %s" % widget_path)
+        if not issubclass(widget_class, Widget):
+            raise ValueError(
+                "Widget %s must be a subclass of %s.Widget"
+                % (widget_path, Widget.__module__))
+        widget = widget_class()
+        if not widget.name:
+            prefix = 'hubs.widgets.'
+            if widget_path.startswith(prefix):
+                widget.name = widget_path[len(prefix):]
+            else:
+                widget.name = widget_path
+        widget.validate()
+        self.data[widget.name] = widget
+
+    def register_routes(self, app):
+        """
+        Register widget-specific routes with the provided app.
+
+        This is not done automatically to allow widgets to be registered
+        without instantiating the Flask application.
+
+        Args:
+            app (flask.Flask): The Flask application to register the views
+                with.
+        """
+        for widget in self.values():
+            widget.register_routes(app)
diff --git a/populate.py b/populate.py
index d4b262d..503b0e9 100755
--- a/populate.py
+++ b/populate.py
@@ -6,12 +6,24 @@ from __future__ import unicode_literals
 import json
 
 import hubs.models
+import hubs.widgets
 
 import fedmsg.config
 fedmsg_config = fedmsg.config.load_config()
 
 session = hubs.models.init(fedmsg_config['hubs.sqlalchemy.uri'], True, True)
 
+# Register widgets we will use
+hubs.widgets.registry.register_list([
+    "hubs.widgets.contact.Contact",
+    "hubs.widgets.stats.Stats",
+    "hubs.widgets.rules.Rules",
+    "hubs.widgets.meetings.Meetings",
+    "hubs.widgets.about.About",
+    "hubs.widgets.sticky.Sticky",
+    "hubs.widgets.dummy.Dummy",
+    ])
+
 users = ['mrichard', 'duffy', 'ryanlerch', 'gnokii', 'nask0',
          'abompard', 'decause', 'ralph', 'lmacken', 'croberts', 'mattdm',
          'pravins', 'keekri', 'linuxmodder', 'bee2502', 'jflory7']

From eb85faa6512dcc5a63cbdd22909b9da85ccf503a Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:54:10 +0000
Subject: [PATCH 5/45] Adapt the models to the new widget class


---

diff --git a/hubs/models.py b/hubs/models.py
old mode 100755
new mode 100644
index 63fbcb1..d322437
--- a/hubs/models.py
+++ b/hubs/models.py
@@ -30,6 +30,7 @@ import os
 import random
 
 import bleach
+import dogpile
 import sqlalchemy as sa
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
@@ -292,10 +293,11 @@ class Hub(BASE):
 
 
 def _config_default(context):
-    plugin_name = context.current_parameters['plugin']
-    plugin = hubs.widgets.registry[plugin_name]
-    arguments = getattr(plugin.data, 'widget_arguments', [])
-    return json.dumps(dict([(arg.name, arg.default) for arg in arguments]))
+    widget_name = context.current_parameters['plugin']
+    widget = hubs.widgets.registry[widget_name]
+    return json.dumps(dict([
+        (arg.name, arg.default) for arg in widget.get_arguments()
+        ]))
 
 
 class Widget(BASE):
@@ -334,8 +336,11 @@ class Widget(BASE):
     def __json__(self):
         session = object_session(self)
         module = hubs.widgets.registry[self.plugin]
-        data = module.data(session, self, **self.config)
+        root_view = module.get_views()["root"](module)
+        data = root_view.get_context(self)
+        data.update(root_view.get_extra_context(self))
         data.pop('widget', None)
+        data.pop('widget_instance', None)
         return {
             'id': self.idx,
             # TODO -- use flask.url_for to get the url for this widget
@@ -355,11 +360,6 @@ class Widget(BASE):
     def module(self):
         return hubs.widgets.registry[self.plugin]
 
-    def render(self):
-        session = object_session(self)
-        render = hubs.widgets.render
-        return render(self.module, session, self, **self.config)
-
 
 class User(BASE):
     __tablename__ = 'users'

From 57569e8d718edf8733eba6b4f4c242f7cbce111d Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:54:10 +0000
Subject: [PATCH 6/45] Rename get_widget to get_widget_instance


To make the distinction clearer betweed widgets (subclasses of
hubs.widgets.base.Widget) and widget instances (database records,
instances of hubs.models.Widget).

---

diff --git a/hubs/views/utils.py b/hubs/views/utils.py
index e2d4bd2..df05992 100644
--- a/hubs/views/utils.py
+++ b/hubs/views/utils.py
@@ -20,7 +20,7 @@ def get_hub(name, session=None):
         flask.abort(404)
 
 
-def get_widget(hub, idx, session=None):
+def get_widget_instance(hub, idx, session=None):
     """ Utility shorthand to get a widget and 404 if not found. """
     if session is None:
         session = flask.g.db
diff --git a/hubs/views/widget.py b/hubs/views/widget.py
index f413985..613e47d 100644
--- a/hubs/views/widget.py
+++ b/hubs/views/widget.py
@@ -3,14 +3,14 @@ from __future__ import unicode_literals, absolute_import
 import datetime
 import flask
 
-from hubs.app import app, session
-from .utils import get_widget
+from hubs.app import app
+from .utils import get_widget_instance
 
 
 @app.route('/<hub>/<int:idx>/')
 @app.route('/<hub>/<int:idx>')
 def widget_render(hub, idx):
-    widget = get_widget(hub, idx)
+    widget = get_widget_instance(hub, idx)
     return widget.render()  # , edit=False)
     # was blocking all widgets from working, sorry!
 
@@ -18,7 +18,7 @@ def widget_render(hub, idx):
 @app.route('/<hub>/<int:idx>/json')
 @app.route('/<hub>/<int:idx>/json/')
 def widget_json(hub, idx):
-    widget = get_widget(hub, idx)
+    widget = get_widget_instance(hub, idx)
     response = flask.jsonify(widget.__json__())
     # TODO -- modify headers with response.headers['X-fedora-hubs-wat'] = 'foo'
     return response
@@ -34,7 +34,7 @@ def widget_edit(hub, idx):
 
 
 def widget_edit_get(hub, idx):
-    widget = get_widget(hub, idx)
+    widget = get_widget_instance(hub, idx)
     return flask.render_template(
         'edit.html',
         hub=hub,
@@ -44,7 +44,7 @@ def widget_edit_get(hub, idx):
 
 
 def widget_edit_post(hub, idx):
-    widget = get_widget(hub, idx)
+    widget = get_widget_instance(hub, idx)
     error = False
     config = {}
     for arg in widget.module.data.widget_arguments:
@@ -80,7 +80,7 @@ def widget_edit_post(hub, idx):
 @app.route('/<hub>/<int:idx>/delete', methods=['POST'])
 def widget_edit_delete(hub, idx):
     ''' Remove a widget from a hub. '''
-    widget = get_widget(hub, idx)
+    widget = get_widget_instance(hub, idx)
     flask.g.db.delete(widget)
     try:
         flask.g.db.commit()

From d505f7b6be1f007151764f84c075cde45d61447a Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 7/45] Adapt views and templates to the new widget class


---

diff --git a/hubs/templates/add_widget.html b/hubs/templates/add_widget.html
index 422cb84..76fc4ac 100644
--- a/hubs/templates/add_widget.html
+++ b/hubs/templates/add_widget.html
@@ -8,7 +8,7 @@
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal">&times;</button>
         <h4 class="modal-title">
-          Adding widget {% if widget %}"{{ widget_name }}"{% endif -%} to hub: {{ hub.name }}
+          Adding {% if widget %}widget "{{ widget.name }}"{% else %}a widget{% endif %} to hub: {{ hub.name }}
         </h4>
       </div>
       <div class="modal-body">
@@ -19,12 +19,11 @@
             {% endfor %}
         </select>
         {% elif widget %}
-        <input name="widget_name" type="hidden" value="{{ widget_name }}">
+        <input name="widget_name" type="hidden" value="{{ widget.name }}">
         <input name="position" type="hidden" value="{{ side }}">
-        {% if widget.data.widget_arguments %}
-          {% for arg in widget.data.widget_arguments %}
+          {% for arg in widget.get_arguments() %}
             <fieldset class="form-group ">
-              <strong>{{ arg.name | capitalize }}</strong>
+              <strong>{{ arg.label | capitalize }}</strong>
               <input id="{{ arg.name }}" class="form-control" type="text"
                 value="{{ arg.default if arg.default else '' }}"
                 name="{{ arg.name }}" />
@@ -34,10 +33,9 @@
                 <small class="text-muted">{{ arg.help }}</small>
               </div>
             {% endif %}
+          {% else %}
+            <p>Nothing to configure</p>
           {% endfor %}
-        {% else %}
-          <p>Nothing to configure</p>
-        {% endif %}
         {% endif %}
       </div>
       <div class="modal-footer">
diff --git a/hubs/templates/edit.html b/hubs/templates/edit.html
index a04145a..44a7391 100644
--- a/hubs/templates/edit.html
+++ b/hubs/templates/edit.html
@@ -8,29 +8,27 @@
         <h4 class="modal-title">Configure {{ name }}</h4>
       </div>
       <div class="modal-body">
-      {% if widget.module.data.widget_arguments %}
-        {% for arg in widget.module.data.widget_arguments %}
-          <fieldset class="form-group ">
-            <strong>{{ arg.name | capitalize }}</strong>
-            <input id="{{ arg.name }}" class="form-control" type="text"
+      {% for arg in widget.module.get_arguments() %}
+        <fieldset class="form-group ">
+          <strong>{{ arg.label | capitalize }}</strong>
+          <input id="{{ arg.name }}" class="form-control" type="text"
               value="{{ widget.config.get(arg.name, arg.default if arg.default else '') }}"
               name="{{ arg.name }}" />
-          </fieldset>
-          {% if arg.help %}
-            <div>
-              <small class="text-muted">{{ arg.help }}</small>
-            </div>
-          {% endif %}
-        {% endfor %}
+        </fieldset>
+        {% if arg.help %}
+          <div>
+            <small class="text-muted">{{ arg.help }}</small>
+          </div>
+        {% endif %}
       {% else %}
         <p>Nothing to configure</p>
-      {% endif %}
+      {% endfor %}
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">
           Close
         </button>
-        {% if widget.module.data.widget_arguments %}
+        {% if widget.module.get_arguments() %}
         <button type="submit" class="btn btn-default">
           Save
         </button>
diff --git a/hubs/templates/includes/left_widgets.html b/hubs/templates/includes/left_widgets.html
index b0326e9..032a026 100644
--- a/hubs/templates/includes/left_widgets.html
+++ b/hubs/templates/includes/left_widgets.html
@@ -1,7 +1,7 @@
 <div id="left_widgets">
 {% for widget in hub.left_widgets %}
   <div id="widget-{{ widget.idx }}" class="widget row"
-       data-url="{{ url_for('widget_render', hub=hub.name, idx=widget.idx) }}"
+       data-url="{{ url_for('%s_root' % widget.plugin, hub=hub.name, idx=widget.idx) }}"
        ></div>
 {% endfor %}
 </div>
diff --git a/hubs/templates/includes/right_widgets.html b/hubs/templates/includes/right_widgets.html
index d9b487a..a0b2a3b 100644
--- a/hubs/templates/includes/right_widgets.html
+++ b/hubs/templates/includes/right_widgets.html
@@ -1,7 +1,7 @@
 <div id="right_widgets">
   {% for widget in hub.right_widgets %}
   <div id="widget-{{ widget.idx }}" class="widget row"
-       data-url="{{ url_for('widget_render', hub=hub.name, idx=widget.idx) }}"
+       data-url="{{ url_for('%s_root' % widget.plugin, hub=hub.name, idx=widget.idx) }}"
        ></div>
   {% endfor %}
 </div>
diff --git a/hubs/tests/test_fedora_hubs_flask_api.py b/hubs/tests/test_fedora_hubs_flask_api.py
index 1ca2a8d..9f6383a 100644
--- a/hubs/tests/test_fedora_hubs_flask_api.py
+++ b/hubs/tests/test_fedora_hubs_flask_api.py
@@ -223,7 +223,7 @@ class HubsAPITest(hubs.tests.APPTest):
         result = self.app.get('/ralph/add?position=right',
                               follow_redirects=True)
         self.assertEqual(result.status_code, 200)
-        expected_str = 'Adding widget to hub: ralph'
+        expected_str = 'Adding a widget to hub: ralph'
         self.assertIn(expected_str, result.get_data(as_text=True))
         expected_str = "url: 'add/' + $('#widget').val() + '?position=right',"
         self.assertIn(expected_str, result.get_data(as_text=True))
@@ -337,7 +337,7 @@ class HubsAPITest(hubs.tests.APPTest):
         with tests.auth_set(app, user):
             url = '/ralph/add/about?position=right'
             result = self.app.get(url)
-            self.assertIn('Adding widget "about"to hub: ralph',
+            self.assertIn('Adding widget "about" to hub: ralph',
                           result.get_data(as_text=True))
 
     def test_hub_add_widget_invalid_side(self):
diff --git a/hubs/views/hub.py b/hubs/views/hub.py
index f64f261..27e9235 100644
--- a/hubs/views/hub.py
+++ b/hubs/views/hub.py
@@ -158,19 +158,14 @@ def hub_add_widget(name, widget_name):
     if side not in ['right', 'left']:
         flask.abort(400, 'Invalid position provided')
 
-    widget = None
-    w_name = None
-    for widgt in hubs.widgets.registry:
-        if hubs.widgets.registry[widgt].position in ['both', side] \
-                and widgt == widget_name:
-            w_name = widgt
-            widget = hubs.widgets.registry[widgt]
+    widget = hubs.widgets.registry[widget_name]
+    if widget.position not in ['both', side]:
+        flask.abort(400, "This widget can't be placed here")
 
     return flask.render_template(
         'add_widget.html',
         hub=hub,
         widget=widget,
-        widget_name=w_name,
         side=side,
         url_to=flask.url_for('hub_add_widgets', name=name),
     )
@@ -209,7 +204,7 @@ def hub_add_widget_post(name):
         plugin=widget_name, index=-1, left=position == 'left')
     error = False
     config = {}
-    for arg in widget.module.data.widget_arguments:
+    for arg in widget.module.get_arguments():
         val = flask.request.form.get(arg.name)
         if not val:
             flask.flash(
diff --git a/hubs/views/utils.py b/hubs/views/utils.py
index df05992..94113e3 100644
--- a/hubs/views/utils.py
+++ b/hubs/views/utils.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import flask
 import functools
 import hubs.models
-import hubs.widgets
 
 from six.moves.urllib import parse as urlparse
 from sqlalchemy.orm.exc import NoResultFound
diff --git a/hubs/views/widget.py b/hubs/views/widget.py
index 613e47d..cbc002c 100644
--- a/hubs/views/widget.py
+++ b/hubs/views/widget.py
@@ -4,17 +4,10 @@ import datetime
 import flask
 
 from hubs.app import app
+from pkg_resources import resource_isdir
 from .utils import get_widget_instance
 
 
-@app.route('/<hub>/<int:idx>/')
-@app.route('/<hub>/<int:idx>')
-def widget_render(hub, idx):
-    widget = get_widget_instance(hub, idx)
-    return widget.render()  # , edit=False)
-    # was blocking all widgets from working, sorry!
-
-
 @app.route('/<hub>/<int:idx>/json')
 @app.route('/<hub>/<int:idx>/json/')
 def widget_json(hub, idx):
@@ -47,7 +40,7 @@ def widget_edit_post(hub, idx):
     widget = get_widget_instance(hub, idx)
     error = False
     config = {}
-    for arg in widget.module.data.widget_arguments:
+    for arg in widget.module.get_arguments():
         val = flask.request.form.get(arg.name)
         if not val:
             flask.flash(
@@ -96,14 +89,17 @@ def widget_edit_delete(hub, idx):
 @app.route('/source/<name>')
 def widget_source(name):
     from hubs.widgets import registry
-    base = '/hubs/'
-    fname = ''
 
     try:
-        fname = base + registry[name].__file__.split(base)[-1]
+        widget_path = registry[name].__module__
     except KeyError:
         flask.abort(404)
-
-    fname = fname.replace('.pyc', '.py')
-    return flask.redirect(app.config.get('SOURCE_URL') + fname)
+    widget_url = widget_path.replace(".", "/")
+    parent, _ignore, module = widget_path.rpartition(".")
+    if resource_isdir(parent, module):
+        widget_url += "/__init__.py"
+    else:
+        widget_url += ".py"
+    url = "/".join([app.config.get('SOURCE_URL'), widget_url])
+    return flask.redirect(url)
 
diff --git a/requirements.txt b/requirements.txt
index 092bd82..56ea13b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,6 +16,7 @@ munch
 psycopg2
 pytz
 requests
+setuptools
 sqlalchemy
 markdown
 pkgwat.api

From 5d1ca31daef0934665a89f6d35b34469e73a62f4 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 8/45] Add the Flask variables and filters to widget template env


---

diff --git a/hubs/widgets/templating.py b/hubs/widgets/templating.py
index 41e0c5b..ac5b3e4 100644
--- a/hubs/widgets/templating.py
+++ b/hubs/widgets/templating.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 import os
 
+import flask
 import jinja2
 
 here = os.path.dirname(os.path.abspath(__file__))
@@ -10,3 +11,9 @@ environment = jinja2.Environment(
     loader=jinja2.FileSystemLoader(here),
     trim_blocks=True,
 )
+environment.filters['tojson'] = flask.json.tojson_filter
+environment.globals.update({
+    'session': flask.app.session,
+    'g': flask.g,
+    'url_for': flask.url_for,
+    })

From 372918c54c9191828de3314b20fda73251bbcc0f Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 9/45] Adapt the backend workers to the new CachedFunction


---

diff --git a/hubs/backend/consumer.py b/hubs/backend/consumer.py
old mode 100755
new mode 100644
diff --git a/hubs/backend/triage.py b/hubs/backend/triage.py
index c1bf1da..7320460 100755
--- a/hubs/backend/triage.py
+++ b/hubs/backend/triage.py
@@ -58,25 +58,21 @@ def triage(session, outbound, msg):
     log.debug("Randomizing list of all widgets.")
     random.shuffle(widgets)
 
+    def is_widget_update(msg, widget):
+        """Always rebuild the cache when the widget config is updated."""
+        return msg['topic'].endswith('hubs.widget.update') \
+            and msg['msg']['widget']['id'] == widget.idx
+
     log.debug("Checking should_invalidate for all widgets.")
     for widget in widgets:
-
-        check = widget.module.should_invalidate
-
-        # Do some pre-flight checks before calling should_invalidate
-        if hasattr(check, 'hints'):
-            if check.hints['topics']:
-                if topic not in check.hints['topics']:
-                    continue
-            if check.hints['categories']:
-                if category not in check.hints['categories']:
-                    continue
-
-        if check(msg, session, widget):
-            yield retask.task.Task(json.dumps({
-                'idx': widget.idx,
-                'msg_id': msg['msg_id'],
-            }))
+        for fn_name, fn_class in widget.module.get_cached_functions().items():
+            if is_widget_update(msg, widget) or \
+                    fn_class(widget).should_invalidate(msg):
+                yield retask.task.Task(json.dumps({
+                    'idx': widget.idx,
+                    'fn_name': fn_name,
+                    'msg_id': msg['msg_id'],
+                }))
 
 
 def main(args):
diff --git a/hubs/backend/worker.py b/hubs/backend/worker.py
index b4af706..e8e63e3 100755
--- a/hubs/backend/worker.py
+++ b/hubs/backend/worker.py
@@ -44,24 +44,22 @@ import logging.config
 log = logging.getLogger('hubs.backend.worker')
 
 
-def work(session, widget_idx):
+def work(widget_idx, fn_name):
     # Get a real widget, because we update last_refreshed on it.
     widget = hubs.models.Widget.by_idx(widget_idx)
-    log.info("! Invalidating cache for %r" % widget)
+    fn_class = widget.module.get_cached_functions()[fn_name]
+    log.info("! Rebuilding cache for %r:%r" % (widget, cached_fn))
     # Invalidate the cache...
-    hubs.widgets.base.invalidate_cache(widget, **widget.config)
-    # Rebuild it.
-    log.info("! Rebuilding cache for %r" % widget)
-    widget.module.data(session, widget, **widget.config)
+    fn_class(widget).rebuild()
     # TODO -- fire off an EventSource notice that we updated stuff
 
 
-def handle(idx):
+def handle(idx, fn_name):
     session = hubs.models.init(config['hubs.sqlalchemy.uri'])
 
     try:
         with hubs.app.app.app_context():  # so url_for works
-            work(session, idx)
+            work(idx, fn_name)
         session.commit()  # transaction is committed here
     except:
         session.rollback()  # rolls back the transaction
@@ -91,7 +89,7 @@ def main(args):
             log.info("Working on %r.  (backlog is %r)" % (task, queue.length))
             item = json.loads(task.data)
             idx = item['idx']  # A widget ID
-            handle(idx)
+            handle(item['idx'], item['fn_name'])
             log.debug("  Done.")
     except KeyboardInterrupt:
         pass

From 12c0cf674830757960c40d945e87aa087cea5468 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 10/45] Adapt the cache scripts to the new CachedFunction


---

diff --git a/check-cache-coverage.py b/check-cache-coverage.py
index a753f56..d092dfd 100755
--- a/check-cache-coverage.py
+++ b/check-cache-coverage.py
@@ -13,12 +13,14 @@ forcibly re-warms the cache.
 Authors:    Ralph Bean <rbean@redhat.com>
 """
 
-from __future__ import unicode_literals
+from __future__ import unicode_literals, print_function
 
 import sys
 import dogpile.cache
 
-import hubs.widgets.base
+import hubs.app
+import hubs.widgets
+import hubs.widgets.caching
 import hubs.models
 
 import fedmsg.config
@@ -27,18 +29,21 @@ config = fedmsg.config.load_config()
 
 empty, full = 0, 0
 session = hubs.models.init(config['hubs.sqlalchemy.uri'])
-for widget in session.query(hubs.models.Widget).all():
-    key = hubs.widgets.base.cache_key_generator(widget, **widget.config)
-    result = hubs.widgets.base.cache.get(key, ignore_expiration=True)
-    if isinstance(result, dogpile.cache.api.NoValue):
-        empty += 1
-    else:
-        full += 1
-    sys.stdout.write('.')
-    sys.stdout.flush()
+
+# Register widgets
+hubs.widgets.registry.register_list(hubs.app.app.config["WIDGETS"])
+
+for w_instance in session.query(hubs.models.Widget).all():
+    for fn_name, fn_class in w_instance.module.get_cached_functions().items():
+        if fn_class(w_instance).is_cached():
+            full += 1
+        else:
+            empty += 1
+        sys.stdout.write('.')
+        sys.stdout.flush()
 sys.stdout.write('\n')
 sys.stdout.flush()
 
 total = empty + full
-print full, "cache values found. ", empty, "are missing."
-print full / float(total) * 100, "percent cache coverage."
+print(full, "cache values found. ", empty, "are missing.")
+print(full / float(total) * 100, "percent cache coverage.")
diff --git a/smart_cache_invalidator.py b/smart_cache_invalidator.py
index 25c2540..ebf0de6 100755
--- a/smart_cache_invalidator.py
+++ b/smart_cache_invalidator.py
@@ -18,8 +18,10 @@ import fedmsg.config
 import fedmsg.meta
 
 
+import hubs.app
 import hubs.models
 import hubs.widgets.base
+import hubs.widgets.caching
 
 # get the DB session
 fedmsg_config = fedmsg.config.load_config()
@@ -27,21 +29,24 @@ fedmsg.meta.make_processors(**fedmsg_config)
 
 session = hubs.models.init(fedmsg_config['hubs.sqlalchemy.uri'])
 
+# Register widgets
+hubs.widgets.registry.register_list(hubs.app.app.config["WIDGETS"])
+
 
 def do_list(args):
     ''' List the different widget for which there is data cached. '''
-    for widget in session.query(hubs.models.Widget).all():
-        key = hubs.widgets.base.cache_key_generator(widget, **widget.config)
-        result = hubs.widgets.base.cache.get(key, ignore_expiration=True)
-        if not isinstance(result, dogpile.cache.api.NoValue):
-            print('- Widget cached {0} (#{1}) in {2}'.format(
-                      widget.hub_id, widget.idx, widget.plugin))
+    for w_instance in session.query(hubs.models.Widget).all():
+        widget = w_instance.module
+        for fn_name, fn_class in widget.get_cached_functions().items():
+            if fn_class(w_instance).is_cached():
+                print('- Widget cached {0} (#{1}) in {2}'.format(
+                          w_instance.hub_id, w_instance.idx, w_instance.plugin))
 
 
 def do_clean(args):
     ''' Clean the widget for which there is data cached. '''
     for widget in args.widgets:
-        wid_obj = hubs.models.Widget.get(session, widget)
+        wid_obj = hubs.models.Widget.get(widget)
 
         if not wid_obj:
             wid_obj = session.query(hubs.models.Widget).filter_by(
@@ -52,7 +57,8 @@ def do_clean(args):
 
         print('- Removing cached {0} (#{1}) in {2}'.format(
               wid_obj.hub_id, wid_obj.idx, wid_obj.plugin))
-        result = hubs.widgets.base.invalidate_cache(wid_obj, **wid_obj.config)
+        for fn_class in wid_obj.module.get_cached_functions().values():
+            fn_class(wid_obj).invalidate()
 
 
 def setup_parser():

From 0b302fea975c6d1575b4b466c5be111183c81629 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 11/45] Convert the about widget


---

diff --git a/hubs/tests/test_fedora_hubs_flask_api.py b/hubs/tests/test_fedora_hubs_flask_api.py
index 9f6383a..9415590 100644
--- a/hubs/tests/test_fedora_hubs_flask_api.py
+++ b/hubs/tests/test_fedora_hubs_flask_api.py
@@ -361,7 +361,7 @@ class HubsAPITest(hubs.tests.APPTest):
             result = self.app.get(url)
             self.assertEqual(result.status_code, 302)
             expected_str = 'https://pagure.io/fedora-hubs/' \
-                           'blob/develop/f/hubs/widgets/about.py'
+                           'blob/develop/f/hubs/widgets/about/__init__.py'
             self.assertIn(expected_str, result.get_data(as_text=True))
 
     def test_source_name_not_existent(self):
diff --git a/hubs/tests/test_widgets/test_about.py b/hubs/tests/test_widgets/test_about.py
index 74e0c56..d068a1b 100644
--- a/hubs/tests/test_widgets/test_about.py
+++ b/hubs/tests/test_widgets/test_about.py
@@ -21,24 +21,3 @@ class TestBadges(hubs.tests.test_widgets.WidgetTest):
             u'source_url': u'/source/about',
             u'text': u'Testing.',
         })
-
-    def test_should_invalidate_wrong_topic(self):
-        widget = self.widget_instance('ralph', self.plugin)
-        msg = {'topic': 'hubs.widget.update.WRONG.TOPIC', 'msg': {'widget': {'id': widget.idx}}}
-        module = hubs.widgets.registry[widget.plugin]
-        result = module.should_invalidate(msg, self.session, widget)
-        self.assertFalse(result)
-
-    def test_should_invalidate_wrong_widget_id(self):
-        widget = self.widget_instance('ralph', self.plugin)
-        msg = {'topic': 'hubs.widget.update', 'msg': {'widget': {'id': widget.idx+1}}}
-        module = hubs.widgets.registry[widget.plugin]
-        result = module.should_invalidate(msg, self.session, widget)
-        self.assertFalse(result)
-
-    def test_should_invalidate_good_match(self):
-        widget = self.widget_instance('ralph', self.plugin)
-        msg = {'topic': 'hubs.widget.update', 'msg': {'widget': {'id': widget.idx}}}
-        module = hubs.widgets.registry[widget.plugin]
-        result = module.should_invalidate(msg, self.session, widget)
-        self.assertTrue(result)
diff --git a/hubs/widgets/about.py b/hubs/widgets/about.py
deleted file mode 100755
index 7f0d994..0000000
--- a/hubs/widgets/about.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-chrome = panel("<span class='glyphicon glyphicon-info-sign' aria-hidden='true'></span> About")
-template = templating.environment.get_template('templates/about.html')
-position = 'both'
-
-
-@argument(name="text", default="I am a Fedora user, and this is my about",
-          validator=validators.text,
-          help="Text about a user.")
-def data(session, widget, text):
-    ''' Data for the About widget '''
-
-    return dict(text=text)
-
-
-@hint(topics=[_('hubs.widget.update')])
-def should_invalidate(message, session, widget):
-    ''' Checks whether the about widget cache needs an update or not
-    Called by backend daemon which listens to fedmsg '''
-
-    if not message['topic'].endswith('hubs.widget.update'):
-        return False
-    if message['msg']['widget']['id'] != widget.idx:
-        return False
-    return True
diff --git a/hubs/widgets/about/__init__.py b/hubs/widgets/about/__init__.py
new file mode 100644
index 0000000..aff28b0
--- /dev/null
+++ b/hubs/widgets/about/__init__.py
@@ -0,0 +1,30 @@
+from __future__ import unicode_literals
+
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+from hubs import validators
+
+
+class About(Widget):
+
+    name = "about"
+    position = "both"
+    arguments = [dict(
+        name="text",
+        label="Text",
+        default="I am a Fedora user, and this is my about",
+        validator=validators.text,
+        help="Text about a user.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/about.html"
+    chrome = panel("<span class='glyphicon glyphicon-info-sign' aria-hidden='true'></span> About")
+
+    def get_context(self, instance, *args, **kwargs):
+        return dict(text=instance.config["text"])

From 05b480c3f5eb8e4762c57091ac8a2bb7532bd2e3 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 12/45] Convert the badges widget


---

diff --git a/hubs/tests/test_widgets/test_badges.py b/hubs/tests/test_widgets/test_badges.py
index 8a88807..f8ae5b6 100644
--- a/hubs/tests/test_widgets/test_badges.py
+++ b/hubs/tests/test_widgets/test_badges.py
@@ -22,7 +22,8 @@ class TestBadges(hubs.tests.test_widgets.WidgetTest):
         # msg = self.get_fedmsg('2016-ebb84660-59e9-4e68-af8f-4e6f49348b88')
         msg = {'topic': 'hubs.widget.update.WRONG.TOPIC'}
         module = hubs.widgets.registry[widget.plugin]
-        result = module.should_invalidate(msg, self.session, widget)
+        func = module.get_cached_functions()['GetBadges']
+        result = func(widget).should_invalidate(msg)
         self.assertFalse(result)
 
     def test_should_invalidate_wrong_user(self):
@@ -30,7 +31,8 @@ class TestBadges(hubs.tests.test_widgets.WidgetTest):
         # msg = self.get_fedmsg('2016-e371c7f6-bc8e-4632-8e33-b9102dc30b5f')
         msg = {'topic': 'fedbadges.badge.award', 'msg': {'user': {'username': 'not_ralph'}}}
         module = hubs.widgets.registry[widget.plugin]
-        result = module.should_invalidate(msg, self.session, widget)
+        func = module.get_cached_functions()['GetBadges']
+        result = func(widget).should_invalidate(msg)
         self.assertFalse(result)
 
     def test_should_invalidate_good_match_fedbadges(self):
@@ -38,7 +40,8 @@ class TestBadges(hubs.tests.test_widgets.WidgetTest):
         # msg = self.get_fedmsg('2016-1fbb1135-681b-4d3b-9a40-d0f6ebd313f4')
         msg = {'topic': 'fedbadges.badge.award', 'msg': {'user': {'username': 'ralph'}}}
         module = hubs.widgets.registry[widget.plugin]
-        result = module.should_invalidate(msg, self.session, widget)
+        func = module.get_cached_functions()['GetBadges']
+        result = func(widget).should_invalidate(msg)
         self.assertTrue(result)
 
     def test_should_invalidate_good_match_hubswidget(self):
@@ -46,5 +49,6 @@ class TestBadges(hubs.tests.test_widgets.WidgetTest):
         # msg = self.get_fedmsg('2016-1fbb1135-681b-4d3b-9a40-d0f6ebd313f4')
         msg = {'topic': 'hubs.widget.update', 'msg': {'widget': {'id': widget.idx + 1}}}
         module = hubs.widgets.registry[widget.plugin]
-        result = module.should_invalidate(msg, self.session, widget)
+        func = module.get_cached_functions()['GetBadges']
+        result = func(widget).should_invalidate(msg)
         self.assertTrue(result)
diff --git a/hubs/widgets/badges.py b/hubs/widgets/badges.py
deleted file mode 100755
index 86bc929..0000000
--- a/hubs/widgets/badges.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from __future__ import unicode_literals
-
-import operator
-
-import requests
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-from hubs.widgets.chrome import panel
-chrome = panel("Badges")
-template = templating.environment.get_template('templates/badges.html')
-position = 'right'
-
-
-@argument(name="username",
-          default=None,
-          validator=validators.username,
-          help="A FAS username.")
-def data(session, widget, username):
-    url = "https://badges.fedoraproject.org/user/{username}/json"
-    url = url.format(username=username)
-    response = requests.get(url)
-    assertions = response.json()['assertions']
-    key = operator.itemgetter('issued')
-    return dict(assertions=sorted(assertions, key=key, reverse=True))
-
-
-@hint(topics=[_('hubs.widget.update'), _('fedbadges.badge.award')])
-def should_invalidate(message, session, widget):
-    if message['topic'].endswith('hubs.widget.update'):
-        if message['msg']['widget']['id'] != widget.idx:
-            return True
-
-    if message['topic'].endswith('fedbadges.badge.award'):
-        username = widget.config['username']
-        if message['msg']['user']['username'] == username:
-            return True
-
-    return False
diff --git a/hubs/widgets/badges/__init__.py b/hubs/widgets/badges/__init__.py
new file mode 100644
index 0000000..a6d838f
--- /dev/null
+++ b/hubs/widgets/badges/__init__.py
@@ -0,0 +1,56 @@
+from __future__ import unicode_literals
+
+import operator
+import requests
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+
+class Badges(Widget):
+
+    name = "badges"
+    position = "right"
+    arguments = [dict(
+        name="username",
+        label="Username",
+        default=None,
+        validator=validators.username,
+        help="A FAS username.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/badges.html"
+    chrome = panel("Badges")
+
+    def get_context(self, instance, *args, **kwargs):
+        get_badges = GetBadges(instance)
+        return get_badges()
+
+
+class GetBadges(CachedFunction):
+
+    def execute(self):
+        username = self.instance.config["username"]
+        url = "https://badges.fedoraproject.org/user/{username}/json"
+        url = url.format(username=username)
+        response = requests.get(url)
+        assertions = response.json()['assertions']
+        key = operator.itemgetter('issued')
+        return dict(assertions=sorted(assertions, key=key, reverse=True))
+
+    def should_invalidate(self, message):
+        if message['topic'].endswith('hubs.widget.update'):
+            if message['msg']['widget']['id'] != self.instance.idx:
+                return True
+        if message['topic'].endswith('fedbadges.badge.award'):
+            username = self.instance.config['username']
+            if message['msg']['user']['username'] == username:
+                return True
+        return False

From 4d711ebf4307b0821392ee62699ab1a4288566e1 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 13/45] Convert the bugzilla widget


---

diff --git a/hubs/widgets/bugzilla.py b/hubs/widgets/bugzilla.py
deleted file mode 100644
index c2d94ae..0000000
--- a/hubs/widgets/bugzilla.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from __future__ import unicode_literals
-
-import requests
-import pkgwat.api
-
-import hubs.validators as validators
-from hubs.widgets.base import argument
-from hubs.widgets.chrome import panel
-from hubs.widgets import templating
-from hubs.hinting import hint
-
-chrome = panel("Bugzilla: Issues")
-template = templating.environment.get_template('templates/bugzilla.html')
-position = 'right'
-
-
-@argument(name="username",
-          default=None,
-          validator=validators.username,
-          help="A FAS username.")
-def data(session, widget, username):
-    ''' Returns data for Bugzilla Widget. Queries pkgdb api for package
-    list of the user and bugzilla for correspoding issues '''
-
-    pkgdb_url = "https://admin.fedoraproject.org/pkgdb/api/packager/package"
-    url = "/".join([pkgdb_url, username])
-    response = requests.get(url)
-    data = response.json()
-
-    issues = []
-
-    # get the packages of which the user is
-    # point of contact
-    for package in data["point of contact"]:
-        if len(issues) == 3:
-            break
-        pkg_details = pkgwat.api.bugs(package['name'])
-        for row in pkg_details['rows']:
-            if len(issues) == 3:
-                break
-            issues.append(
-                dict(
-                    id=row['id'],
-                    title=row['description'],
-                    pkg_name=package['name'],
-                )
-            )
-
-    # get the packages of which the user is
-    # co maintainer
-    for package in data["co-maintained"]:
-        if len(issues) == 3:
-            break
-        pkg_details = pkgwat.api.bugs(package['name'])
-        for row in pkg_details['rows']:
-            if len(issues) == 3:
-                break
-            issues.append(
-                dict(
-                    id=row['id'],
-                    title=row['description'],
-                    pkg_name=package['name'],
-                )
-            )
-
-    return dict(
-        username=username,
-        issues=issues,
-    )
-
-
-@hint(categories=['bugzilla'])
-def should_invalidate(message, session, widget):
-    ''' Validate if the bugzilla widget cache needs an update
-    This is called by a backend daemon listening to fedmsg '''
-
-    # TODO -- wrap this pkgdb pull in another invalidatible cache.
-    username = widget.config['username']
-    pkgdb_url = "https://admin.fedoraproject.org/pkgdb/api/packager/package"
-    url = "/".join([pkgdb_url, username])
-    response = requests.get(url)
-    data = response.json()
-
-    owned = data['point of contact'] + data['co-maintained']
-    owned = [p['name'] for p in owned]
-    if message['msg']['bug']['component'] in owned:
-        return True
-
-    return False
diff --git a/hubs/widgets/bugzilla/__init__.py b/hubs/widgets/bugzilla/__init__.py
new file mode 100644
index 0000000..ca42357
--- /dev/null
+++ b/hubs/widgets/bugzilla/__init__.py
@@ -0,0 +1,103 @@
+from __future__ import unicode_literals
+
+import requests
+import pkgwat.api
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+
+PKGDB_URL = "https://admin.fedoraproject.org/pkgdb/api/packager/package"
+
+
+class Bugzilla(Widget):
+
+    name = "bugzilla"
+    position = "right"
+    arguments = [dict(
+        name="username",
+        label="Username",
+        default=None,
+        validator=validators.username,
+        help="A FAS username.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/bugzilla.html"
+    chrome = panel("Bugzilla: Issues")
+
+    def get_context(self, instance, *args, **kwargs):
+        get_issues = GetIssues(instance)
+        return dict(
+            username=instance.config["username"],
+            issues=get_issues()
+            )
+
+
+class GetIssues(CachedFunction):
+
+    ''' Returns data for Bugzilla Widget. Queries pkgdb api for package
+    list of the user and bugzilla for correspoding issues '''
+
+    def execute(self):
+        username = self.instance.config["username"]
+        url = "/".join([PKGDB_URL, username])
+        response = requests.get(url)
+        data = response.json()
+
+        issues = []
+
+        # get the packages of which the user is
+        # point of contact
+        for package in data["point of contact"]:
+            if len(issues) == 3:
+                break
+            pkg_details = pkgwat.api.bugs(package['name'])
+            for row in pkg_details['rows']:
+                if len(issues) == 3:
+                    break
+                issues.append(
+                    dict(
+                        id=row['id'],
+                        title=row['description'],
+                        pkg_name=package['name'],
+                    )
+                )
+
+        # get the packages of which the user is
+        # co maintainer
+        for package in data["co-maintained"]:
+            if len(issues) == 3:
+                break
+            pkg_details = pkgwat.api.bugs(package['name'])
+            for row in pkg_details['rows']:
+                if len(issues) == 3:
+                    break
+                issues.append(
+                    dict(
+                        id=row['id'],
+                        title=row['description'],
+                        pkg_name=package['name'],
+                    )
+                )
+
+        return issues
+
+    def should_invalidate(self, message):
+        username = self.instance.config["username"]
+        url = "/".join([PKGDB_URL, username])
+        response = requests.get(url)
+        data = response.json()
+
+        owned = data['point of contact'] + data['co-maintained']
+        owned = [p['name'] for p in owned]
+        if message['msg']['bug']['component'] in owned:
+            return True
+
+        return False

From 346c71d40e4980eefd41ab8d56aaede79718e9e2 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 14/45] Convert the contact widget


---

diff --git a/hubs/widgets/contact.py b/hubs/widgets/contact.py
deleted file mode 100644
index 4bd5597..0000000
--- a/hubs/widgets/contact.py
+++ /dev/null
@@ -1,65 +0,0 @@
-from __future__ import unicode_literals
-
-import flask
-
-import fedmsg.config
-import fedmsg.meta
-import hubs.models
-from hubs.widgets.chrome import panel
-from hubs.widgets import templating
-
-config = fedmsg.config.load_config()
-
-chrome = panel()
-template = templating.environment.get_template('templates/contact.html')
-position = 'both'
-
-
-# TODO: update this section when FAS3 is deployed
-def data(session, widget, **kwargs):
-    ''' Data for Contact widget. Checks if the hub associated
-    with widget is of a user or not. If the hub is of a user, return
-    data related to the user else, hub is of a fedora team
-    - return data related to the team '''
-
-    hub = widget.hub
-    if hub.user_hub:
-        usergroup = True
-        user = hubs.models.User.by_username(hub.name)
-        email = user.username + '@fedoraproject.org'
-        karma_url = flask.url_for('plus_plus_status', user=user.username)
-        fas_info = {
-            'usergroup': usergroup,
-            'location': 'United States',
-            'timezone': 'UTC',
-            'email': email,
-            'ircnick': user.username,
-            'karma_url': karma_url,
-            'account_age': 'Oct 2010',
-        }
-    else:
-        usergroup = False
-        # TODO: update this section integrating with FAS3
-        if hub.name == 'infrastructure':
-            ircchannel = 'apps'
-            hubname = 'infrastructure'
-        elif hub.name == 'designteam':
-            ircchannel = 'design'
-            hubname = 'design'
-        elif hub.name == 'marketing':
-            ircchannel = 'mktg'
-            hubname = 'marketing'
-        else:
-            ircchannel = hub.name
-            hubname = hub.name
-        mailinglist = 'https://lists.fedoraproject.org/archives/list/{}'
-        '@lists.fedoraproject.org/'.format(hubname)
-        wikilink = 'https://fedoraproject.org/wiki/' + hubname
-        fas_info = {
-            'usergroup': usergroup,
-            'hubname': hubname,
-            'ircchannel': 'fedora-%s' % ircchannel,
-            'mailinglist': mailinglist,
-            'wikilink': wikilink,
-        }
-    return fas_info
diff --git a/hubs/widgets/contact/__init__.py b/hubs/widgets/contact/__init__.py
new file mode 100644
index 0000000..88841fe
--- /dev/null
+++ b/hubs/widgets/contact/__init__.py
@@ -0,0 +1,75 @@
+from __future__ import unicode_literals
+
+import flask
+
+import fedmsg.config
+import fedmsg.meta
+import hubs.models
+
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.chrome import panel
+
+config = fedmsg.config.load_config()
+
+
+class Contact(Widget):
+
+    name = "contact"
+    position = "both"
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/contact.html"
+    chrome = panel()
+
+    def get_context(self, instance, *args, **kwargs):
+        ''' Data for Contact widget. Checks if the hub associated
+        with instance is of a user or not. If the hub is of a user, return
+        data related to the user else, hub is of a fedora team
+        - return data related to the team '''
+        # TODO: update this section when FAS3 is deployed
+
+        hub = instance.hub
+        if hub.user_hub:
+            usergroup = True
+            user = hubs.models.User.by_username(hub.name)
+            email = user.username + '@fedoraproject.org'
+            karma_url = flask.url_for('plus_plus_status', user=user.username)
+            fas_info = {
+                'usergroup': usergroup,
+                'location': 'United States',
+                'timezone': 'UTC',
+                'email': email,
+                'ircnick': user.username,
+                'karma_url': karma_url,
+                'account_age': 'Oct 2010',
+            }
+        else:
+            usergroup = False
+            # TODO: update this section integrating with FAS3
+            if hub.name == 'infrastructure':
+                ircchannel = 'apps'
+                hubname = 'infrastructure'
+            elif hub.name == 'designteam':
+                ircchannel = 'design'
+                hubname = 'design'
+            elif hub.name == 'marketing':
+                ircchannel = 'mktg'
+                hubname = 'marketing'
+            else:
+                ircchannel = hub.name
+                hubname = hub.name
+            mailinglist = 'https://lists.fedoraproject.org/archives/list/{}'
+            '@lists.fedoraproject.org/'.format(hubname)
+            wikilink = 'https://fedoraproject.org/wiki/' + hubname
+            fas_info = {
+                'usergroup': usergroup,
+                'hubname': hubname,
+                'ircchannel': 'fedora-%s' % ircchannel,
+                'mailinglist': mailinglist,
+                'wikilink': wikilink,
+            }
+        return fas_info

From a235286e351087c80d628543523db590d11c1f04 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 15/45] Convert the dummy widget


---

diff --git a/hubs/widgets/dummy.py b/hubs/widgets/dummy.py
deleted file mode 100755
index bd198d3..0000000
--- a/hubs/widgets/dummy.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-chrome = panel("This is a dummy widget")
-template = templating.environment.get_template('templates/dummy.html')
-position = 'both'
-
-
-@argument(name="text", default="Lorem ipsum dolor...",
-          validator=validators.text,
-          help="Some dummy text to display.")
-def data(session, widget, text):
-    return dict(text=text)
-
-
-@hint(topics=[_('hubs.widget.update')])
-def should_invalidate(message, session, widget):
-    if not message['topic'].endswith('hubs.widget.update'):
-        return False
-    if message['msg']['widget']['id'] != widget.id:
-        return False
-    return True
diff --git a/hubs/widgets/dummy/__init__.py b/hubs/widgets/dummy/__init__.py
new file mode 100644
index 0000000..738711a
--- /dev/null
+++ b/hubs/widgets/dummy/__init__.py
@@ -0,0 +1,29 @@
+from __future__ import unicode_literals
+
+from hubs import validators
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+
+class Dummy(Widget):
+
+    name = "dummy"
+    position = "both"
+    arguments = [dict(
+        name="text",
+        label="Text",
+        default="Lorem ipsum dolor...",
+        validator=validators.text,
+        help="Some dummy text to display.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/dummy.html"
+    chrome = panel("This is a dummy widget")
+
+    def get_context(self, instance, *args, **kwargs):
+        return dict(text=instance.config["text"])

From 2a6bddf2b9bcb55c41767aa0ed15c84c2a8f603c Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 16/45] Convert the fedmsgstats widget


---

diff --git a/hubs/widgets/fedmsgstats.py b/hubs/widgets/fedmsgstats.py
deleted file mode 100755
index 0cf5ba2..0000000
--- a/hubs/widgets/fedmsgstats.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint
-from hubs.widgets.chrome import panel
-from hubs.widgets import templating
-
-from hubs.utils import commas
-
-import flask
-import requests
-
-import fedmsg.config
-import fedmsg.meta
-
-config = fedmsg.config.load_config()
-
-chrome = panel()
-template = templating.environment.get_template('templates/fedmsgstats.html')
-position = 'both'
-
-
-def data(session, widget, username):
-    url = "https://apps.fedoraproject.org/datagrepper/raw?user={username}"
-    url = url.format(username=username)
-    response = requests.get(url)
-    fedmsgs = response.json()['total']
-    sub_list = []
-    for assoc in widget.hub.associations:
-        if assoc.user:
-            sub_list = [u.name for u in assoc.user.subscriptions]
-    subscribers = [u.username for u in widget.hub.subscribers]
-    return dict(
-        username=username,
-        fedmsgs=fedmsgs,
-        subscribers=subscribers,
-        subscribed_to=sub_list,
-        fedmsgs_text=commas(fedmsgs),
-        subscribers_text=commas(len(subscribers)),
-        subscribed_text=commas(len(sub_list)),
-        hub_subscribe_url=flask.url_for(
-            'hub_subscribe', hub=widget.hub.name),
-        hub_unsubscribe_url=flask.url_for(
-            'hub_unsubscribe', hub=widget.hub.name),
-    )
-
-
-@hint(usernames=lambda widget: [widget.config['username']])
-def should_invalidate(message, session, widget):
-    usernames = fedmsg.meta.msg2usernames(message, **config)
-    username = widget.config['username']
-    return username in usernames
diff --git a/hubs/widgets/fedmsgstats/__init__.py b/hubs/widgets/fedmsgstats/__init__.py
new file mode 100644
index 0000000..b31ae11
--- /dev/null
+++ b/hubs/widgets/fedmsgstats/__init__.py
@@ -0,0 +1,76 @@
+from __future__ import unicode_literals
+
+import flask
+import fedmsg.config
+import fedmsg.meta
+import requests
+
+from hubs import validators
+from hubs.utils import commas
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+fedmsg_config = fedmsg.config.load_config()
+
+
+class FedmsgStats(Widget):
+
+    name = "fedmsgstats"
+    position = "both"
+    arguments = [dict(
+        name="username",
+        label="Username",
+        default=None,
+        validator=validators.username,
+        help="A FAS username.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/fedmsgstats.html"
+    chrome = panel()
+
+    def get_context(self, instance, *args, **kwargs):
+        username = instance.config["username"]
+        context = dict(
+            username=username,
+            hub_subscribe_url=flask.url_for(
+                'hub_subscribe', hub=instance.hub.name),
+            hub_unsubscribe_url=flask.url_for(
+                'hub_unsubscribe', hub=instance.hub.name),
+        )
+        get_stats = GetStats(instance)
+        context.update(get_stats())
+        return context
+
+
+class GetStats(CachedFunction):
+
+    def execute(self):
+        username = self.instance.config["username"]
+        url = "https://apps.fedoraproject.org/datagrepper/raw?user={username}"
+        url = url.format(username=username)
+        response = requests.get(url)
+        fedmsgs = response.json()['total']
+        sub_list = []
+        for assoc in self.instance.hub.associations:
+            if assoc.user:
+                sub_list = [u.name for u in assoc.user.subscriptions]
+        subscribers = [u.username for u in self.instance.hub.subscribers]
+        return dict(
+            fedmsgs=fedmsgs,
+            fedmsgs_text=commas(fedmsgs),
+            subscribers=subscribers,
+            subscribed_to=sub_list,
+            subscribers_text=commas(len(subscribers)),
+            subscribed_text=commas(len(sub_list)),
+            )
+
+    def should_invalidate(self, message):
+        usernames = fedmsg.meta.msg2usernames(message, **fedmsg_config)
+        username = self.instance.config['username']
+        return username in usernames

From 9349db72c70a18a90940fe1b6ba2b5b6fd6a67fb Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 17/45] Convert the feed widget


---

diff --git a/hubs/widgets/feed.py b/hubs/widgets/feed.py
deleted file mode 100755
index 5d744d9..0000000
--- a/hubs/widgets/feed.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from __future__ import print_function, unicode_literals
-
-from hubs.hinting import hint
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-import logging
-
-log = logging.getLogger('hubs')
-
-from hubs.widgets.chrome import panel
-chrome = panel('Live Feed')
-template = templating.environment.get_template('templates/feed.html')
-position = 'left'
-
-
-@argument(name="username",
-          default=None,
-          validator=validators.username,
-          help="A FAS username.")
-@argument(name="message_limit",
-          default=20,
-          validator=validators.integer,
-          help="Max number of feed messages to display")
-def data(session, widget, username, message_limit):
-    # Avoid circular import
-    from hubs.app import app
-    feed_url = app.config['SSE_URL'] + username
-    return dict(matches=[], message_limit=message_limit, feed_url=feed_url)
-
-
-@hint(ubiquitous=True)
-def should_invalidate(message, session, widget):
-    pass
diff --git a/hubs/widgets/feed/__init__.py b/hubs/widgets/feed/__init__.py
new file mode 100644
index 0000000..678152d
--- /dev/null
+++ b/hubs/widgets/feed/__init__.py
@@ -0,0 +1,48 @@
+from __future__ import unicode_literals
+
+
+from hubs import validators
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+import logging
+log = logging.getLogger('hubs')
+
+
+class Feed(Widget):
+
+    name = "feed"
+    position = "left"
+    arguments = [
+        {
+            "name": "username",
+            "label": "Username",
+            "default": None,
+            "validator": validators.username,
+            "help": "A FAS username.",
+        }, {
+            "name": "message_limit",
+            "label": "Message limit",
+            "default": 20,
+            "validator": validators.integer,
+            "help": "Max number of feed messages to display.",
+        }]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/feed.html"
+    chrome = panel("Live Feed")
+
+    def get_context(self, instance, *args, **kwargs):
+        # Avoid circular import
+        from hubs.app import app
+        username = instance.config["username"]
+        feed_url = app.config['SSE_URL'] + username
+        return dict(
+            matches=[],
+            message_limit=instance.config["message_limit"],
+            feed_url=feed_url,
+            )

From a21c7f496cf567afdd6d8b0ec70e1aa27c1b449e Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 18/45] Convert the fhosted widget


---

diff --git a/hubs/widgets/fhosted.py b/hubs/widgets/fhosted.py
deleted file mode 100644
index bc97d8b..0000000
--- a/hubs/widgets/fhosted.py
+++ /dev/null
@@ -1,71 +0,0 @@
-from __future__ import unicode_literals
-
-from six.moves.xmlrpc_client import ServerProxy
-
-import hubs.validators as validators
-from hubs.widgets.chrome import panel
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-chrome = panel("Fedorahosted: Open Tickets")
-template = templating.environment.get_template('templates/fedorahosted.html')
-position = 'right'
-
-
-@argument(name="project",
-          default=None,
-          validator=validators.fedorahosted_project,
-          help="Name of the trac instance on fedorahosted.org")
-@argument(name="n_tickets",
-          default=4,
-          validator=validators.integer,
-          help="The number of tickets to display.")
-def data(session, widget, project, n_tickets=4):
-    ''' Data for Fedorahosted widget.
-    Queries Fedorahosted via xmlrpc for tickets. '''
-
-    n_tickets = int(n_tickets)
-    url = 'https://fedorahosted.org/%s/rpc' % project
-    filters = 'status=accepted&status=assigned&status=new&status=reopened'\
-        '&col=id&col=summary&col=status&col=owner&col=type&col=priority'\
-        '&col=milestone&col=changetime&order=changetime'
-
-    # get the tickets based on the filters
-    # returns a list of ticket ids
-    try:
-        server = ServerProxy(url)
-        tickets = server.ticket.query(filters)
-    except:
-        return dict(
-            error='Invalid or wrongly configured project'
-        )
-
-    output = []
-    total_tickets = len(tickets)
-    for ticket in tickets[:n_tickets]:
-        # get the details of the ticket
-        ticket = server.ticket.get(ticket)
-        data = ticket[3]
-        data['id'] = ticket[0]
-        data['short_summary'] = data['summary'][:45]
-        output.append(data)
-
-    return dict(
-        project=project,
-        tickets=output,
-        total_tickets=total_tickets,
-    )
-
-
-@hint(topics=[_('trac.ticket.update'), _('trac.ticket.new')])
-def should_invalidate(message, session, widget):
-    ''' Checks if the Fedorahosted widget needs an update.
-    Called by backend daemon listening to fedmsg '''
-
-    project = widget.config.get('project', '')
-    url = 'https://fedorahosted.org/%s/' % project
-    if '.trac.ticket' in message['topic']:
-        if message['msg']['instance']['base_url'] == url:
-            return True
-    return False
diff --git a/hubs/widgets/fhosted/__init__.py b/hubs/widgets/fhosted/__init__.py
new file mode 100644
index 0000000..ec1dc93
--- /dev/null
+++ b/hubs/widgets/fhosted/__init__.py
@@ -0,0 +1,90 @@
+from __future__ import unicode_literals
+
+from six.moves.xmlrpc_client import ServerProxy
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+
+class FedoraHosted(Widget):
+
+    name = "fhosted"
+    position = "right"
+    arguments = [
+        dict(
+            name="project",
+            label="Project",
+            default=None,
+            validator=validators.fedorahosted_project,
+            help="Name of the trac instance on fedorahosted.org.",
+        ), dict(
+            name="n_tickets",
+            label="Number of tickets",
+            default=4,
+            validator=validators.integer,
+            help="The number of tickets to display.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/fedorahosted.html"
+    chrome = panel("Fedorahosted: Open Tickets")
+
+    def get_context(self, instance, *args, **kwargs):
+        get_tickets = GetTickets(instance)
+        context = dict(project=instance.config["project"])
+        context.update(get_tickets())
+        return context
+
+
+class GetTickets(CachedFunction):
+    ''' Data for Fedorahosted widget.
+    Queries Fedorahosted via xmlrpc for tickets. '''
+
+    def execute(self):
+        n_tickets = int(self.instance.config["n_tickets"])
+        url = 'https://fedorahosted.org/%s/rpc' \
+            % self.instance.config["project"]
+        filters = 'status=accepted&status=assigned&status=new&status=reopened'\
+            '&col=id&col=summary&col=status&col=owner&col=type&col=priority'\
+            '&col=milestone&col=changetime&order=changetime'
+
+        # get the tickets based on the filters
+        # returns a list of ticket ids
+        try:
+            server = ServerProxy(url)
+            tickets = server.ticket.query(filters)
+        except:
+            return dict(
+                error='Invalid or wrongly configured project'
+            )
+
+        output = []
+        total_tickets = len(tickets)
+        for ticket in tickets[:n_tickets]:
+            # get the details of the ticket
+            ticket = server.ticket.get(ticket)
+            data = ticket[3]
+            data['id'] = ticket[0]
+            data['short_summary'] = data['summary'][:45]
+            output.append(data)
+
+        return dict(
+            tickets=output,
+            total_tickets=total_tickets,
+        )
+
+    def should_invalidate(self, message):
+        ''' Checks if the Fedorahosted widget needs an update.
+        Called by backend daemon listening to fedmsg '''
+        if '.trac.ticket' in message['topic']:
+            project = self.instance.config.get("project", "")
+            url = 'https://fedorahosted.org/%s/' % project
+            if message['msg']['instance']['base_url'] == url:
+                return True
+        return False

From 2ea035e6db7580d12ff7aa9e8d4a67c2de5eb1ec Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 19/45] Convert the githubissues widget


---

diff --git a/hubs/validators.py b/hubs/validators.py
old mode 100755
new mode 100644
index bd5b3f2..e065629
--- a/hubs/validators.py
+++ b/hubs/validators.py
@@ -34,6 +34,10 @@ def github_organization(session, value):
     # TODO -- implement this.
     return value
 
+def github_repo(session, value):
+    # TODO -- implement this.
+    return value
+
 
 def fmn_context(session, value):
     # TODO get this from the fedmsg config.
diff --git a/hubs/widgets/githubissues.py b/hubs/widgets/githubissues.py
deleted file mode 100755
index 7130183..0000000
--- a/hubs/widgets/githubissues.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from __future__ import unicode_literals
-
-import requests
-
-from hubs.hinting import hint
-from hubs.widgets import templating
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-import hubs.validators as validators
-
-chrome = panel("Github: Newest Open Tickets")
-template = templating.environment.get_template('templates/githubissues.html')
-position = 'right'
-
-
-@argument(name="repo",
-          default=None,
-          validator=validators.github_organization,
-          help="Github Organization or username")
-def data(session, widget, display_number, org, repo):
-    ''' Data for Github Issues widget. Queries github api for issues '''
-
-    url = '/'.join(['https://api.github.com/repos', org, repo, "issues"])
-    issues = requests.get(url).json()
-
-    all_issues = []
-    for issue in issues[:10]:
-        issue_details = {}
-        issue_details['num'] = issue['number']
-        issue_details['title'] = issue['title']
-        issue_details['openedby'] = issue['user']['login']
-
-        issue_assignee = None
-        if issue['assignee'] is not None:
-            issue_assignee = issue['assignee']['login']
-
-        issue_details['assignee'] = issue_assignee
-        all_issues.append(issue_details)
-
-    return dict(
-        org=org,
-        repo=repo,
-        all_issues=all_issues.reverse(),
-        display_number=display_number,
-    )
-
-
-@hint()
-def should_invalidate(message, session, widget):
-    ''' Checks if the Github Issue widget needs an update.
-    Called by a backend daemon listening to fedmsg '''
-
-    raise NotImplementedError
diff --git a/hubs/widgets/githubissues/__init__.py b/hubs/widgets/githubissues/__init__.py
new file mode 100644
index 0000000..efee564
--- /dev/null
+++ b/hubs/widgets/githubissues/__init__.py
@@ -0,0 +1,82 @@
+from __future__ import unicode_literals
+
+import requests
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+
+class GitHubIssues(Widget):
+
+    name = "githubissues"
+    position = "right"
+    arguments = [
+        dict(
+            name="org",
+            label="Username",
+            default=None,
+            validator=validators.github_organization,
+            help="Github Organization or username",
+        ), dict(
+            name="repo",
+            label="Repository",
+            default=None,
+            validator=validators.github_repo,
+            help="Github repository",
+        ), dict(
+            name="display_number",
+            label="Number of tickets",
+            default=10,
+            validator=validators.integer,
+            help="The number of tickets to display.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/githubissues.html"
+    chrome = panel("Github: Newest Open Tickets")
+
+    def get_context(self, instance, *args, **kwargs):
+        get_issues = GetIssues(instance)
+        return dict(
+            org=instance.config["org"],
+            repo=instance.config["repo"],
+            display_number=int(instance.config["display_number"]),
+            all_issues=get_issues(),
+        )
+
+
+class GetIssues(CachedFunction):
+    ''' Data for Github Issues widget. Queries github api for issues '''
+
+    def execute(self):
+        org = self.instance.config["org"]
+        repo = self.instance.config["repo"]
+        display_number = int(self.instance.config["display_number"])
+        url = '/'.join(['https://api.github.com/repos', org, repo, "issues"])
+        issues = requests.get(url).json()
+
+        all_issues = []
+        for issue in issues[:display_number]:
+            issue_details = {}
+            issue_details['num'] = issue['number']
+            issue_details['title'] = issue['title']
+            issue_details['openedby'] = issue['user']['login']
+
+            issue_assignee = None
+            if issue['assignee'] is not None:
+                issue_assignee = issue['assignee']['login']
+
+            issue_details['assignee'] = issue_assignee
+            all_issues.append(issue_details)
+
+        all_issues.reverse()
+        return all_issues
+
+    def should_invalidate(self, message):
+        raise NotImplementedError

From daaf67140214e7f69d145c2f6ba68dbf562e0630 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 20/45] Convert the github_pr widget


---

diff --git a/hubs/widgets/github_pr.py b/hubs/widgets/github_pr.py
deleted file mode 100755
index c2a0be9..0000000
--- a/hubs/widgets/github_pr.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from __future__ import unicode_literals
-
-import logging
-
-from hubs.widgets.chrome import panel
-from hubs.hinting import hint
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-import hubs.utils
-
-import fedmsg.config
-config = fedmsg.config.load_config()
-
-log = logging.getLogger(__name__)
-
-chrome = panel("Github: Pull Requests")
-template = templating.environment.get_template('templates/github_pr.html')
-position = 'right'
-
-
-@argument(name="display_number",
-          default=6,
-          validator=validators.integer,
-          help="How many pull requests to display at max.")
-@argument(name="organization",
-          default=None,
-          validator=validators.github_organization,
-          help="Github Organization or username")
-def data(session, widget, display_number, organization):
-    log.info("Getting GH prs for %r, (%r)" % (organization, display_number))
-    token = config.get('github.oauth_token')
-    org = organization
-    pulls = []
-    display_number = 0
-    more = 0
-    if token:
-        repos = hubs.utils.github_repos(token, org)
-        pulls = sum([
-            list(hubs.utils.github_pulls(token, org, repo))
-            for repo in repos
-        ], [])
-        # Reverse-sort by time (newest-first)
-        pulls.sort(lambda a, b: cmp(b['timestamp'], a['timestamp']))
-
-        # Some hints for display
-        len_pulls = len(pulls)
-        display_number = min(display_number, len_pulls)
-        more = max(len_pulls - display_number, 0)
-
-    return dict(
-        organization=org,
-        display_number=display_number,
-        more=more,
-        pulls=pulls,
-    )
-
-
-@hint(categories=['github'])
-def should_invalidate(message, session, widget):
-    owner = message['msg']['repository']['owner']
-
-    if 'login' in owner:
-        owner = owner['login']
-    else:
-        owner = owner['name']
-
-    return owner == widget.config['organization']
diff --git a/hubs/widgets/github_pr/__init__.py b/hubs/widgets/github_pr/__init__.py
new file mode 100644
index 0000000..5478f1c
--- /dev/null
+++ b/hubs/widgets/github_pr/__init__.py
@@ -0,0 +1,94 @@
+from __future__ import unicode_literals
+
+import logging
+import hubs.utils
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+import fedmsg.config
+fedmsg_config = fedmsg.config.load_config()
+
+log = logging.getLogger(__name__)
+
+
+class GitHubPRs(Widget):
+
+    name = "github_pr"
+    position = "right"
+    arguments = [
+        dict(
+            name="organization",
+            label="Organization",
+            default=None,
+            validator=validators.github_organization,
+            help="Github Organization or username",
+        ), dict(
+            name="display_number",
+            label="Number of tickets",
+            default=6,
+            validator=validators.integer,
+            help="How many pull requests to display at max.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/github_pr.html"
+    chrome = panel("Github: Pull Requests")
+
+    def get_context(self, instance, *args, **kwargs):
+        get_prs = GetPRs(instance)
+        org = instance.config["organization"]
+        display_number = int(instance.config["display_number"])
+        context = dict(
+            organization=org,
+            display_number=display_number,
+        )
+        context.update(get_prs())
+        return context
+
+
+class GetPRs(CachedFunction):
+
+    def execute(self):
+        org = self.instance.config["organization"]
+        display_number = int(self.instance.config["display_number"])
+        log.info("Getting GH prs for %r, (%r)" % (org, display_number))
+        token = fedmsg_config.get('github.oauth_token')
+        pulls = []
+        displayed_number = 0
+        more = 0
+        if token:
+            repos = hubs.utils.github_repos(token, org)
+            pulls = sum([
+                list(hubs.utils.github_pulls(token, org, repo))
+                for repo in repos
+            ], [])
+            # Reverse-sort by time (newest-first)
+            pulls.sort(lambda a, b: cmp(b['timestamp'], a['timestamp']))
+
+            # Some hints for display
+            len_pulls = len(pulls)
+            displayed_number = min(display_number, len_pulls)
+            more = max(len_pulls - displayed_number, 0)
+
+        return dict(
+            more=more,
+            pulls=pulls,
+        )
+
+    def should_invalidate(self, message):
+        category = message["topic"].split('.')[3]
+        if category != "github":
+            return False
+        owner = message['msg']['repository']['owner']
+        if 'login' in owner:
+            owner = owner['login']
+        else:
+            owner = owner['name']
+        return owner == self.instance.config['organization']

From 6532d55260b88862772f3bef1b86fd1539412d3a Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 21/45] Convert the library widget


---

diff --git a/hubs/tests/test_widgets/test_library.py b/hubs/tests/test_widgets/test_library.py
index ac7ddfc..92b4bde 100644
--- a/hubs/tests/test_widgets/test_library.py
+++ b/hubs/tests/test_widgets/test_library.py
@@ -18,12 +18,12 @@ class TestLibrary(hubs.tests.test_widgets.WidgetTest):
                 "urls": "ralph/"
             },
             "data": {
-                u"edit_url": u"/ralph/%d/edit" % widget.idx,
-                u"source_url": u"/source/library",
-                u"urls": [
-                    u"<a href=\"ralph/\">ralph/</a>"
+                "edit_url": "/ralph/%d/edit" % widget.idx,
+                "source_url": "/source/library",
+                "urls": [
+                    "<a href=\"ralph/\">ralph/</a>"
                 ],
-                u"widget_url": u"/ralph/%d" % widget.idx,
+                "widget_url": "/ralph/w/library/%d/" % widget.idx
             },
             "description": None,
             "hub": "ralph",
@@ -32,5 +32,4 @@ class TestLibrary(hubs.tests.test_widgets.WidgetTest):
             "left": False,
             "plugin": "library"
         }
-
         self.assertDictEqual(data['data'], expected_dict['data'])
diff --git a/hubs/widgets/library.py b/hubs/widgets/library.py
deleted file mode 100644
index 08ad334..0000000
--- a/hubs/widgets/library.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-from hubs.widgets import clean_input
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-chrome = panel("Library")
-template = templating.environment.get_template('templates/library.html')
-position = 'both'
-
-
-@argument(name="urls", default=None,
-          validator=validators.text,
-          help="A comma separated list of URLs to add to the library. "
-          "External links must include the whole link (starting with http...)")
-def data(session, widget, urls):
-    ''' Data for the Library widget. Given the widget, it
-    returns the hypertext links of it's configuration urls '''
-
-    urls = [
-        clean_input.clean(
-            '<a href="{0}">{0}</a>'.format(u.strip()))
-        for u in widget.config.get('urls', '').split(',')
-        if u.strip()
-    ]
-    return dict(urls=urls)
-
-
-@hint(topics=[_('hubs.widget.update')])
-def should_invalidate(message, session, widget):
-    ''' Check if the Library widget cache needs an update.
-    Called by a backend daemon listening to fedmsg '''
-
-    if not message['topic'].endswith('hubs.widget.update'):
-        return False
-    if message['msg']['widget']['id'] != widget.id:
-        return False
-    return True
diff --git a/hubs/widgets/library/__init__.py b/hubs/widgets/library/__init__.py
new file mode 100644
index 0000000..09ec390
--- /dev/null
+++ b/hubs/widgets/library/__init__.py
@@ -0,0 +1,38 @@
+from __future__ import unicode_literals
+
+from hubs import validators
+from hubs.widgets import clean_input
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+
+class Library(Widget):
+
+    name = "library"
+    position = "both"
+    arguments = [dict(
+        name="urls",
+        label="URLs",
+        default=None,
+        validator=validators.text,
+        help="A comma separated list of URLs to add to the library. "
+             "External links must include the whole link "
+             "(starting with http...)."
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/library.html"
+    chrome = panel("Library")
+
+    def get_context(self, instance, *args, **kwargs):
+        urls = [
+            clean_input.clean(
+                '<a href="{0}">{0}</a>'.format(u.strip()))
+            for u in instance.config.get('urls', '').split(',')
+            if u.strip()
+        ]
+        return dict(urls=urls)

From 4fa1f96e09f1d7fdcaf3d1a7bb959a7ddd43bf61 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 22/45] Convert the linechart widget


---

diff --git a/hubs/widgets/linechart.py b/hubs/widgets/linechart.py
deleted file mode 100755
index 3d41057..0000000
--- a/hubs/widgets/linechart.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-import fedmsg.config
-config = fedmsg.config.load_config()
-
-from hubs.widgets.chrome import panel
-chrome = panel("Weekly Activity")
-template = templating.environment.get_template('templates/linechart.html')
-position = 'left'
-
-
-@argument(name="username",
-          default=None,
-          validator=validators.username,
-          help="A FAS username.")
-def data(session, widget, username):
-    categories = ['git', 'Wiki', 'Copr', 'anitya', 'mirrormanager', 'ansible',
-                  'fedoratagger', 'Pkgdb', 'summershum', 'nuancier', 'Mailman',
-                  'fedbadges', 'FMN', 'koschei', 'compose', 'fedimg',
-                  'Jenkins', 'irc', 'FAS', 'buildsys', 'Askbot', 'pagure',
-                  'Bodhi', 'faf', 'kerneltest', 'github', 'Trac', 'meetbot',
-                  'planet', 'fedocal', 'hotness']
-    categories = [c.lower() for c in categories]
-    categories = "&".join(['category=%s' % c for c in categories])
-    url = "https://apps.fedoraproject.org/datagrepper/charts/stackedline" \
-          "?delta=604800&N=12&style=clean&height=300&fill=true"\
-          "&user={username}&split_on=categories"
-    url = url + "&" + categories
-    url = url.format(username=username)
-    return dict(url=url)
-
-
-@hint(usernames=lambda widget: [widget.config['username']])
-def should_invalidate(message, session, widget):
-    usernames = fedmsg.meta.msg2usernames(message, **config)
-    username = widget.config['username']
-    return username in usernames
diff --git a/hubs/widgets/linechart/__init__.py b/hubs/widgets/linechart/__init__.py
new file mode 100644
index 0000000..c7ac68e
--- /dev/null
+++ b/hubs/widgets/linechart/__init__.py
@@ -0,0 +1,45 @@
+from __future__ import unicode_literals
+
+from hubs import validators
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+
+class Linechart(Widget):
+
+    name = "linechart"
+    position = "left"
+    arguments = [dict(
+        name="username",
+        label="Username",
+        default=None,
+        validator=validators.username,
+        help="A FAS username.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/linechart.html"
+    chrome = panel("Weekly Activity")
+
+    def get_context(self, instance, *args, **kwargs):
+        username = instance.config["username"]
+        categories = [
+            'git', 'Wiki', 'Copr', 'anitya', 'mirrormanager', 'ansible',
+            'fedoratagger', 'Pkgdb', 'summershum', 'nuancier', 'Mailman',
+            'fedbadges', 'FMN', 'koschei', 'compose', 'fedimg',
+            'Jenkins', 'irc', 'FAS', 'buildsys', 'Askbot', 'pagure',
+            'Bodhi', 'faf', 'kerneltest', 'github', 'Trac', 'meetbot',
+            'planet', 'fedocal', 'hotness',
+            ]
+        categories = [c.lower() for c in categories]
+        categories = "&".join(['category=%s' % c for c in categories])
+        url = ("https://apps.fedoraproject.org/datagrepper/charts/stackedline"
+               "?delta=604800&N=12&style=clean&height=300&fill=true"
+               "&user={username}&split_on=categories")
+        url = url + "&" + categories
+        url = url.format(username=username)
+        return dict(url=url)

From 459c740e994f8ef187f0f456779efb5631e49607 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 23/45] Convert the meetings widget


---

diff --git a/hubs/defaults.py b/hubs/defaults.py
old mode 100755
new mode 100644
index d91d452..7b5129a
--- a/hubs/defaults.py
+++ b/hubs/defaults.py
@@ -29,6 +29,7 @@ def add_user_widgets(session, hub, username, fullname):
         plugin='meetings', index=-1,
         _config=json.dumps({
             'calendar': 'Fedora release',
+            'n_meetings': 4,
         }))
     hub.widgets.append(widget)
 
diff --git a/hubs/tests/test_widgets/test_meetings.py b/hubs/tests/test_widgets/test_meetings.py
index 08ea046..859bfb9 100644
--- a/hubs/tests/test_widgets/test_meetings.py
+++ b/hubs/tests/test_widgets/test_meetings.py
@@ -20,7 +20,8 @@ class TestMeetings(hubs.tests.test_widgets.WidgetTest):
     def test_render_simple(self):
         team = 'i18n'
         widget = self.widget_instance(team, self.plugin)
-        response = self.app.get('/%s/%i/' % (team, widget.idx))
+        response = self.app.get('/%s/w/%s/%i/'
+                                % (team, self.plugin, widget.idx))
         self.assertEqual(200, response.status_code)
         self.assertIn('i18n', response.get_data(as_text=True))
         self.assertIn('<strong>Request A New Meeting</strong>',
diff --git a/hubs/tests/vcr-request-data/hubs.tests.test_widgets.test_meetings.TestMeetings.test_render_simple b/hubs/tests/vcr-request-data/hubs.tests.test_widgets.test_meetings.TestMeetings.test_render_simple
new file mode 100644
index 0000000..32812c9
--- /dev/null
+++ b/hubs/tests/vcr-request-data/hubs.tests.test_widgets.test_meetings.TestMeetings.test_render_simple
@@ -0,0 +1,43 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      User-Agent: [python-requests/2.12.5]
+    method: GET
+    uri: https://apps.fedoraproject.org/calendar/api/meetings/?calendar=i18n
+  response:
+    body:
+      string: !!binary |
+        H4sIAAAAAAAAA+3Zz2/bIBQH8H/lyadNCrZx82s5Teuph/bUSanWKWL2S8pqQ4RJqy3K/z7I0ogw
+        7TBp8rsgxYcA5svDH3Gw91mHaKXa9NkCvuzf/q2s7HDVW2Gsa8/K6aIs3S8bwXmEbFzPhE+qsE2t
+        temElVr52z5J9or43P6A0wBw3SD5XIHBVlhsoJF9vet7d0OfP5pH5a9bbRCCqUC8CNmKby2CsAt4
+        snbbL4pijY02Ymv0d6xtrs2meJXPsrjh87vi9lRUUZV8zJZL9vAAAO+WS2DQaWWfRuBaGDRuEfl7
+        X1YtWlSNMCslOvSL98sM6z3tiN4eN2T254b4uVZuDt/vYmes5KwchyNaXZ/35vfq2anrozR1vjaI
+        SjeYK7ThbZ1QYoPGP6Bsa8SLVH32NQr+e2hYz9tziOv6qdVxzOf76+wwgsTgPzPgcwIGl6GJATWD
+        yj2UwRnEoYkBPQM+IWBwGZoYUDO4ojgN4tDEgJ4BwWkQhyYG9AyqDwQMLkMTA2oGY8arwRnEoYkB
+        PYNqSsDgMjQxoGYwYbwcnEEcmhjQM6iGf4sYhyYG1AymrJwNziAOTQzoGVTDvzeIQxMDagb+iB6c
+        QRyaGNAz4MO/N4hD/5mBn1qYza5DZf135312dnD+hlmFWxbuVlT/1fFgCupWu7Y9HH4Bm4DFHNge
+        AAA=
+    headers:
+      Accept-Ranges: [bytes]
+      Age: ['0']
+      AppServer: [proxy04.fedoraproject.org]
+      AppTime: [D=176951]
+      Connection: [Keep-Alive]
+      Content-Encoding: [gzip]
+      Content-Length: ['515']
+      Content-Type: [application/json]
+      Date: ['Wed, 01 Feb 2017 08:36:43 GMT']
+      Keep-Alive: ['timeout=15, max=500']
+      Server: [Apache/2.4.6 (Red Hat Enterprise Linux) mod_wsgi/3.4 Python/2.7.5]
+      Set-Cookie: ['fedocal=eyJfcGVybWFuZW50Ijp0cnVlfQ.C3Mvmw.rzQ95C3LVBlZJKMEJVpzih4SIT4;
+          Expires=Wed, 01-Feb-2017 09:36:43 GMT; Secure; HttpOnly; Path=/calendar']
+      Strict-Transport-Security: [max-age=15768000; includeSubDomains; preload]
+      Vary: [Accept-Encoding]
+      Via: [1.1 varnish-v4]
+      X-Varnish: ['1754049']
+    status: {code: 200, message: OK}
+version: 1
diff --git a/hubs/widgets/meetings.py b/hubs/widgets/meetings.py
deleted file mode 100755
index 713177b..0000000
--- a/hubs/widgets/meetings.py
+++ /dev/null
@@ -1,117 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint
-from hubs.widgets.base import argument
-from hubs.widgets.chrome import panel
-from hubs.widgets import templating
-
-from hubs import validators
-from hubs import utils
-
-import hubs.models
-
-import arrow
-import collections
-import datetime
-import requests
-
-
-def next_meeting(meetings):
-    now = datetime.datetime.utcnow()
-    for meeting in meetings:
-        start_string = "%s %s" % (
-            meeting['meeting_date'], meeting['meeting_time_start'])
-        start_dt = datetime.datetime.strptime(
-            start_string, "%Y-%m-%d %H:%M:%S")
-
-        stop_string = "%s %s" % (
-            meeting['meeting_date_end'], meeting['meeting_time_stop'])
-        stop_dt = datetime.datetime.strptime(
-            stop_string, "%Y-%m-%d %H:%M:%S")
-
-        # Loop over them until we find a good one.
-        # Meetings before now are no good.  We want the first one after now.
-        if start_dt < now:
-            continue
-
-        meeting['start_dt'] = start_dt
-        meeting['start_date'] = start_dt.strftime('%b %d')
-        meeting['stop_date'] = stop_dt.strftime('%b %d')
-        meeting['display_time'] = True
-        meeting['display_duration'] = False
-        # Just UTC for now until we do this on the client and can access
-        # their local with moment.js.
-        meeting['start_time'] = meeting['meeting_time_start'][:-3] + " UTC"
-        meeting['stop_time'] = meeting['meeting_time_stop'][:-3] + " UTC"
-        meeting['location'] = meeting['meeting_location'] or ''
-        if '@' in meeting['location']:
-            meeting['location'] = '#' + meeting['location'].split('@')[0]
-        if stop_dt - start_dt >= datetime.timedelta(hours=24) :
-            meeting['display_time'] = False
-            if stop_dt - start_dt > datetime.timedelta(hours=24) :
-                meeting['display_duration'] = True
-        return meeting
-
-    return None
-
-
-footer_template = templating.environment.get_template('templates/meeting_footer.html')
-chrome = panel(title='Meetings', footer_template=footer_template)
-templating.environment.filters['humanize'] = lambda d: arrow.get(d).humanize()
-template = templating.environment.get_template('templates/meetings.html')
-position = 'both'
-
-
-@argument(name="calendar",
-          default=None,
-          validator=validators.required,
-          help="A fedocal calendar.")
-@argument(name="n_meetings",
-          default=4,
-          validator=validators.integer,
-          help="The number of meetings to display.")
-def data(session, widget, calendar, n_meetings=4):
-    n_meetings = int(n_meetings)
-    base = 'https://apps.fedoraproject.org/calendar/api/meetings/?calendar=%s'
-    url = base % calendar
-    response = requests.get(url).json()
-
-    tmp = collections.defaultdict(list)
-    for meeting in response['meetings']:
-        if meeting.get('meeting_information_html'):
-            meeting['meeting_information_html'] = utils.markup(
-                meeting['meeting_information'])
-        tmp[meeting['meeting_name']].append(meeting)
-
-    meetings = {}
-    for title, items in tmp.items():
-        selected = next_meeting(items)
-        if not selected:
-            continue
-        meetings[title] = selected
-        if len(meetings) >= n_meetings:
-            break
-
-    return dict(
-        calendar=calendar,
-        meetings=meetings,
-    )
-
-
-@hint(ubiquitous=True)
-def should_invalidate(message, session, widget):
-
-    # TODO -- first, if this is a fedocal widget, we need to just invalidate
-    # ourselves right away.
-
-    # second, check our old cache value and see if any of our meetings have
-    # passed by in time.
-    old_data = data(session, widget, **widget.config)
-    meetings = old_data['meetings']
-    now = datetime.datetime.utcnow()
-    for title, meeting in meetings.items():
-        assert type(meeting['start_dt']) == type(now)
-        if meeting['start_dt'] < now:
-            return True
-
-    return False
diff --git a/hubs/widgets/meetings/__init__.py b/hubs/widgets/meetings/__init__.py
new file mode 100644
index 0000000..9209de2
--- /dev/null
+++ b/hubs/widgets/meetings/__init__.py
@@ -0,0 +1,135 @@
+from __future__ import unicode_literals
+
+import arrow
+import collections
+import datetime
+import requests
+
+from hubs import validators
+from hubs import utils
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+
+
+class Meetings(Widget):
+
+    name = "meetings"
+    position = "both"
+    arguments = [
+        dict(
+            name="calendar",
+            label="Calendar",
+            default=None,
+            validator=validators.required,
+            help="A fedocal calendar.",
+        ), dict(
+            name="n_meetings",
+            label="Number of meetings",
+            default=4,
+            validator=validators.integer,
+            help="The number of meetings to display.",
+        )]
+
+    def get_template_environment(self):
+        env = super(Meetings, self).get_template_environment()
+        # Add a filter
+        env.filters['humanize'] = lambda d: arrow.get(d).humanize()
+        return env
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/meetings.html"
+    chrome = panel(title='Meetings', footer_template='templates/meeting_footer.html')
+
+    def get_context(self, instance, *args, **kwargs):
+        get_meetings = GetMeetings(instance)
+        return dict(
+            calendar=instance.config["calendar"],
+            meetings=get_meetings(),
+            )
+
+
+class GetMeetings(CachedFunction):
+
+    def execute(self):
+        calendar = self.instance.config["calendar"]
+        n_meetings = int(self.instance.config.get("n_meetings", 4))
+        base = ('https://apps.fedoraproject.org/calendar/api/meetings/'
+                '?calendar=%s')
+        url = base % calendar
+        response = requests.get(url).json()
+
+        tmp = collections.defaultdict(list)
+        for meeting in response['meetings']:
+            if meeting.get('meeting_information_html'):
+                meeting['meeting_information_html'] = utils.markup(
+                    meeting['meeting_information'])
+            tmp[meeting['meeting_name']].append(meeting)
+
+        meetings = {}
+        for title, items in tmp.items():
+            selected = next_meeting(items)
+            if not selected:
+                continue
+            meetings[title] = selected
+            if len(meetings) >= n_meetings:
+                break
+
+        return meetings
+
+    def should_invalidate(self, message):
+        # TODO -- first, if this is a fedocal widget, we need to just
+        # invalidate ourselves right away.
+
+        # second, check our old cache value and see if any of our meetings have
+        # passed by in time.
+        old_meetings = self.execute()
+        now = datetime.datetime.utcnow()
+        for title, meeting in old_meetings.items():
+            assert type(meeting['start_dt']) == type(now)
+            if meeting['start_dt'] < now:
+                return True
+        return False
+
+
+def next_meeting(meetings):
+    now = datetime.datetime.utcnow()
+    for meeting in meetings:
+        start_string = "%s %s" % (
+            meeting['meeting_date'], meeting['meeting_time_start'])
+        start_dt = datetime.datetime.strptime(
+            start_string, "%Y-%m-%d %H:%M:%S")
+
+        stop_string = "%s %s" % (
+            meeting['meeting_date_end'], meeting['meeting_time_stop'])
+        stop_dt = datetime.datetime.strptime(
+            stop_string, "%Y-%m-%d %H:%M:%S")
+
+        # Loop over them until we find a good one.
+        # Meetings before now are no good.  We want the first one after now.
+        if start_dt < now:
+            continue
+
+        meeting['start_dt'] = start_dt
+        meeting['start_date'] = start_dt.strftime('%b %d')
+        meeting['stop_date'] = stop_dt.strftime('%b %d')
+        meeting['display_time'] = True
+        meeting['display_duration'] = False
+        # Just UTC for now until we do this on the client and can access
+        # their local with moment.js.
+        meeting['start_time'] = meeting['meeting_time_start'][:-3] + " UTC"
+        meeting['stop_time'] = meeting['meeting_time_stop'][:-3] + " UTC"
+        meeting['location'] = meeting['meeting_location'] or ''
+        if '@' in meeting['location']:
+            meeting['location'] = '#' + meeting['location'].split('@')[0]
+        if stop_dt - start_dt >= datetime.timedelta(hours=24):
+            meeting['display_time'] = False
+            if stop_dt - start_dt > datetime.timedelta(hours=24):
+                meeting['display_duration'] = True
+        return meeting
+
+    return None
diff --git a/populate.py b/populate.py
index 503b0e9..3eab11d 100755
--- a/populate.py
+++ b/populate.py
@@ -99,7 +99,7 @@ widget = hubs.models.Widget(plugin='rules', index=1,
 hub.widgets.append(widget)
 
 widget = hubs.models.Widget(plugin='meetings', index=2,
-                            _config=json.dumps({'calendar': 'commops'}))
+                            _config=json.dumps({'calendar': 'commops', 'n_meetings': 4}))
 hub.widgets.append(widget)
 
 # Added a hubs about widget
@@ -146,7 +146,7 @@ widget = hubs.models.Widget(plugin='rules', index=1,
 hub.widgets.append(widget)
 
 widget = hubs.models.Widget(plugin='meetings', index=2,
-                            _config=json.dumps({'calendar': 'marketing'}))
+                            _config=json.dumps({'calendar': 'marketing', 'n_meetings': 4}))
 hub.widgets.append(widget)
 
 # Added a hubs about widget
@@ -194,7 +194,7 @@ widget = hubs.models.Widget(plugin='rules', index=1,
 hub.widgets.append(widget)
 
 widget = hubs.models.Widget(plugin='meetings', index=2,
-                            _config=json.dumps({'calendar': 'design'}))
+                            _config=json.dumps({'calendar': 'design', 'n_meetings': 4}))
 hub.widgets.append(widget)
 
 # Added a hubs about widget
@@ -243,7 +243,7 @@ widget = hubs.models.Widget(plugin='rules', index=1,
 hub.widgets.append(widget)
 
 widget = hubs.models.Widget(plugin='meetings', index=2,
-                            _config=json.dumps({'calendar': 'infrastructure'}))
+                            _config=json.dumps({'calendar': 'infrastructure', 'n_meetings': 4}))
 hub.widgets.append(widget)
 
 # Added a hubs about widget

From dc975affd9ef56da03580da432687e6fc7eed2af Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 24/45] Convert the memberships widget


---

diff --git a/hubs/widgets/memberships.py b/hubs/widgets/memberships.py
deleted file mode 100644
index 95beb74..0000000
--- a/hubs/widgets/memberships.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from __future__ import unicode_literals
-
-import hubs.models
-from hubs.hinting import hint, prefixed as _
-import hubs.validators as validators
-from hubs.widgets.base import argument
-from hubs.widgets.chrome import panel
-from hubs.widgets import templating
-
-ELLIPSIS_LIMIT = 3
-chrome = panel('Hubs')
-template = templating.environment.get_template('templates/memberships.html')
-position = 'both'
-
-
-def data(session, widget, **kwargs):
-    hub = widget.hub
-    members = []
-    if hub.user_hub:
-        user = hubs.models.User.by_username(hub.name)
-        members = [m.__json__() for m in user.memberships
-                   if m.name != user.username]
-    else:
-        members_name = []
-        for member in widget.hub.members:
-            if member.username in members_name:
-                continue
-            members_name.append(member.username)
-            members.append(member.__json__())
-
-    oldest_members = sorted(members,
-                            key=lambda m: m.get('created_on'))[:ELLIPSIS_LIMIT]
-    return dict(memberships=list(members), oldest_members=list(oldest_members))
-
-
-@hint(topics=[_('hubs.hub.update')])
-def should_invalidate(message, session, widget):
-    if message['topic'].endswith('hubs.hub.update'):
-        if message['msg']['hub']['name'] == widget.hub.name:
-            return True
-    return False
diff --git a/hubs/widgets/memberships/__init__.py b/hubs/widgets/memberships/__init__.py
new file mode 100644
index 0000000..cc8f602
--- /dev/null
+++ b/hubs/widgets/memberships/__init__.py
@@ -0,0 +1,45 @@
+from __future__ import unicode_literals
+
+import hubs.models
+
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+
+ELLIPSIS_LIMIT = 3
+
+
+class Memberships(Widget):
+
+    name = "memberships"
+    position = "both"
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/memberships.html"
+    chrome = panel('Hubs')
+
+    def get_context(self, instance, *args, **kwargs):
+        hub = instance.hub
+        members = []
+        if hub.user_hub:
+            user = hubs.models.User.by_username(hub.name)
+            members = [m.__json__() for m in user.memberships
+                       if m.name != user.username]
+        else:
+            members_name = []
+            for member in hub.members:
+                if member.username in members_name:
+                    continue
+                members_name.append(member.username)
+                members.append(member.__json__())
+
+        oldest_members = sorted(
+            members, key=lambda m: m.get('created_on'))[:ELLIPSIS_LIMIT]
+        return dict(
+            memberships=list(members),
+            oldest_members=list(oldest_members),
+            )

From 46477d9d20f2fb7b0281746191e2628ff9665548 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 25/45] Convert the pagureissues widget


---

diff --git a/hubs/widgets/pagureissues.py b/hubs/widgets/pagureissues.py
deleted file mode 100755
index 9a4dca8..0000000
--- a/hubs/widgets/pagureissues.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from __future__ import unicode_literals
-
-import requests
-
-from hubs.hinting import hint
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-import hubs.validators as validators
-
-pagure_url = "https://pagure.io/api/0"
-
-chrome = panel("Newest Open Tickets on Pagure")
-template = templating.environment.get_template('templates/pagureissues.html')
-position = 'right'
-
-
-@argument(name="repo",
-          default=None,
-          validator=validators.pagure_repo,
-          help="Pagure repo name")
-def data(session, widget, repo):
-    ''' Data for pagure issues widget
-    Queries Pagure api for issues '''
-
-    repo = "pagure"
-
-    url = '/'.join([pagure_url, repo, "issues"])
-    issue_response = requests.get(url)
-    data = issue_response.json()
-    total = data['total_issues']
-
-    all_issues = list()
-    for issue in data['issues']:
-
-        issue_assignee = None
-        if issue['assignee']:
-            issue_assignee = issue['assignee']['name']
-
-        issue_project_user = None
-        if 'project' in issue:
-            issue_project_name = issue['project']['name']
-            if issue['project']['parent']:
-                issue_project_user = issue['project']['user']['username']
-            else:
-                if '/' in repo:
-                    issue_project_name, issue_project_user = repo.split('/', 1)
-                else:
-                    issue_project_name = repo
-
-        all_issues.append(
-            dict(
-                issue_project_name=issue_project_name,
-                issue_project_user=issue_project_user,
-                issue_id=issue['id'],
-                issue_title=issue['title'][:45],
-                issue_title_full=issue['title'],
-                issue_openedby=issue['user']['name'],
-                issue_assignee=issue_assignee,
-            )
-        )
-
-    all_issues.reverse()
-
-    return dict(
-        repo=repo,
-        total=total,
-        all_issues=all_issues,
-    )
-
-
-@hint()
-def should_invalidate(message, session, widget):
-    ''' Checks whether pagureissues widget cache needs an update
-    Run by backend daemon listening to fedmsg '''
-
-    raise NotImplementedError
diff --git a/hubs/widgets/pagureissues/__init__.py b/hubs/widgets/pagureissues/__init__.py
new file mode 100644
index 0000000..2be36a8
--- /dev/null
+++ b/hubs/widgets/pagureissues/__init__.py
@@ -0,0 +1,91 @@
+from __future__ import unicode_literals
+
+import requests
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+pagure_url = "https://pagure.io/api/0"
+
+
+class PagureIssues(Widget):
+
+    name = "pagureissues"
+    position = "right"
+    arguments = [
+        dict(
+            name="repo",
+            label="Repository",
+            default=None,
+            validator=validators.pagure_repo,
+            help="Pagure repo name",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/pagureissues.html"
+    chrome = panel("Newest Open Tickets on Pagure")
+
+    def get_context(self, instance, *args, **kwargs):
+        get_issues = GetIssues(instance)
+        context = dict(repo=instance.config["repo"])
+        context.update(get_issues())
+        return context
+
+
+class GetIssues(CachedFunction):
+    ''' Data for pagure issues widget
+    Queries Pagure api for issues '''
+
+    def execute(self):
+        repo = self.instance.config["repo"]
+
+        url = '/'.join([pagure_url, repo, "issues"])
+        issue_response = requests.get(url)
+        data = issue_response.json()
+        total = data['total_issues']
+
+        all_issues = list()
+        for issue in data['issues']:
+
+            issue_assignee = None
+            if issue['assignee']:
+                issue_assignee = issue['assignee']['name']
+
+            issue_project_user = None
+            if 'project' in issue:
+                issue_project_name = issue['project']['name']
+                if issue['project']['parent']:
+                    issue_project_user = issue['project']['user']['username']
+                else:
+                    if '/' in repo:
+                        issue_project_name, issue_project_user = \
+                            repo.split('/', 1)
+                    else:
+                        issue_project_name = repo
+
+            all_issues.append(
+                dict(
+                    issue_project_name=issue_project_name,
+                    issue_project_user=issue_project_user,
+                    issue_id=issue['id'],
+                    issue_title=issue['title'][:45],
+                    issue_title_full=issue['title'],
+                    issue_openedby=issue['user']['name'],
+                    issue_assignee=issue_assignee,
+                )
+            )
+
+        all_issues.reverse()
+        return dict(
+            total=total,
+            all_issues=all_issues,
+        )
+
+    def should_invalidate(self, message):
+        raise NotImplementedError

From 7a94d6ea57ae6e85dbdca197133f9be9306b77dc Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 26/45] Convert the pagure_pr widget


---

diff --git a/hubs/widgets/pagure_pr.py b/hubs/widgets/pagure_pr.py
deleted file mode 100755
index 081dcb4..0000000
--- a/hubs/widgets/pagure_pr.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-import requests
-
-pagure_url = "https://pagure.io/api/0"
-
-chrome = panel("Newest Open Pull Requests on Pagure")
-template = templating.environment.get_template('templates/pagure_pr.html')
-position = 'right'
-
-
-@argument(name="repo",
-          default=None,
-          validator=validators.pagure_repo,
-          help="Pagure repo name")
-def data(session, widget, repo):
-    url = '/'.join([pagure_url, repo, "pull-requests"])
-    response = requests.get(url)
-    data = response.json()
-    total_req = data['total_requests']
-    all_pr = list()
-
-    for request in data['requests']:
-        pr_project_user = None
-        if request['project']['parent']:
-            pr_project_user = request['project']['user']['username']
-
-        all_pr.append(
-            dict(
-                pr_project_name=request['project']['name'],
-                pr_project_user=pr_project_user,
-                pr_id=request['id'],
-                pr_title=request['title'][:45],
-                pr_title_full=request['title'],
-                pr_openedby=request['user']['name'],
-                pr_assignee=request['assignee'],
-            )
-        )
-
-    return dict(
-        all_pr=all_pr,
-        total_req=total_req,
-        repo=repo,
-    )
-
-
-# TODO -- this hint could be honed in more to just PRs
-@hint(categories=['pagure'])
-def should_invalidate(message, session, widget):
-    return message['msg']['project']['name'] == widget.config['repo']
diff --git a/hubs/widgets/pagure_pr/__init__.py b/hubs/widgets/pagure_pr/__init__.py
new file mode 100644
index 0000000..6e3cf5a
--- /dev/null
+++ b/hubs/widgets/pagure_pr/__init__.py
@@ -0,0 +1,79 @@
+from __future__ import unicode_literals
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+import requests
+
+pagure_url = "https://pagure.io/api/0"
+
+
+class PagurePRs(Widget):
+
+    name = "pagure_pr"
+    position = "right"
+    arguments = [
+        dict(
+            name="repo",
+            label="Repository",
+            default=None,
+            validator=validators.pagure_repo,
+            help="Pagure repo name.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/pagure_pr.html"
+    chrome = panel("Newest Open Pull Requests on Pagure")
+
+    def get_context(self, instance, *args, **kwargs):
+        get_prs = GetPRs(instance)
+        context = dict(repo=instance.config["repo"])
+        context.update(get_prs())
+        return context
+
+
+class GetPRs(CachedFunction):
+
+    def execute(self):
+        repo = self.instance.config["repo"]
+        url = '/'.join([pagure_url, repo, "pull-requests"])
+        response = requests.get(url)
+        data = response.json()
+        total_req = data['total_requests']
+        all_pr = list()
+
+        for request in data['requests']:
+            pr_project_user = None
+            if request['project']['parent']:
+                pr_project_user = request['project']['user']['username']
+
+            all_pr.append(
+                dict(
+                    pr_project_name=request['project']['name'],
+                    pr_project_user=pr_project_user,
+                    pr_id=request['id'],
+                    pr_title=request['title'][:45],
+                    pr_title_full=request['title'],
+                    pr_openedby=request['user']['name'],
+                    pr_assignee=request['assignee'],
+                )
+            )
+
+        return dict(
+            all_pr=all_pr,
+            total_req=total_req,
+        )
+
+    def should_invalidate(self, message):
+        category = message["topic"].split('.')[3]
+        if category != "pagure":
+            # TODO -- this could be honed in more to just PRs
+            return False
+        return (message['msg']['project']['name'] ==
+                self.instance.config['repo'])

From 050777aa069d8a37646bc09ff9f05c28c68dfce2 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 27/45] Convert the rules widget


---

diff --git a/hubs/widgets/rules.py b/hubs/widgets/rules.py
deleted file mode 100755
index d7554b9..0000000
--- a/hubs/widgets/rules.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from __future__ import unicode_literals
-
-from collections import OrderedDict as ordereddict
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-from hubs.utils import username2avatar
-from hubs import validators
-
-ELLIPSIS_LIMIT = 5
-chrome = panel()
-template = templating.environment.get_template('templates/rules.html')
-position = 'both'
-
-
-@argument(name='link', default=None,
-          validator=validators.link,
-          help="Link to the community rules and guidelines")
-@argument(name='schedule_text', default=None,
-          validator=validators.text,
-          help="Some text about when meetings are")
-@argument(name='schedule_link', default=None,
-          validator=validators.link,
-          help="Link to a schedule for IRC meetings, etc..")
-@argument(name='minutes_link', default=None,
-          validator=validators.link,
-          help="Link to meeting minutes from past meetings..")
-def data(session, widget, link, schedule_text, schedule_link, minutes_link):
-    owners = widget.hub.owners
-    oldest_owners = sorted(owners, key=lambda o: o.created_on)[:ELLIPSIS_LIMIT]
-    oldest_owners = [{
-        'username': o.username,
-        'avatar': username2avatar(o.username)
-    } for o in oldest_owners]
-
-    owners = ordereddict([
-        (o.username, username2avatar(o.username)) for o in owners
-    ])
-    return dict(oldest_owners=oldest_owners,
-                owners=owners, link=link,
-                schedule_text=schedule_text,
-                schedule_link=schedule_link,
-                minutes_link=minutes_link)
-
-
-@hint(topics=[_('hubs.widget.update'), _('hubs.hub.update')])
-def should_invalidate(message, session, widget):
-    if message['topic'].endswith('hubs.widget.update'):
-        if message['msg']['widget']['id'] == widget.id:
-            return True
-
-    if message['topic'].endswith('hubs.hub.update'):
-        if message['msg']['hub']['name'] == widget.hub.name:
-            return True
-
-    return False
diff --git a/hubs/widgets/rules/__init__.py b/hubs/widgets/rules/__init__.py
new file mode 100644
index 0000000..742ff22
--- /dev/null
+++ b/hubs/widgets/rules/__init__.py
@@ -0,0 +1,72 @@
+from __future__ import unicode_literals
+
+from collections import OrderedDict as ordereddict
+
+from hubs import validators
+from hubs.utils import username2avatar
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+
+ELLIPSIS_LIMIT = 5
+
+
+class Rules(Widget):
+
+    name = "rules"
+    position = "both"
+    arguments = [
+        dict(
+            name="link",
+            label="Link",
+            default=None,
+            validator=validators.link,
+            help="Link to the community rules and guidelines.",
+        ), dict(
+            name="schedule_text",
+            label="Schedule text",
+            default=None,
+            validator=validators.text,
+            help="Some text about when meetings are.",
+        ), dict(
+            name="schedule_link",
+            label="Schedule link",
+            default=None,
+            validator=validators.link,
+            help="Link to a schedule for IRC meetings, etc.",
+        ), dict(
+            name="minutes_link",
+            label="Minutes link",
+            default=None,
+            validator=validators.link,
+            help="Link to meeting menutes from past meetings.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/rules.html"
+    chrome = panel()
+
+    def get_context(self, instance, *args, **kwargs):
+        owners = instance.hub.owners
+        oldest_owners = sorted(
+            owners, key=lambda o: o.created_on)[:ELLIPSIS_LIMIT]
+        oldest_owners = [{
+            'username': o.username,
+            'avatar': username2avatar(o.username)
+        } for o in oldest_owners]
+
+        owners = ordereddict([
+            (o.username, username2avatar(o.username)) for o in owners
+        ])
+        return dict(
+            oldest_owners=oldest_owners,
+            owners=owners,
+            link=instance.config["link"],
+            schedule_text=instance.config["schedule_text"],
+            schedule_link=instance.config["schedule_link"],
+            minutes_link=instance.config["minutes_link"],
+            )

From e115da1bb17c3b049c05aa4711b29c4a69b27d45 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 28/45] Convert the stats widget


---

diff --git a/hubs/widgets/stats.py b/hubs/widgets/stats.py
deleted file mode 100755
index ebd6cc8..0000000
--- a/hubs/widgets/stats.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.chrome import panel
-from hubs.widgets import templating
-
-from hubs.utils import commas
-
-import flask
-
-chrome = panel()
-template = templating.environment.get_template('templates/stats.html')
-position = 'right'
-
-
-def data(session, widget):
-    owners = [u.username for u in widget.hub.owners]
-    members = [u.username for u in widget.hub.members]
-    subscribers = [u.username for u in widget.hub.subscribers]
-    stargazers = [u.username for u in widget.hub.stargazers]
-
-    return dict(
-        owners=owners,
-        members=members,
-        subscribers=subscribers,
-        stargazers=stargazers,
-
-        owners_text=commas(len(owners)),
-        members_text=commas(len(members)),
-        subscribers_text=commas(len(subscribers)),
-        stargazers_text=commas(len(stargazers)),
-
-        hub_leave_url=flask.url_for('hub_leave', hub=widget.hub.name),
-        hub_join_url=flask.url_for('hub_join', hub=widget.hub.name),
-        hub_unstar_url=flask.url_for('hub_unstar', hub=widget.hub.name),
-        hub_star_url=flask.url_for('hub_star', hub=widget.hub.name),
-        hub_subscribe_url=flask.url_for('hub_subscribe', hub=widget.hub.name),
-        hub_unsubscribe_url=flask.url_for(
-            'hub_unsubscribe', hub=widget.hub.name),
-    )
-
-
-@hint(topics=[_('hubs.hub.update')])
-def should_invalidate(message, session, widget):
-    if message['topic'].endswith('hubs.hub.update'):
-        if message['msg']['hub']['name'] == widget.hub.name:
-            return True
-
-    # TODO -- also check for FAS group changes??  are we doing that?
-
-    return False
diff --git a/hubs/widgets/stats/__init__.py b/hubs/widgets/stats/__init__.py
new file mode 100644
index 0000000..1ffe664
--- /dev/null
+++ b/hubs/widgets/stats/__init__.py
@@ -0,0 +1,66 @@
+from __future__ import unicode_literals
+
+import flask
+
+from hubs.utils import commas
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+
+class Stats(Widget):
+
+    name = "stats"
+    position = "right"
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/stats.html"
+    chrome = panel()
+
+    def get_context(self, instance, *args, **kwargs):
+        get_stats = GetStats(instance)
+        return get_stats()
+
+
+class GetStats(CachedFunction):
+
+    def execute(self):
+        hub = self.instance.hub
+        owners = [u.username for u in hub.owners]
+        members = [u.username for u in hub.members]
+        subscribers = [u.username for u in hub.subscribers]
+        stargazers = [u.username for u in hub.stargazers]
+
+        return dict(
+            owners=owners,
+            members=members,
+            subscribers=subscribers,
+            stargazers=stargazers,
+
+            owners_text=commas(len(owners)),
+            members_text=commas(len(members)),
+            subscribers_text=commas(len(subscribers)),
+            stargazers_text=commas(len(stargazers)),
+
+            hub_leave_url=flask.url_for('hub_leave', hub=hub.name),
+            hub_join_url=flask.url_for('hub_join', hub=hub.name),
+            hub_unstar_url=flask.url_for('hub_unstar', hub=hub.name),
+            hub_star_url=flask.url_for('hub_star', hub=hub.name),
+            hub_subscribe_url=flask.url_for('hub_subscribe', hub=hub.name),
+            hub_unsubscribe_url=flask.url_for(
+                'hub_unsubscribe', hub=hub.name),
+        )
+
+    def should_invalidate(self, message):
+        if not message['topic'].endswith('hubs.hub.update'):
+            return False
+        if message['msg']['hub']['name'] == self.instance.hub.name:
+            return True
+
+        # TODO -- also check for FAS group changes??  are we doing that?
+
+        return False

From bacb3b6664e04846b3e613e13c86f2845af4e9d8 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 29/45] Convert the sticky widget


---

diff --git a/hubs/widgets/sticky.py b/hubs/widgets/sticky.py
deleted file mode 100755
index ca74f59..0000000
--- a/hubs/widgets/sticky.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.chrome import panel
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-
-import hubs.validators as validators
-
-chrome = panel(title='Sticky Note', klass="card-info")
-template = templating.environment.get_template('templates/sticky.html')
-position = 'both'
-
-
-@argument(name="text", default="Lorem ipsum dolor...",
-          validator=validators.text,
-          help="Some dummy text to display.")
-def data(session, widget, text):
-    # TODO -- render with markdown
-    return dict(text=text)
-
-
-@hint(topics=[_('hubs.widget.update')])
-def should_invalidate(message, session, widget):
-    if message['topic'].endswith('hubs.widget.update'):
-        if message['msg']['widget']['id'] == widget.id:
-            return True
-
-    return False
diff --git a/hubs/widgets/sticky/__init__.py b/hubs/widgets/sticky/__init__.py
new file mode 100644
index 0000000..409b382
--- /dev/null
+++ b/hubs/widgets/sticky/__init__.py
@@ -0,0 +1,31 @@
+from __future__ import unicode_literals
+
+from hubs import validators
+from hubs.widgets.chrome import panel
+from hubs.widgets.base import Widget, WidgetView
+
+
+class Sticky(Widget):
+
+    name = "sticky"
+    position = "both"
+    arguments = [
+        dict(
+            name="text",
+            label="Text",
+            default="Lorem ipsum dolor...",
+            validator=validators.text,
+            help="Some dummy text to display.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/sticky.html"
+    chrome = panel(title='Sticky Note', klass="card-info")
+
+    def get_context(self, instance, *args, **kwargs):
+        # TODO -- render with markdown
+        return dict(text=instance.config["text"])

From 4f72c0d06f137eba1dd7f39d5b49eb0301e113ae Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 30/45] Convert the subscriptions widget


---

diff --git a/hubs/widgets/subscriptions.py b/hubs/widgets/subscriptions.py
deleted file mode 100755
index 4446c25..0000000
--- a/hubs/widgets/subscriptions.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from __future__ import unicode_literals
-
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.base import argument
-from hubs.widgets.chrome import panel
-from hubs.widgets import templating
-
-from hubs import validators
-
-import hubs.models
-
-from fedmsg.meta.base import BaseConglomerator as BC
-
-import fedmsg.config
-fm_config = fedmsg.config.load_config()
-
-import flask
-
-chrome = panel('Hubs', key='associations')
-template = templating.environment.get_template('templates/subscriptions.html')
-position = 'right'
-
-
-@argument(name="username",
-          default=None,
-          validator=validators.username,
-          help="A FAS username.")
-def data(session, widget, username):
-    user = hubs.models.User.by_username(username)
-    ownerships = [u.name for u in user.ownerships]
-    memberships = [u.name for u in user.memberships]
-    subscriptions = [u.name for u in user.subscriptions]
-    subscriptions_list = manage_subscriptions(subscriptions)
-    memberships_list = manage_subscriptions(memberships)
-    return dict(
-        associations=memberships + ownerships,
-        ownerships=ownerships,
-        memberships=memberships,
-        subscriptions=subscriptions,
-        ownerships_text=BC.list_to_series(ownerships),
-        memberships_text=BC.list_to_series(memberships_list),
-        subscriptions_text=BC.list_to_series(subscriptions_list),
-    )
-
-
-# function hyperlinks the hubs in the subscription widget
-def manage_subscriptions(items):
-    return [
-        '<a href="{link}">{item}</a>'.format(
-            link=flask.url_for('hub', name=item),
-            item=item,
-        ) for index, item in enumerate(items[0:3])
-    ]
-
-
-@hint(topics=[_('hubs.associate')])
-def should_invalidate(message, session, widget):
-    username = widget.config['username']
-    users = fedmsg.meta.msg2usernames(message, **fm_config)
-    return username in users
diff --git a/hubs/widgets/subscriptions/__init__.py b/hubs/widgets/subscriptions/__init__.py
new file mode 100644
index 0000000..352945d
--- /dev/null
+++ b/hubs/widgets/subscriptions/__init__.py
@@ -0,0 +1,78 @@
+from __future__ import unicode_literals
+
+import flask
+import hubs.models
+
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
+
+from fedmsg.meta.base import BaseConglomerator as BC
+
+import fedmsg.config
+fm_config = fedmsg.config.load_config()
+
+
+class Subscriptions(Widget):
+
+    name = "subscriptions"
+    position = "right"
+    arguments = [
+        dict(
+            name="username",
+            label="Username",
+            default=None,
+            validator=validators.username,
+            help="A FAS username.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    template_name = "templates/subscriptions.html"
+    chrome = panel('Hubs', key='associations')
+
+    def get_context(self, instance, *args, **kwargs):
+        get_subs = GetSubs(instance)
+        return get_subs()
+
+
+# function hyperlinks the hubs in the subscription widget
+def manage_subscriptions(items):
+    return [
+        '<a href="{link}">{item}</a>'.format(
+            link=flask.url_for('hub', name=item),
+            item=item,
+        ) for index, item in enumerate(items[0:3])
+    ]
+
+
+class GetSubs(CachedFunction):
+
+    def execute(self):
+        username = self.instance.config["username"]
+        user = hubs.models.User.by_username(username)
+        ownerships = [u.name for u in user.ownerships]
+        memberships = [u.name for u in user.memberships]
+        subscriptions = [u.name for u in user.subscriptions]
+        subscriptions_list = manage_subscriptions(subscriptions)
+        memberships_list = manage_subscriptions(memberships)
+        return dict(
+            associations=memberships + ownerships,
+            ownerships=ownerships,
+            memberships=memberships,
+            subscriptions=subscriptions,
+            ownerships_text=BC.list_to_series(ownerships),
+            memberships_text=BC.list_to_series(memberships_list),
+            subscriptions_text=BC.list_to_series(subscriptions_list),
+        )
+
+    def should_invalidate(self, message):
+        if not message['topic'].endswith('hubs.associate'):
+            return False
+        username = self.instance.config['username']
+        users = fedmsg.meta.msg2usernames(message, **fm_config)
+        return username in users

From f306fe3a5fffbb5fd0b216d280a86bec6a20fc46 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 31/45] Convert the workflow widgets


---

diff --git a/hubs/widgets/workflow/pendingacls.py b/hubs/widgets/workflow/pendingacls.py
index 5bc6594..4676844 100644
--- a/hubs/widgets/workflow/pendingacls.py
+++ b/hubs/widgets/workflow/pendingacls.py
@@ -2,52 +2,67 @@ from __future__ import unicode_literals
 
 import requests
 
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.base import argument
-from hubs.widgets import templating
+from hubs import validators
 from hubs.utils import username2avatar
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
 
-import hubs.validators as validators
 
-from hubs.widgets.chrome import panel
-# If 'pending_acls' is empty, then don't render any chrome.
-chrome = panel('Pending ACL Requests', key='pending_acls')
-# TODO -- add approve/deny buttons or just link through to pkgdb
-template = templating.environment.get_template(
-    'templates/workflow/pendingacls.html')
-position = 'right'
-
-
-@argument(name="username",
-          default=None,
-          validator=validators.username,
-          help="A FAS username.")
-def data(session, widget, username):
-
-    # TODO -- rewrite this to
-    # 1) use the datagrepper API instead of the direct pkgdb API
-    # 2) so that we can use the fedmsg.meta.conglomerate API to
-    # 3) group messages nicely in the UI instead of having repeats
-    # It will be slower, but that's fine because of our smart cache.
-
-    baseurl = "https://admin.fedoraproject.org/pkgdb/api/pendingacls"
-    query = "?username={username}&format=json".format(username=username)
-    url = baseurl + query
-    response = requests.get(url)
-    data = response.json()
-    for acl in data['pending_acls']:
-        acl['avatar'] = username2avatar(acl['user'], s=32)
-    data['username'] = username
-    return data
-
-
-@hint(topics=[_('pkgdb.acl.update')])
-def should_invalidate(message, session, widget):
-    # Search the message to see if I am in the ACLs list of the request.
-    username = widget.config['username']
-
-    for acl in message['msg']['package_listing']['acls']:
-        if acl['fas_name'] == username and acl['status'] == 'Approved':
-            return True
-
-    return False
+class PendingACLs(Widget):
+
+    name = "workflow.pendingacls"
+    position = "right"
+    arguments = [
+        dict(
+            name="username",
+            label="Username",
+            default=None,
+            validator=validators.username,
+            help="A FAS username.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    # TODO -- add approve/deny buttons or just link through to pkgdb
+    template_name = "templates/workflow/pendingacls.html"
+    # If 'pending_acls' is empty, then don't render any chrome.
+    chrome = panel('Pending ACL Requests', key='pending_acls')
+
+    def get_context(self, instance, *args, **kwargs):
+        get_pending = GetPending(instance)
+        context = dict(username=instance.config["username"])
+        context.update(get_pending())
+        return context
+
+
+class GetPending(CachedFunction):
+
+    def execute(self):
+        # TODO -- rewrite this to
+        # 1) use the datagrepper API instead of the direct pkgdb API
+        # 2) so that we can use the fedmsg.meta.conglomerate API to
+        # 3) group messages nicely in the UI instead of having repeats
+        # It will be slower, but that's fine because of our cache.
+        username = self.instance.config["username"]
+        baseurl = "https://admin.fedoraproject.org/pkgdb/api/pendingacls"
+        query = "?username={username}&format=json".format(username=username)
+        url = baseurl + query
+        response = requests.get(url)
+        data = response.json()
+        for acl in data['pending_acls']:
+            acl['avatar'] = username2avatar(acl['user'], s=32)
+        return data
+
+    def should_invalidate(self, message):
+        if not message['topic'].endswith('pkgdb.acl.update'):
+            return False
+        # Search the message to see if I am in the ACLs list of the request.
+        username = self.instance.config["username"]
+        for acl in message['msg']['package_listing']['acls']:
+            if acl['fas_name'] == username and acl['status'] == 'Approved':
+                return True
+        return False
diff --git a/hubs/widgets/workflow/updates2stable.py b/hubs/widgets/workflow/updates2stable.py
index c7df1c3..7bca860 100644
--- a/hubs/widgets/workflow/updates2stable.py
+++ b/hubs/widgets/workflow/updates2stable.py
@@ -2,60 +2,45 @@ from __future__ import unicode_literals
 
 import requests
 
-from hubs.hinting import hint, prefixed as _
-from hubs.widgets.base import argument
-from hubs.widgets import templating
-import hubs.validators as validators
+from hubs import validators
+from hubs.widgets.base import Widget, WidgetView
+from hubs.widgets.caching import CachedFunction
+from hubs.widgets.chrome import panel
 
 
-from hubs.widgets.chrome import panel
-# If 'updates' is empty, then don't render any chrome.
-chrome = panel('Updates Ready for Stable', key='updates')
-# TODO -- add approve/deny buttons or just link through to pkgdb
-template = templating.environment.get_template(
-    'templates/workflow/updates2stable.html')
-position = 'right'
-
-# TODO - the bodhi api exposes a new flag we can use instead of scraping comments...
+# TODO - the bodhi api exposes a new flag we can use instead of scraping
+# comments...
 giveaway = 'can be pushed to stable now'
 
 
-@argument(name="username",
-          default=None,
-          validator=validators.username,
-          help="A FAS username.")
-def data(session, widget, username):
-
-    # First, get all of my updates currently in testing.
-    bodhiurl = 'https://bodhi.fedoraproject.org/updates/'
-    query = '?user={username}&status=testing'.format(username=username)
-    url = bodhiurl + query
-    headers = {'Accept': 'application/json'}
-    response = requests.get(url, headers=headers)
-    if response.status_code == 200:
-        data = response.json()
-
-        # Limit this to only the updates that haven't already requested stable
-        # but which can actually be pushed to stable now.
-        data['updates'] = [
-            update for update in data['updates']
-            if update['request'] is None and
-            any([giveaway in comment['text'] for comment in update['comments']])
-        ]
-
-        # Stuff some useful information in there.
-        baseurl = 'https://apps.fedoraproject.org/packages/images/icons/'
-        for update in data['updates']:
-            build = update['builds'][0]
-            nvr = build['nvr']
-            package = parse_nvr(nvr)
-            update['icon'] = baseurl + package[0] + '.png'
-            update['link'] = bodhiurl + update['title']
-
-        return data
-    else:
-        data = {}
-        return data
+class Updates2Stable(Widget):
+
+    name = "workflow.updates2stable"
+    position = "right"
+    arguments = [
+        dict(
+            name="username",
+            label="Username",
+            default=None,
+            validator=validators.username,
+            help="A FAS username.",
+        )]
+
+
+class BaseView(WidgetView):
+
+    name = "root"
+    url_rules = ["/"]
+    # TODO -- add approve/deny buttons or just link through to pkgdb
+    template_name = "templates/workflow/updates2stable.html"
+    # If 'updates' is empty, then don't render any chrome.
+    chrome = panel('Updates Ready for Stable', key='updates')
+
+    def get_context(self, instance, *args, **kwargs):
+        get_pending = GetPending(instance)
+        context = dict(username=instance.config["username"])
+        context.update(get_pending())
+        return context
 
 
 def parse_nvr(nvr):
@@ -64,11 +49,47 @@ def parse_nvr(nvr):
     return ['-'.join(x[:-2]), x[-2], x[-1]]
 
 
-@hint(topics=[_('bodhi.update.comment')])
-def should_invalidate(message, session, widget):
-    if giveaway in message['msg']['comment']['text']:
-        username = widget.config['username']
-        if username == message['msg']['comment']['update_submitter']:
-            return True
-
-    return False
+class GetPending(CachedFunction):
+
+    def execute(self):
+        username = self.instance.config["username"]
+        # First, get all of my updates currently in testing.
+        bodhiurl = 'https://bodhi.fedoraproject.org/updates/'
+        query = '?user={username}&status=testing'.format(username=username)
+        url = bodhiurl + query
+        headers = {'Accept': 'application/json'}
+        response = requests.get(url, headers=headers)
+        if response.status_code == 200:
+            data = response.json()
+
+            # Limit this to only the updates that haven't already requested
+            # stable but which can actually be pushed to stable now.
+            data['updates'] = [
+                update for update in data['updates']
+                if update['request'] is None and
+                any([giveaway in comment['text']
+                     for comment in update['comments']])
+            ]
+
+            # Stuff some useful information in there.
+            baseurl = 'https://apps.fedoraproject.org/packages/images/icons/'
+            for update in data['updates']:
+                build = update['builds'][0]
+                nvr = build['nvr']
+                package = parse_nvr(nvr)
+                update['icon'] = baseurl + package[0] + '.png'
+                update['link'] = bodhiurl + update['title']
+
+            return data
+        else:
+            data = {}
+            return data
+
+    def should_invalidate(self, message):
+        if not message['topic'].endswith('bodhi.update.comment'):
+            return False
+        if giveaway in message['msg']['comment']['text']:
+            username = self.instance.config['username']
+            if username == message['msg']['comment']['update_submitter']:
+                return True
+        return False

From df2130ce09ccb8d53e46f7b4dfd49b67089c66f5 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 32/45] Replace the chrome wrapper with template inheritance


---

diff --git a/hubs/tests/test_widgets/test_about.py b/hubs/tests/test_widgets/test_about.py
index d068a1b..6fa31e9 100644
--- a/hubs/tests/test_widgets/test_about.py
+++ b/hubs/tests/test_widgets/test_about.py
@@ -19,5 +19,7 @@ class TestBadges(hubs.tests.test_widgets.WidgetTest):
         self.assertDictEqual(data['data'], {
             u'edit_url': u'/ralph/56/edit',
             u'source_url': u'/source/about',
-            u'text': u'Testing.',
+            'text': 'Testing.',
+            'title': "<span class='glyphicon glyphicon-info-sign' "
+                     "aria-hidden='true'></span> About",
         })
diff --git a/hubs/tests/test_widgets/test_library.py b/hubs/tests/test_widgets/test_library.py
index 92b4bde..6e4ba36 100644
--- a/hubs/tests/test_widgets/test_library.py
+++ b/hubs/tests/test_widgets/test_library.py
@@ -18,6 +18,7 @@ class TestLibrary(hubs.tests.test_widgets.WidgetTest):
                 "urls": "ralph/"
             },
             "data": {
+                'title': 'Library',
                 "edit_url": "/ralph/%d/edit" % widget.idx,
                 "source_url": "/source/library",
                 "urls": [
diff --git a/hubs/widgets/about/__init__.py b/hubs/widgets/about/__init__.py
index aff28b0..aa8ff61 100644
--- a/hubs/widgets/about/__init__.py
+++ b/hubs/widgets/about/__init__.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 from hubs import validators
@@ -24,7 +23,10 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/about.html"
-    chrome = panel("<span class='glyphicon glyphicon-info-sign' aria-hidden='true'></span> About")
 
     def get_context(self, instance, *args, **kwargs):
-        return dict(text=instance.config["text"])
+        return dict(
+            text=instance.config["text"],
+            title="<span class='glyphicon glyphicon-info-sign' "
+                  "aria-hidden='true'></span> About",
+            )
diff --git a/hubs/widgets/badges/__init__.py b/hubs/widgets/badges/__init__.py
index a6d838f..3664ae5 100644
--- a/hubs/widgets/badges/__init__.py
+++ b/hubs/widgets/badges/__init__.py
@@ -6,7 +6,6 @@ import requests
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 
 class Badges(Widget):
@@ -27,11 +26,12 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/badges.html"
-    chrome = panel("Badges")
 
     def get_context(self, instance, *args, **kwargs):
+        context = {"title": "Badges"}
         get_badges = GetBadges(instance)
-        return get_badges()
+        context.update(get_badges())
+        return context
 
 
 class GetBadges(CachedFunction):
diff --git a/hubs/widgets/bugzilla/__init__.py b/hubs/widgets/bugzilla/__init__.py
index ca42357..6a27bec 100644
--- a/hubs/widgets/bugzilla/__init__.py
+++ b/hubs/widgets/bugzilla/__init__.py
@@ -6,7 +6,6 @@ import pkgwat.api
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 
 PKGDB_URL = "https://admin.fedoraproject.org/pkgdb/api/packager/package"
@@ -30,11 +29,11 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/bugzilla.html"
-    chrome = panel("Bugzilla: Issues")
 
     def get_context(self, instance, *args, **kwargs):
         get_issues = GetIssues(instance)
         return dict(
+            title="Bugzilla: Issues",
             username=instance.config["username"],
             issues=get_issues()
             )
diff --git a/hubs/widgets/chrome.py b/hubs/widgets/chrome.py
deleted file mode 100644
index cc9b4ca..0000000
--- a/hubs/widgets/chrome.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from __future__ import unicode_literals
-
-from functools import wraps
-from hubs.widgets import templating
-
-_panel_template = templating.environment.get_template(
-    'templates/panel.html')
-_panel_heading_template = templating.environment.get_template(
-    'templates/panel_heading.html')
-
-
-# FIXME: replace with template block extension
-def panel(title=None, klass="panel-default", key=None, footer_template=None):
-    def decorator(view, func):
-        @wraps(func)
-        def inner(*args, **kwargs):
-            heading = ''
-            footer = ''
-            if title:
-                heading = _panel_heading_template.render(title=title)
-            if footer_template:
-                footer = templating.environment.get_template(
-                    footer_template).render(**kwargs)
-            content = func(*args, **kwargs)
-            if key and not kwargs.get(key):
-                return content
-            return _panel_template.render(
-                content=content,
-                heading=heading,
-                footer=footer,
-                klass=klass(kwargs) if callable(klass) else klass,
-                **kwargs)
-        return inner
-    return decorator
diff --git a/hubs/widgets/contact/__init__.py b/hubs/widgets/contact/__init__.py
index 88841fe..c491eb3 100644
--- a/hubs/widgets/contact/__init__.py
+++ b/hubs/widgets/contact/__init__.py
@@ -7,7 +7,6 @@ import fedmsg.meta
 import hubs.models
 
 from hubs.widgets.base import Widget, WidgetView
-from hubs.widgets.chrome import panel
 
 config = fedmsg.config.load_config()
 
@@ -23,7 +22,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/contact.html"
-    chrome = panel()
 
     def get_context(self, instance, *args, **kwargs):
         ''' Data for Contact widget. Checks if the hub associated
diff --git a/hubs/widgets/dummy/__init__.py b/hubs/widgets/dummy/__init__.py
index 738711a..1a96ee5 100644
--- a/hubs/widgets/dummy/__init__.py
+++ b/hubs/widgets/dummy/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 
 from hubs import validators
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 
@@ -23,7 +22,9 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/dummy.html"
-    chrome = panel("This is a dummy widget")
 
     def get_context(self, instance, *args, **kwargs):
-        return dict(text=instance.config["text"])
+        return dict(
+            title="This is a dummy widget",
+            text=instance.config["text"],
+            )
diff --git a/hubs/widgets/fedmsgstats/__init__.py b/hubs/widgets/fedmsgstats/__init__.py
index b31ae11..82f68c1 100644
--- a/hubs/widgets/fedmsgstats/__init__.py
+++ b/hubs/widgets/fedmsgstats/__init__.py
@@ -9,7 +9,6 @@ from hubs import validators
 from hubs.utils import commas
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 fedmsg_config = fedmsg.config.load_config()
 
@@ -32,7 +31,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/fedmsgstats.html"
-    chrome = panel()
 
     def get_context(self, instance, *args, **kwargs):
         username = instance.config["username"]
diff --git a/hubs/widgets/feed/__init__.py b/hubs/widgets/feed/__init__.py
index 678152d..d2601f1 100644
--- a/hubs/widgets/feed/__init__.py
+++ b/hubs/widgets/feed/__init__.py
@@ -2,7 +2,6 @@ from __future__ import unicode_literals
 
 
 from hubs import validators
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 import logging
@@ -34,7 +33,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/feed.html"
-    chrome = panel("Live Feed")
 
     def get_context(self, instance, *args, **kwargs):
         # Avoid circular import
@@ -42,6 +40,7 @@ class BaseView(WidgetView):
         username = instance.config["username"]
         feed_url = app.config['SSE_URL'] + username
         return dict(
+            title="Live Feed",
             matches=[],
             message_limit=instance.config["message_limit"],
             feed_url=feed_url,
diff --git a/hubs/widgets/fhosted/__init__.py b/hubs/widgets/fhosted/__init__.py
index ec1dc93..3c55f9c 100644
--- a/hubs/widgets/fhosted/__init__.py
+++ b/hubs/widgets/fhosted/__init__.py
@@ -5,7 +5,6 @@ from six.moves.xmlrpc_client import ServerProxy
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 
 class FedoraHosted(Widget):
@@ -33,11 +32,13 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/fedorahosted.html"
-    chrome = panel("Fedorahosted: Open Tickets")
 
     def get_context(self, instance, *args, **kwargs):
         get_tickets = GetTickets(instance)
-        context = dict(project=instance.config["project"])
+        context = dict(
+            title="Fedorahosted: Open Tickets",
+            project=instance.config["project"],
+            )
         context.update(get_tickets())
         return context
 
diff --git a/hubs/widgets/github_pr/__init__.py b/hubs/widgets/github_pr/__init__.py
index 5478f1c..9a03bc5 100644
--- a/hubs/widgets/github_pr/__init__.py
+++ b/hubs/widgets/github_pr/__init__.py
@@ -6,7 +6,6 @@ import hubs.utils
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 import fedmsg.config
 fedmsg_config = fedmsg.config.load_config()
@@ -39,7 +38,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/github_pr.html"
-    chrome = panel("Github: Pull Requests")
 
     def get_context(self, instance, *args, **kwargs):
         get_prs = GetPRs(instance)
@@ -48,6 +46,7 @@ class BaseView(WidgetView):
         context = dict(
             organization=org,
             display_number=display_number,
+            title="Github: Pull Requests",
         )
         context.update(get_prs())
         return context
diff --git a/hubs/widgets/githubissues/__init__.py b/hubs/widgets/githubissues/__init__.py
index efee564..e70dabf 100644
--- a/hubs/widgets/githubissues/__init__.py
+++ b/hubs/widgets/githubissues/__init__.py
@@ -5,7 +5,6 @@ import requests
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 
 class GitHubIssues(Widget):
@@ -39,7 +38,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/githubissues.html"
-    chrome = panel("Github: Newest Open Tickets")
 
     def get_context(self, instance, *args, **kwargs):
         get_issues = GetIssues(instance)
@@ -47,6 +45,7 @@ class BaseView(WidgetView):
             org=instance.config["org"],
             repo=instance.config["repo"],
             display_number=int(instance.config["display_number"]),
+            title="Github: Newest Open Tickets",
             all_issues=get_issues(),
         )
 
diff --git a/hubs/widgets/library/__init__.py b/hubs/widgets/library/__init__.py
index 09ec390..af990ac 100644
--- a/hubs/widgets/library/__init__.py
+++ b/hubs/widgets/library/__init__.py
@@ -2,7 +2,6 @@ from __future__ import unicode_literals
 
 from hubs import validators
 from hubs.widgets import clean_input
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 
@@ -26,7 +25,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/library.html"
-    chrome = panel("Library")
 
     def get_context(self, instance, *args, **kwargs):
         urls = [
@@ -35,4 +33,7 @@ class BaseView(WidgetView):
             for u in instance.config.get('urls', '').split(',')
             if u.strip()
         ]
-        return dict(urls=urls)
+        return dict(
+            title="Library",
+            urls=urls,
+            )
diff --git a/hubs/widgets/linechart/__init__.py b/hubs/widgets/linechart/__init__.py
index c7ac68e..adc9590 100644
--- a/hubs/widgets/linechart/__init__.py
+++ b/hubs/widgets/linechart/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 
 from hubs import validators
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 
@@ -23,7 +22,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/linechart.html"
-    chrome = panel("Weekly Activity")
 
     def get_context(self, instance, *args, **kwargs):
         username = instance.config["username"]
@@ -42,4 +40,7 @@ class BaseView(WidgetView):
                "&user={username}&split_on=categories")
         url = url + "&" + categories
         url = url.format(username=username)
-        return dict(url=url)
+        return dict(
+            title="Weekly Activity",
+            url=url,
+            )
diff --git a/hubs/widgets/meetings/__init__.py b/hubs/widgets/meetings/__init__.py
index 9209de2..8a5c7ef 100644
--- a/hubs/widgets/meetings/__init__.py
+++ b/hubs/widgets/meetings/__init__.py
@@ -7,7 +7,6 @@ import requests
 
 from hubs import validators
 from hubs import utils
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
 
@@ -43,11 +42,11 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/meetings.html"
-    chrome = panel(title='Meetings', footer_template='templates/meeting_footer.html')
 
     def get_context(self, instance, *args, **kwargs):
         get_meetings = GetMeetings(instance)
         return dict(
+            title="Meetings",
             calendar=instance.config["calendar"],
             meetings=get_meetings(),
             )
diff --git a/hubs/widgets/memberships/__init__.py b/hubs/widgets/memberships/__init__.py
index cc8f602..cd36983 100644
--- a/hubs/widgets/memberships/__init__.py
+++ b/hubs/widgets/memberships/__init__.py
@@ -2,7 +2,6 @@ from __future__ import unicode_literals
 
 import hubs.models
 
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 
@@ -20,7 +19,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/memberships.html"
-    chrome = panel('Hubs')
 
     def get_context(self, instance, *args, **kwargs):
         hub = instance.hub
@@ -40,6 +38,7 @@ class BaseView(WidgetView):
         oldest_members = sorted(
             members, key=lambda m: m.get('created_on'))[:ELLIPSIS_LIMIT]
         return dict(
+            title="Hubs",
             memberships=list(members),
             oldest_members=list(oldest_members),
             )
diff --git a/hubs/widgets/pagure_pr/__init__.py b/hubs/widgets/pagure_pr/__init__.py
index 6e3cf5a..ad047a7 100644
--- a/hubs/widgets/pagure_pr/__init__.py
+++ b/hubs/widgets/pagure_pr/__init__.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 import requests
 
@@ -29,11 +28,13 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/pagure_pr.html"
-    chrome = panel("Newest Open Pull Requests on Pagure")
 
     def get_context(self, instance, *args, **kwargs):
         get_prs = GetPRs(instance)
-        context = dict(repo=instance.config["repo"])
+        context = dict(
+            title="Newest Open Pull Requests on Pagure",
+            repo=instance.config["repo"],
+            )
         context.update(get_prs())
         return context
 
diff --git a/hubs/widgets/pagureissues/__init__.py b/hubs/widgets/pagureissues/__init__.py
index 2be36a8..690dd86 100644
--- a/hubs/widgets/pagureissues/__init__.py
+++ b/hubs/widgets/pagureissues/__init__.py
@@ -5,7 +5,6 @@ import requests
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 pagure_url = "https://pagure.io/api/0"
 
@@ -29,11 +28,13 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/pagureissues.html"
-    chrome = panel("Newest Open Tickets on Pagure")
 
     def get_context(self, instance, *args, **kwargs):
         get_issues = GetIssues(instance)
-        context = dict(repo=instance.config["repo"])
+        context = dict(
+            title="Newest Open Tickets on Pagure",
+            repo=instance.config["repo"],
+            )
         context.update(get_issues())
         return context
 
diff --git a/hubs/widgets/rules/__init__.py b/hubs/widgets/rules/__init__.py
index 742ff22..84b2016 100644
--- a/hubs/widgets/rules/__init__.py
+++ b/hubs/widgets/rules/__init__.py
@@ -4,7 +4,6 @@ from collections import OrderedDict as ordereddict
 
 from hubs import validators
 from hubs.utils import username2avatar
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 
@@ -48,7 +47,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/rules.html"
-    chrome = panel()
 
     def get_context(self, instance, *args, **kwargs):
         owners = instance.hub.owners
diff --git a/hubs/widgets/stats/__init__.py b/hubs/widgets/stats/__init__.py
index 1ffe664..87d4415 100644
--- a/hubs/widgets/stats/__init__.py
+++ b/hubs/widgets/stats/__init__.py
@@ -5,7 +5,6 @@ import flask
 from hubs.utils import commas
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 
 class Stats(Widget):
@@ -19,7 +18,6 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/stats.html"
-    chrome = panel()
 
     def get_context(self, instance, *args, **kwargs):
         get_stats = GetStats(instance)
diff --git a/hubs/widgets/sticky/__init__.py b/hubs/widgets/sticky/__init__.py
index 409b382..28c8fed 100644
--- a/hubs/widgets/sticky/__init__.py
+++ b/hubs/widgets/sticky/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 
 from hubs import validators
-from hubs.widgets.chrome import panel
 from hubs.widgets.base import Widget, WidgetView
 
 
@@ -24,8 +23,11 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/sticky.html"
-    chrome = panel(title='Sticky Note', klass="card-info")
 
     def get_context(self, instance, *args, **kwargs):
         # TODO -- render with markdown
-        return dict(text=instance.config["text"])
+        return dict(
+            text=instance.config["text"],
+            title="Sticky Note",
+            panel_css_class="card-info",
+            )
diff --git a/hubs/widgets/subscriptions/__init__.py b/hubs/widgets/subscriptions/__init__.py
index 352945d..466beb9 100644
--- a/hubs/widgets/subscriptions/__init__.py
+++ b/hubs/widgets/subscriptions/__init__.py
@@ -6,7 +6,6 @@ import hubs.models
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 from fedmsg.meta.base import BaseConglomerator as BC
 
@@ -33,11 +32,12 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     template_name = "templates/subscriptions.html"
-    chrome = panel('Hubs', key='associations')
 
     def get_context(self, instance, *args, **kwargs):
+        context = dict(title="Hubs")
         get_subs = GetSubs(instance)
-        return get_subs()
+        context.update(get_subs())
+        return context
 
 
 # function hyperlinks the hubs in the subscription widget
diff --git a/hubs/widgets/templates/about.html b/hubs/widgets/templates/about.html
index f73bbab..3b25a3a 100644
--- a/hubs/widgets/templates/about.html
+++ b/hubs/widgets/templates/about.html
@@ -1 +1,5 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <p>{{text}}</p>
+{% endblock %}
diff --git a/hubs/widgets/templates/badges.html b/hubs/widgets/templates/badges.html
index 926c8d0..22a0562 100644
--- a/hubs/widgets/templates/badges.html
+++ b/hubs/widgets/templates/badges.html
@@ -1,7 +1,11 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="flex-container">
 {% for badge in assertions %}
   <a width="60px" href="https://badges.fedoraproject.org/badge/{{badge['id']}}">
     <span class="f-b-{{badge['id']}}"></span>
   </a>
-{%endfor%}
+{% endfor %}
 </div>
+{% endblock %}
diff --git a/hubs/widgets/templates/bugzilla.html b/hubs/widgets/templates/bugzilla.html
index 86891ec..9809c31 100644
--- a/hubs/widgets/templates/bugzilla.html
+++ b/hubs/widgets/templates/bugzilla.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <ul class="media-list">
   {% for item in issues %}
     <li class="media">
@@ -15,3 +18,4 @@
     </li>
   {% endfor %}
 </ul>
+{% endblock %}
diff --git a/hubs/widgets/templates/contact.html b/hubs/widgets/templates/contact.html
index 7c3cccf..9898a18 100644
--- a/hubs/widgets/templates/contact.html
+++ b/hubs/widgets/templates/contact.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="contactinfo-container">
   {% if usergroup %}
     <ul style="list-style: none; padding-left: 5px">
@@ -68,3 +71,4 @@
     </ul>
   {% endif %}
 </div>
+{% endblock %}
diff --git a/hubs/widgets/templates/dummy.html b/hubs/widgets/templates/dummy.html
index 8d15644..6e318ec 100644
--- a/hubs/widgets/templates/dummy.html
+++ b/hubs/widgets/templates/dummy.html
@@ -1 +1,5 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 {{text}}
+{% endblock %}
diff --git a/hubs/widgets/templates/fedmsgstats.html b/hubs/widgets/templates/fedmsgstats.html
index bb569e7..fe369e2 100644
--- a/hubs/widgets/templates/fedmsgstats.html
+++ b/hubs/widgets/templates/fedmsgstats.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="stats-container row">
   <div class="col-sm-7 col-md-12 col-lg-7">
   <table class="stats-table">
@@ -21,3 +24,4 @@
   {% endif %}
   </div>
 </div>
+{% endblock %}
diff --git a/hubs/widgets/templates/fedorahosted.html b/hubs/widgets/templates/fedorahosted.html
index ad22b57..5dcc574 100644
--- a/hubs/widgets/templates/fedorahosted.html
+++ b/hubs/widgets/templates/fedorahosted.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 {% if error %}
 <p>{{ error }}</p>
 {% else %}
@@ -42,3 +45,4 @@
   {% endif %}
 </ul>
 {% endif %}
+{% endblock %}
diff --git a/hubs/widgets/templates/feed.html b/hubs/widgets/templates/feed.html
index aeed666..84256cc 100644
--- a/hubs/widgets/templates/feed.html
+++ b/hubs/widgets/templates/feed.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div id="feed">
 </div>
 
@@ -15,3 +18,4 @@
    ReactDOM.render(FeedElement, document.getElementById('feed'));
  })();
 </script>
+{% endblock %}
diff --git a/hubs/widgets/templates/github_pr.html b/hubs/widgets/templates/github_pr.html
index 8b4a105..743c9aa 100644
--- a/hubs/widgets/templates/github_pr.html
+++ b/hubs/widgets/templates/github_pr.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <a class="btn btn-success" target="_blank"
     href="https://github.com/{{ organization }}" >
   Organization Github Page
@@ -44,3 +47,4 @@
   </li>
 {% endif %}
 </ul>
+{% endblock %}
diff --git a/hubs/widgets/templates/githubissues.html b/hubs/widgets/templates/githubissues.html
index cd5de9d..1a57dab 100644
--- a/hubs/widgets/templates/githubissues.html
+++ b/hubs/widgets/templates/githubissues.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 {% for i in range(display_number) %}
 <div>
   <table class="table-responsive table-condensed">
@@ -36,3 +39,4 @@
 <div class="row">
   <a href="https://github.com/{{ org }}/{{ repo }}/issues" target="_blank"><center>All Issues</center></a>
 </div>
+{% endblock %}
diff --git a/hubs/widgets/templates/library.html b/hubs/widgets/templates/library.html
index 4cbff48..a9155b5 100644
--- a/hubs/widgets/templates/library.html
+++ b/hubs/widgets/templates/library.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="rules-container">
   <div class="row">
     <ul>
@@ -9,3 +12,4 @@
     </ul>
   </div>
 </div>
+{% endblock %}
diff --git a/hubs/widgets/templates/linechart.html b/hubs/widgets/templates/linechart.html
index 5b4e756..3cc86ef 100644
--- a/hubs/widgets/templates/linechart.html
+++ b/hubs/widgets/templates/linechart.html
@@ -1,3 +1,7 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="flex-container">
     <img src="{{url}}" />
 </div>
+{% endblock %}
diff --git a/hubs/widgets/templates/meeting_footer.html b/hubs/widgets/templates/meeting_footer.html
deleted file mode 100644
index 50b49ef..0000000
--- a/hubs/widgets/templates/meeting_footer.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="panel-footer">
-  <div class="row" align="center">
-    <button class="btn btn-default">
-      <strong>Request A New Meeting</strong>
-    </button>
-  </div>
-</div>
diff --git a/hubs/widgets/templates/meetings.html b/hubs/widgets/templates/meetings.html
index b101c5f..600c82c 100644
--- a/hubs/widgets/templates/meetings.html
+++ b/hubs/widgets/templates/meetings.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 {% for title, next in meetings.items() %}
 <div class="meeting">
   <div class="row">
@@ -46,3 +49,15 @@
   </div>
 </div>
 {% endfor %}
+{% endblock %}
+
+
+{% block footer %}
+<div class="panel-footer">
+  <div class="row" align="center">
+    <button class="btn btn-default">
+      <strong>Request A New Meeting</strong>
+    </button>
+  </div>
+</div>
+{% endblock %}
diff --git a/hubs/widgets/templates/memberships.html b/hubs/widgets/templates/memberships.html
index 534aa95..57c6d70 100644
--- a/hubs/widgets/templates/memberships.html
+++ b/hubs/widgets/templates/memberships.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="card-block">
   {% if memberships|length > oldest_members|length %}
   {% for member in oldest_members %}
@@ -74,3 +77,4 @@
    padding: 10px;
  }
 </style>
+{% endblock %}
diff --git a/hubs/widgets/templates/pagure_pr.html b/hubs/widgets/templates/pagure_pr.html
index 94b2f23..735ac7b 100644
--- a/hubs/widgets/templates/pagure_pr.html
+++ b/hubs/widgets/templates/pagure_pr.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <ul class="media-list">
   {% for pr in all_pr[:10] %}
     <li class="media">
@@ -46,3 +49,4 @@
     href="https://pagure.io/{{ repo }}/pull-requests">
   All Pull-Requests
 </a>
+{% endblock %}
diff --git a/hubs/widgets/templates/pagureissues.html b/hubs/widgets/templates/pagureissues.html
index 258d37e..55c6a74 100644
--- a/hubs/widgets/templates/pagureissues.html
+++ b/hubs/widgets/templates/pagureissues.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <a class="btn btn-success" target="_blank"
     href="https://pagure.io/{{ repo }}/issues">
   All Issues
@@ -45,3 +48,4 @@
   </li>
   {% endif %}
 </ul>
+{% endblock %}
diff --git a/hubs/widgets/templates/panel.html b/hubs/widgets/templates/panel.html
index 02ead38..d07fd13 100644
--- a/hubs/widgets/templates/panel.html
+++ b/hubs/widgets/templates/panel.html
@@ -1,18 +1,20 @@
-<div class="card {{ klass }}">
+<div class="card {{ panel_css_class|default('panel-default') }} widget-{{ widget.name }}">
   <div class="pull-right widget-buttons">
     <!-- the AGPLv3 wrapper puts the source url in all responses -->
     <a href="{{ source_url }}"><span><i class="fa fa-eye" aria-hidden="true"></i></span></a>
     <a href="{{ widget_url }}"><span><i class="fa fa-external-link" aria-hidden="true"></i></span></a>
     <a data-target="#edit_modal" data-toggle="modal" type="button"
-        class="edit_widget" data-idx="{{ widget.idx }}">
+        class="edit_widget" data-idx="{{ widget_instance.idx }}">
       <span><i class="fa fa-pencil" aria-hidden="true"></i></span>
     </a>
   </div>
-  {{ heading }}
+  {% if title %}
+  <div class="card-header">
+    {{title}}
+  </div> <!-- end card-header -->
+  {% endif %}
   <div class="card-block">
-    {{ content }}
+    {% block content %}{% endblock %}
   </div> <!-- end card-block -->
-  {% if footer %}
-    {{footer}}
-  {% endif %}
+  {% block footer %}{% endblock %}
 </div> <!-- end card -->
diff --git a/hubs/widgets/templates/panel_heading.html b/hubs/widgets/templates/panel_heading.html
deleted file mode 100644
index eab2086..0000000
--- a/hubs/widgets/templates/panel_heading.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="card-header">
-    {{title}}
-</div> <!-- end card-header -->
diff --git a/hubs/widgets/templates/rules.html b/hubs/widgets/templates/rules.html
index 9ab51e8..d233741 100644
--- a/hubs/widgets/templates/rules.html
+++ b/hubs/widgets/templates/rules.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="rules-container">
   {% if link %}
   <h6>community rules</h6>
@@ -85,3 +88,4 @@
    border-bottom: 0;
  }
 </style>
+{% endblock %}
diff --git a/hubs/widgets/templates/stats.html b/hubs/widgets/templates/stats.html
index 63bf1e5..f2cba1f 100644
--- a/hubs/widgets/templates/stats.html
+++ b/hubs/widgets/templates/stats.html
@@ -1,3 +1,6 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 <div class="stats-container row">
 <div class="col-md-7">
   <table class="stats-table">
@@ -72,3 +75,4 @@
   </ul>
 </div>
 </div>
+{% endblock %}
diff --git a/hubs/widgets/templates/sticky.html b/hubs/widgets/templates/sticky.html
index 8d15644..6e318ec 100644
--- a/hubs/widgets/templates/sticky.html
+++ b/hubs/widgets/templates/sticky.html
@@ -1 +1,5 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
 {{text}}
+{% endblock %}
diff --git a/hubs/widgets/templates/subscriptions.html b/hubs/widgets/templates/subscriptions.html
index 74e46f2..99fa9a2 100644
--- a/hubs/widgets/templates/subscriptions.html
+++ b/hubs/widgets/templates/subscriptions.html
@@ -1,4 +1,7 @@
 {% if associations %}
+{% extends "templates/panel.html" %}
+
+{% block content %}
     {% if memberships %}
         <p><strong>Belongs to: </strong> {{memberships_text}}</p>
     {% endif %}
@@ -10,4 +13,5 @@
         {{subscription}}</a>
         {% endfor %}</p>
     {% endif %}
+{% endblock %}
 {% endif %}
diff --git a/hubs/widgets/templates/workflow/pendingacls.html b/hubs/widgets/templates/workflow/pendingacls.html
index c419d61..2775fb2 100644
--- a/hubs/widgets/templates/workflow/pendingacls.html
+++ b/hubs/widgets/templates/workflow/pendingacls.html
@@ -1,4 +1,8 @@
 {% if pending_acls %}
+
+{% extends "templates/panel.html" %}
+
+{% block content %}
 {% if session['nickname'] == username %}
 <a class="btn btn-success" target="_blank" href="https://admin.fedoraproject.org/pkgdb/acl/pending/">Manage requests</a>
 <hr/>
@@ -17,4 +21,6 @@
     </li>
 {% endfor %}
 </ul>
+{% endblock %}
+
 {% endif %}
diff --git a/hubs/widgets/templates/workflow/updates2stable.html b/hubs/widgets/templates/workflow/updates2stable.html
index 35e2d25..3982895 100644
--- a/hubs/widgets/templates/workflow/updates2stable.html
+++ b/hubs/widgets/templates/workflow/updates2stable.html
@@ -1,4 +1,7 @@
 {% if updates %}
+{% extends "templates/panel.html" %}
+
+{% block content %}
 {% if session['nickname'] == username %}
 <a class="btn btn-success" target="_blank" href="https://admin.fedoraproject.org/updates/mine">Manage updates</a>
 <hr/>
@@ -18,4 +21,5 @@
     </li>
 {% endfor %}
 </ul>
+{% endblock %}
 {% endif %}
diff --git a/hubs/widgets/view.py b/hubs/widgets/view.py
index f6f486a..3c2ccb7 100644
--- a/hubs/widgets/view.py
+++ b/hubs/widgets/view.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals, absolute_import
 
-import flask
 from flask.views import View
 
 
@@ -33,7 +32,6 @@ class WidgetView(View):
             for (like the `rule` parameter of Flask's `add_url_rule()`).
         template_name (str): The template name to use for this view. It will be
             looked for in the widget's template environment.
-        chrome (function): An optional chrome template wrapper.
 
     This class is Flask-specific. If another framework were to be switched to,
     it would have to be re-implemented.
@@ -42,7 +40,6 @@ class WidgetView(View):
     name = None
     url_rules = []
     template_name = None
-    chrome = None
 
     def __init__(self, widget):
         """
@@ -104,8 +101,4 @@ class WidgetView(View):
         instance = self._get_instance(*args, **kwargs)
         context = self.get_context(instance, *args, **kwargs)
         context.update(self.get_extra_context(instance, *args, **kwargs))
-        template = self.get_template()
-        if self.chrome is None:
-            return self.get_template().render(**context)
-        else:
-            return self.chrome(template.render)(**context)
+        return self.get_template().render(**context)
diff --git a/hubs/widgets/workflow/pendingacls.py b/hubs/widgets/workflow/pendingacls.py
index 4676844..cc4cb3a 100644
--- a/hubs/widgets/workflow/pendingacls.py
+++ b/hubs/widgets/workflow/pendingacls.py
@@ -6,7 +6,6 @@ from hubs import validators
 from hubs.utils import username2avatar
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 
 class PendingACLs(Widget):
@@ -29,12 +28,13 @@ class BaseView(WidgetView):
     url_rules = ["/"]
     # TODO -- add approve/deny buttons or just link through to pkgdb
     template_name = "templates/workflow/pendingacls.html"
-    # If 'pending_acls' is empty, then don't render any chrome.
-    chrome = panel('Pending ACL Requests', key='pending_acls')
 
     def get_context(self, instance, *args, **kwargs):
         get_pending = GetPending(instance)
-        context = dict(username=instance.config["username"])
+        context = dict(
+            title='Pending ACL Requests',
+            username=instance.config["username"],
+            )
         context.update(get_pending())
         return context
 
diff --git a/hubs/widgets/workflow/updates2stable.py b/hubs/widgets/workflow/updates2stable.py
index 7bca860..00df8fc 100644
--- a/hubs/widgets/workflow/updates2stable.py
+++ b/hubs/widgets/workflow/updates2stable.py
@@ -5,7 +5,6 @@ import requests
 from hubs import validators
 from hubs.widgets.base import Widget, WidgetView
 from hubs.widgets.caching import CachedFunction
-from hubs.widgets.chrome import panel
 
 
 # TODO - the bodhi api exposes a new flag we can use instead of scraping
@@ -33,12 +32,13 @@ class BaseView(WidgetView):
     url_rules = ["/"]
     # TODO -- add approve/deny buttons or just link through to pkgdb
     template_name = "templates/workflow/updates2stable.html"
-    # If 'updates' is empty, then don't render any chrome.
-    chrome = panel('Updates Ready for Stable', key='updates')
 
     def get_context(self, instance, *args, **kwargs):
         get_pending = GetPending(instance)
-        context = dict(username=instance.config["username"])
+        context = dict(
+            title='Updates Ready for Stable',
+            username=instance.config["username"],
+            )
         context.update(get_pending())
         return context
 

From 7a05ed469e552b2d27bba49de4669d01dc06bc20 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 33/45] Replace the AGPLv3 template variables with template tags


---

diff --git a/hubs/tests/test_widgets/test_about.py b/hubs/tests/test_widgets/test_about.py
index 6fa31e9..35ff9fa 100644
--- a/hubs/tests/test_widgets/test_about.py
+++ b/hubs/tests/test_widgets/test_about.py
@@ -15,10 +15,7 @@ class TestBadges(hubs.tests.test_widgets.WidgetTest):
         response = self.app.get('/ralph/%i/json/' % widget.idx)
         assert response.status_code == 200, response.status_code
         data = json.loads(response.get_data(as_text=True))
-        del data['data']['widget_url']
         self.assertDictEqual(data['data'], {
-            u'edit_url': u'/ralph/56/edit',
-            u'source_url': u'/source/about',
             'text': 'Testing.',
             'title': "<span class='glyphicon glyphicon-info-sign' "
                      "aria-hidden='true'></span> About",
diff --git a/hubs/tests/test_widgets/test_fedmsgstats.py b/hubs/tests/test_widgets/test_fedmsgstats.py
index 0d7e79d..6bb9cca 100644
--- a/hubs/tests/test_widgets/test_fedmsgstats.py
+++ b/hubs/tests/test_widgets/test_fedmsgstats.py
@@ -13,12 +13,9 @@ class TestFedmsgStats(hubs.tests.test_widgets.WidgetTest):
         response = self.app.get('/ralph/%i/json/' % widget.idx)
         assert response.status_code == 200, response.status_code
         data = json.loads(response.get_data(as_text=True))
-        del data['data']['widget_url']
         self.assertDictEqual(data['data'], {
-            u'edit_url': u'/ralph/37/edit',
             u'fedmsgs': 83854,
             u'fedmsgs_text': u'83,854',
-            u'source_url': u'/source/fedmsgstats',
             u'subscribers': [],
             u'subscribed_to': [],
             u'subscribers_text': u'0',
diff --git a/hubs/tests/test_widgets/test_library.py b/hubs/tests/test_widgets/test_library.py
index 6e4ba36..88db8b0 100644
--- a/hubs/tests/test_widgets/test_library.py
+++ b/hubs/tests/test_widgets/test_library.py
@@ -19,12 +19,9 @@ class TestLibrary(hubs.tests.test_widgets.WidgetTest):
             },
             "data": {
                 'title': 'Library',
-                "edit_url": "/ralph/%d/edit" % widget.idx,
-                "source_url": "/source/library",
                 "urls": [
                     "<a href=\"ralph/\">ralph/</a>"
                 ],
-                "widget_url": "/ralph/w/library/%d/" % widget.idx
             },
             "description": None,
             "hub": "ralph",
diff --git a/hubs/widgets/templates/panel.html b/hubs/widgets/templates/panel.html
index d07fd13..1f86223 100644
--- a/hubs/widgets/templates/panel.html
+++ b/hubs/widgets/templates/panel.html
@@ -1,8 +1,10 @@
 <div class="card {{ panel_css_class|default('panel-default') }} widget-{{ widget.name }}">
   <div class="pull-right widget-buttons">
     <!-- the AGPLv3 wrapper puts the source url in all responses -->
-    <a href="{{ source_url }}"><span><i class="fa fa-eye" aria-hidden="true"></i></span></a>
-    <a href="{{ widget_url }}"><span><i class="fa fa-external-link" aria-hidden="true"></i></span></a>
+    <a href="{{ url_for('widget_source', name=widget.name) }}"><span><i class="fa fa-eye" aria-hidden="true"></i></span></a>
+    <a href="{{ url_for('%s_root' % widget.name, hub=widget_instance.hub.name, idx=widget_instance.idx) }}">
+        <span><i class="fa fa-external-link" aria-hidden="true"></i></span>
+    </a>
     <a data-target="#edit_modal" data-toggle="modal" type="button"
         class="edit_widget" data-idx="{{ widget_instance.idx }}">
       <span><i class="fa fa-pencil" aria-hidden="true"></i></span>
diff --git a/hubs/widgets/view.py b/hubs/widgets/view.py
index 3c2ccb7..572b670 100644
--- a/hubs/widgets/view.py
+++ b/hubs/widgets/view.py
@@ -76,13 +76,6 @@ class WidgetView(View):
         """
         # Put source links in all API results
         return {
-            'source_url': flask.url_for(
-                'widget_source', name=self.widget.name),
-            'widget_url': flask.url_for(
-                '%s_root' % self.widget.name,
-                hub=instance.hub.name, idx=instance.idx),
-            'edit_url': flask.url_for(
-                'widget_edit', hub=instance.hub.name, idx=instance.idx),
             'widget': self.widget,
             'widget_instance': instance,
         }

From faddb5d41ec83bc8633f60e36ed9c8e03744ffd5 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 34/45] Move widget templates inside the widget directory


---

diff --git a/hubs/widgets/about/__init__.py b/hubs/widgets/about/__init__.py
index aa8ff61..1a8cc50 100644
--- a/hubs/widgets/about/__init__.py
+++ b/hubs/widgets/about/__init__.py
@@ -22,7 +22,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/about.html"
+    template_name = "about.html"
 
     def get_context(self, instance, *args, **kwargs):
         return dict(
diff --git a/hubs/widgets/about/templates/about.html b/hubs/widgets/about/templates/about.html
new file mode 100644
index 0000000..eafc55a
--- /dev/null
+++ b/hubs/widgets/about/templates/about.html
@@ -0,0 +1,5 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<p>{{text}}</p>
+{% endblock %}
diff --git a/hubs/widgets/badges/__init__.py b/hubs/widgets/badges/__init__.py
index 3664ae5..6c76716 100644
--- a/hubs/widgets/badges/__init__.py
+++ b/hubs/widgets/badges/__init__.py
@@ -25,7 +25,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/badges.html"
+    template_name = "badges.html"
 
     def get_context(self, instance, *args, **kwargs):
         context = {"title": "Badges"}
diff --git a/hubs/widgets/badges/templates/badges.html b/hubs/widgets/badges/templates/badges.html
new file mode 100644
index 0000000..c7201d2
--- /dev/null
+++ b/hubs/widgets/badges/templates/badges.html
@@ -0,0 +1,11 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="flex-container">
+{% for badge in assertions %}
+  <a width="60px" href="https://badges.fedoraproject.org/badge/{{badge['id']}}">
+    <span class="f-b-{{badge['id']}}"></span>
+  </a>
+{% endfor %}
+</div>
+{% endblock %}
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
index ecccf46..9123a4d 100644
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -3,6 +3,8 @@ from __future__ import unicode_literals, absolute_import
 import collections
 import logging
 import re
+import flask
+import jinja2
 
 from importlib import import_module
 from .caching import CachedFunction
@@ -33,6 +35,9 @@ class Widget(object):
     position = None
     arguments = []
 
+    def __init__(self):
+        self._template_environment = None
+
     def validate(self):
         """Ensure that the widget has the bits it needs."""
         if self.name is None:
@@ -60,13 +65,26 @@ class Widget(object):
     def get_template_environment(self):
         """
         Get the template environment that widget-specific views will use.
+
+        If additional filters or variables are needed in the templates, they
+        can be added by overriding this method in the widget subclass.
         """
-        # We may have widget-specific template environment one day
-        # (when widget templates are stored in the widget's directory
-        # instead of a common widget template directory).
-        # When that happens, it should be cached in a Widget attribute.
-        from hubs.widgets.templating import environment
-        return environment
+        if self._template_environment is None:
+            env = jinja2.Environment(
+                loader=jinja2.ChoiceLoader([
+                    jinja2.PackageLoader(self.__module__, "templates"),
+                    jinja2.PackageLoader("hubs.widgets", "templates"),
+                    ]),
+                trim_blocks=True,
+            )
+            env.filters['tojson'] = flask.json.tojson_filter
+            env.globals.update({
+                'session': flask.app.session,
+                'g': flask.g,
+                'url_for': flask.url_for,
+                })
+            self._template_environment = env
+        return self._template_environment
 
     def _get_local_subclasses(self, parent_class):
         """
diff --git a/hubs/widgets/bugzilla/__init__.py b/hubs/widgets/bugzilla/__init__.py
index 6a27bec..5965be1 100644
--- a/hubs/widgets/bugzilla/__init__.py
+++ b/hubs/widgets/bugzilla/__init__.py
@@ -28,7 +28,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/bugzilla.html"
+    template_name = "bugzilla.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_issues = GetIssues(instance)
diff --git a/hubs/widgets/bugzilla/templates/bugzilla.html b/hubs/widgets/bugzilla/templates/bugzilla.html
new file mode 100644
index 0000000..5fc68b5
--- /dev/null
+++ b/hubs/widgets/bugzilla/templates/bugzilla.html
@@ -0,0 +1,21 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<ul class="media-list">
+  {% for item in issues %}
+    <li class="media">
+      <div class="media-left">
+        <a href="https://bugzilla.redhat.com/show_bug.cgi?id={{ item['id'] }}" target="_blank">
+        <span class="label label-default">#{{ item['id'] }}</span>
+        </a>
+      </div>
+      <div class="media-body">
+        <h4 class="media-heading">
+          <a href="https://apps.fedoraproject.org/packages/{{ item['pkg_name'] }}" target="_blank">{{ item['pkg_name'] }}</a>:
+          {{ item['title'] }}
+        </h4>
+      </div>
+    </li>
+  {% endfor %}
+</ul>
+{% endblock %}
diff --git a/hubs/widgets/contact/__init__.py b/hubs/widgets/contact/__init__.py
index c491eb3..f5e5722 100644
--- a/hubs/widgets/contact/__init__.py
+++ b/hubs/widgets/contact/__init__.py
@@ -21,7 +21,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/contact.html"
+    template_name = "contact.html"
 
     def get_context(self, instance, *args, **kwargs):
         ''' Data for Contact widget. Checks if the hub associated
diff --git a/hubs/widgets/contact/templates/contact.html b/hubs/widgets/contact/templates/contact.html
new file mode 100644
index 0000000..d4844e9
--- /dev/null
+++ b/hubs/widgets/contact/templates/contact.html
@@ -0,0 +1,74 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="contactinfo-container">
+  {% if usergroup %}
+    <ul style="list-style: none; padding-left: 5px">
+      <!--<li><i class="fa fa-map-marker" aria-hidden="true"></i>
+          <span class="col-md-offset-1">{{location}}</span></li>-->
+      <li><i class="fa fa-clock-o" aria-hidden="true"></i>
+          <span class="col-md-offset-1">Current-Time :</span>
+          <script type="text/javascript">
+            // TODO: send offset after querying fas3
+            function calcTime(offset) {
+
+              // create Date object for current location
+              d = new Date();
+
+              // convert to msec
+              // add local time zone offset
+              // get UTC time in msec
+              utc = d.getTime() + (d.getTimezoneOffset() * 60000);
+
+              // create new Date object using supplied offset
+              nd = new Date(utc + (3600000 * offset));
+
+              // return time as a string
+              return nd.toLocaleString();
+            }
+
+            setInterval(function() {
+              $("#time").html(calcTime(-4))
+            }, 1000)
+
+            function get_karma_stats() {
+                var karma_url = '{{ karma_url }}';
+                  $.ajax({
+                    method: "GET",
+                    url: karma_url,
+                    dataType: 'html',
+                    success: function(html) {
+                      console.log('Success: ' + html);
+                      karma_arr = JSON.parse(html);
+                      console.log(karma_arr)
+                      $('#karma_current').html("Karma : "+karma_arr['current']+" ("+karma_arr['total']+" all time)");
+                    },
+                    error: function() {
+                      console.log('Error: getting karma');
+                    },
+                  });
+                }
+            get_karma_stats()
+          </script>
+          <span id="time"></span></li>
+      <li><i class="fa fa-envelope" aria-hidden="true"></i>
+          <span class="col-md-offset-1">{{email}}</span></li>
+      <li><i class="fa fa-comment" aria-hidden="true"></i>
+          <span class="col-md-offset-1"></span>{{ircnick}}</li>
+      <li><i class="fa fa-user-plus" aria-hidden="true"></i>
+          <span class="col-md-offset-1"></span><span id="karma_current"></span></li>
+      <li><i class="fa fa-certificate" aria-hidden="true"></i>
+          <span class="col-md-offset-1"></span> Member Since {{account_age}}</li>
+    </ul>
+  {% else %}
+    <ul style="list-style: none">
+      <li><i class="fa fa-comment" aria-hidden="true"></i>
+          <span class="col-md-offset-1"></span>fedora-{{ircchannel}}</li>
+      <li><i class="fa fa-envelope" aria-hidden="true"></i>
+          <span class="col-md-offset-1"><a href="{{ mailinglist }}">{{ hubname }}@lists.fedoraproject.org</a></span></li>
+      <li><i class="fa fa-info" aria-hidden="true"></i>
+          <span class="col-md-offset-1"><a href="{{ wikilink }}">fedoraproject.org/wiki/{{ hubname }}</a></span></li>
+    </ul>
+  {% endif %}
+</div>
+{% endblock %}
diff --git a/hubs/widgets/dummy/__init__.py b/hubs/widgets/dummy/__init__.py
index 1a96ee5..19d43c4 100644
--- a/hubs/widgets/dummy/__init__.py
+++ b/hubs/widgets/dummy/__init__.py
@@ -21,7 +21,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/dummy.html"
+    template_name = "dummy.html"
 
     def get_context(self, instance, *args, **kwargs):
         return dict(
diff --git a/hubs/widgets/dummy/templates/dummy.html b/hubs/widgets/dummy/templates/dummy.html
new file mode 100644
index 0000000..f2b2486
--- /dev/null
+++ b/hubs/widgets/dummy/templates/dummy.html
@@ -0,0 +1,5 @@
+{% extends "panel.html" %}
+
+{% block content %}
+{{text}}
+{% endblock %}
diff --git a/hubs/widgets/fedmsgstats/__init__.py b/hubs/widgets/fedmsgstats/__init__.py
index 82f68c1..a557148 100644
--- a/hubs/widgets/fedmsgstats/__init__.py
+++ b/hubs/widgets/fedmsgstats/__init__.py
@@ -30,7 +30,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/fedmsgstats.html"
+    template_name = "fedmsgstats.html"
 
     def get_context(self, instance, *args, **kwargs):
         username = instance.config["username"]
diff --git a/hubs/widgets/fedmsgstats/templates/fedmsgstats.html b/hubs/widgets/fedmsgstats/templates/fedmsgstats.html
new file mode 100644
index 0000000..d30234e
--- /dev/null
+++ b/hubs/widgets/fedmsgstats/templates/fedmsgstats.html
@@ -0,0 +1,27 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="stats-container row">
+  <div class="col-sm-7 col-md-12 col-lg-7">
+  <table class="stats-table">
+    <tr><th>subscribers</th><th>subscribed to</th></tr>
+    <tr class="text-info"><td>{{subscribers_text}}</td><td class="text-center">{{subscribed_text}}</td></tr>
+  </table>
+  </div>
+  <div class="col-sm-5 col-md-12 col-lg-5">
+  {% if session['nickname'] != username %}
+    <ul class="list-unstyled">
+    {% if session['nickname'] in subscribers %}
+    <li><form action="{{hub_unsubscribe_url}}" method="POST">
+        <button class="btn btn-info"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> Unsubscribe</button>
+    </form></li>
+    {% else %}
+    <li><form action="{{hub_subscribe_url}}" method="POST">
+        <button class="btn btn-default"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Subscribe</button>
+    </form></li>
+    {% endif %}
+    </ul>
+  {% endif %}
+  </div>
+</div>
+{% endblock %}
diff --git a/hubs/widgets/feed/__init__.py b/hubs/widgets/feed/__init__.py
index d2601f1..bd35b61 100644
--- a/hubs/widgets/feed/__init__.py
+++ b/hubs/widgets/feed/__init__.py
@@ -32,7 +32,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/feed.html"
+    template_name = "feed.html"
 
     def get_context(self, instance, *args, **kwargs):
         # Avoid circular import
diff --git a/hubs/widgets/feed/templates/feed.html b/hubs/widgets/feed/templates/feed.html
new file mode 100644
index 0000000..3f3bc87
--- /dev/null
+++ b/hubs/widgets/feed/templates/feed.html
@@ -0,0 +1,21 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div id="feed">
+</div>
+
+<script type="text/javascript"
+        src ="{{url_for('static', filename='js/hubs.js')}}"></script>
+<script>
+ (function() {
+   const FeedElement = React.createElement(Feed, {
+     matches: {{ matches }},
+     url: '{{ feed_url }}',
+     options: {
+       messageLimit: {{ message_limit }}
+     }
+   });
+   ReactDOM.render(FeedElement, document.getElementById('feed'));
+ })();
+</script>
+{% endblock %}
diff --git a/hubs/widgets/fhosted/__init__.py b/hubs/widgets/fhosted/__init__.py
index 3c55f9c..2c9d26c 100644
--- a/hubs/widgets/fhosted/__init__.py
+++ b/hubs/widgets/fhosted/__init__.py
@@ -31,7 +31,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/fedorahosted.html"
+    template_name = "fhosted.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_tickets = GetTickets(instance)
diff --git a/hubs/widgets/fhosted/templates/fhosted.html b/hubs/widgets/fhosted/templates/fhosted.html
new file mode 100644
index 0000000..5dcc574
--- /dev/null
+++ b/hubs/widgets/fhosted/templates/fhosted.html
@@ -0,0 +1,48 @@
+{% extends "templates/panel.html" %}
+
+{% block content %}
+{% if error %}
+<p>{{ error }}</p>
+{% else %}
+<a class="btn btn-success" target="_blank"
+    href="https://fedorahosted.org/{{ project }}/report/1">
+  All Issues
+</a>
+<hr/>
+
+<ul class="media-list">
+  {% for issue in tickets %}
+    <li class="media">
+      <div class="media-left">
+        <a  href="https://fedorahosted.org/{{ project }}/ticket/{{ issue['id'] }}"
+            target="_blank">
+        <span class="label label-default">#{{ issue['id'] }}</span>
+        </a>
+      </div>
+      <div class="media-body">
+        <h4 class="media-heading">
+          <span title="{{ issue['summary'] }}">
+            {{ issue['short_summary'] }} {% if
+              issue['summary'] | length > 45 %} ... {% endif %}
+          </span>
+        </h4>
+        Opened by:
+            {{ issue['reporter'] }}
+        --
+        {% if issue['owner'] %}
+          Assigned to:
+            {{issue['owner'] }}
+        {% else %}
+          <span class="text-muted">Unassigned</span>
+        {% endif %}
+      </div>
+    </li>
+  {% endfor %}
+  {% if total_tickets > tickets | length %}
+  <li>
+    And {{ total_tickets - tickets | length }} more ...
+  </li>
+  {% endif %}
+</ul>
+{% endif %}
+{% endblock %}
diff --git a/hubs/widgets/github_pr/__init__.py b/hubs/widgets/github_pr/__init__.py
index 9a03bc5..8b9aab3 100644
--- a/hubs/widgets/github_pr/__init__.py
+++ b/hubs/widgets/github_pr/__init__.py
@@ -37,7 +37,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/github_pr.html"
+    template_name = "github_pr.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_prs = GetPRs(instance)
diff --git a/hubs/widgets/github_pr/templates/github_pr.html b/hubs/widgets/github_pr/templates/github_pr.html
new file mode 100644
index 0000000..379771a
--- /dev/null
+++ b/hubs/widgets/github_pr/templates/github_pr.html
@@ -0,0 +1,50 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<a class="btn btn-success" target="_blank"
+    href="https://github.com/{{ organization }}" >
+  Organization Github Page
+</a>
+<hr/>
+<ul class="media-list">
+{% for pr in pulls[:display_number] %}
+  <li class="media">
+    <div class="media-left">
+      <a  href="{{ pr['url'] }}" 
+          target="_blank">
+      <span class="label label-default">#{{ pr['number'] }}</span>
+      </a>
+    </div>
+    <div class="media-body">
+      <h4 class="media-heading">
+        {{ organization }} -
+        <span title="{{ pr['title'] }}">
+          {{ pr['title'] }} {% if
+            pr['title'] | length > 45 %} ... {% endif %}
+        </span>
+      </h4>
+      Opened by:
+        <a href="https://github.com/{{ pr['user'] }}" 
+            target="_blank">
+          {{ pr['user'] }}
+        </a>
+      --
+      {% if pr['assignee'] %}
+        Assigned to:
+        <a href="https://github.com/{{ pr['assignee'] }}"
+            target="_blank">
+          {{ pr['assignee'] }}
+        </a>
+      {% else %}
+        <span class="text-muted">Unassigned</span>
+      {% endif %}
+    </div>
+  </li>
+{% endfor %}
+{% if all_pr | length > display_number %}
+  <li>
+    And {{ all_pr | length - display_number }} more ...
+  </li>
+{% endif %}
+</ul>
+{% endblock %}
diff --git a/hubs/widgets/githubissues/__init__.py b/hubs/widgets/githubissues/__init__.py
index e70dabf..6af020d 100644
--- a/hubs/widgets/githubissues/__init__.py
+++ b/hubs/widgets/githubissues/__init__.py
@@ -37,7 +37,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/githubissues.html"
+    template_name = "githubissues.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_issues = GetIssues(instance)
diff --git a/hubs/widgets/githubissues/templates/githubissues.html b/hubs/widgets/githubissues/templates/githubissues.html
new file mode 100644
index 0000000..534e148
--- /dev/null
+++ b/hubs/widgets/githubissues/templates/githubissues.html
@@ -0,0 +1,42 @@
+{% extends "panel.html" %}
+
+{% block content %}
+{% for i in range(display_number) %}
+<div>
+  <table class="table-responsive table-condensed">
+    <tr>
+      <td valign="top" class="panel-heading">
+        <b>#{{ all_issues[i]['num'] }}</b>
+      </td>
+      <td width="300px">
+        <b>{{ all_issues[i]['title'] }}</b>
+      </td>
+    </tr>
+  </table>
+  <table class="table-responsive table-condensed">
+    <tr>
+      <td width="300px">
+        <font size="2">
+          <i>Opened by <a href="https://github.com/{{ all_issues[i]['openedby'] }}" target="_blank">{{ all_issues[i]['openedby'] }}</a></i>
+          {% if all_issues[i]['assignee']|string() == "None" %}
+            <br /><i>Unclaimed</i>
+          {% else %}
+             <br /><i>Assigned by <a href="https://github.com/{{ all_issues[i]['assignee'] }}" target="_blank">{{ all_issues[i]['assignee'] }}</a></i>
+          {% endif %}
+        </font>
+      </td>
+      <td>
+         <a href="https://github.com/{{ org }}/{{ repo }}/issues/{{ all_issues[i]['num'] }}" target="_blank">
+           <button type="button" class="btn btn-default" aria-label="Left Align">
+             <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+           </button>
+         </a>
+      </td>
+    </tr>
+  </table>
+</div>
+{% endfor %}
+<div class="row">
+  <a href="https://github.com/{{ org }}/{{ repo }}/issues" target="_blank"><center>All Issues</center></a>
+</div>
+{% endblock %}
diff --git a/hubs/widgets/library/__init__.py b/hubs/widgets/library/__init__.py
index af990ac..d15fa1d 100644
--- a/hubs/widgets/library/__init__.py
+++ b/hubs/widgets/library/__init__.py
@@ -24,7 +24,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/library.html"
+    template_name = "library.html"
 
     def get_context(self, instance, *args, **kwargs):
         urls = [
diff --git a/hubs/widgets/library/templates/library.html b/hubs/widgets/library/templates/library.html
new file mode 100644
index 0000000..b32cfcb
--- /dev/null
+++ b/hubs/widgets/library/templates/library.html
@@ -0,0 +1,15 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="rules-container">
+  <div class="row">
+    <ul>
+    {% for url in urls %}
+    <li>
+      {{ url }}
+    </li>
+    {% endfor %}
+    </ul>
+  </div>
+</div>
+{% endblock %}
diff --git a/hubs/widgets/linechart/__init__.py b/hubs/widgets/linechart/__init__.py
index adc9590..f745e28 100644
--- a/hubs/widgets/linechart/__init__.py
+++ b/hubs/widgets/linechart/__init__.py
@@ -21,7 +21,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/linechart.html"
+    template_name = "linechart.html"
 
     def get_context(self, instance, *args, **kwargs):
         username = instance.config["username"]
diff --git a/hubs/widgets/linechart/templates/linechart.html b/hubs/widgets/linechart/templates/linechart.html
new file mode 100644
index 0000000..573d452
--- /dev/null
+++ b/hubs/widgets/linechart/templates/linechart.html
@@ -0,0 +1,7 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="flex-container">
+    <img src="{{url}}" />
+</div>
+{% endblock %}
diff --git a/hubs/widgets/meetings/__init__.py b/hubs/widgets/meetings/__init__.py
index 8a5c7ef..c87df27 100644
--- a/hubs/widgets/meetings/__init__.py
+++ b/hubs/widgets/meetings/__init__.py
@@ -41,7 +41,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/meetings.html"
+    template_name = "meetings.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_meetings = GetMeetings(instance)
diff --git a/hubs/widgets/meetings/templates/meetings.html b/hubs/widgets/meetings/templates/meetings.html
new file mode 100644
index 0000000..42c5c7b
--- /dev/null
+++ b/hubs/widgets/meetings/templates/meetings.html
@@ -0,0 +1,63 @@
+{% extends "panel.html" %}
+
+{% block content %}
+{% for title, next in meetings.items() %}
+<div class="meeting">
+  <div class="row">
+      <h5>&nbsp;&nbsp;The {{ next.meeting_name }} is {{ next.start_dt | humanize }}</h5>
+  </div>
+  <div class="row">
+    <div class="col-md-4 meeting-date">
+      {% if next.display_duration %}
+      <strong>{{ next.start_date }} - {{ next.stop_date }}</strong>
+      {% else %}
+      <strong>{{next.start_date}}</strong>
+      {% endif %}
+    </div>
+    <div class="col-md-4 meeting-time">
+      {% if next.display_time %}
+      @{{ next.start_time }}{% endif %}<br>
+
+      <a href="#">{{ next.location }}</a>
+    </div>
+    <div class="col-md-4">
+      <a href="https://apps.fedoraproject.org/calendar/ical/calendar/meeting/{{ next.meeting_id }}/">
+        <button class="btn btn-default btn-sm add-calendar">
+          <strong>Add to calendar</strong>
+        </button>
+      </a>
+    </div>
+  </div>
+  {% if next.get('meeting_information_html')  %}
+  <div class="row">
+      <div class="col-md-12 meeting-info">
+        {{ next.meeting_information_html[:150] }}
+        {%- if next.meeting_information_html | length > 150 %}...
+        <p>
+          <a href="https://apps.fedoraproject.org/calendar/meeting/{{ next.meeting_id }}/">Full description</a>
+        </p>
+        {% endif %}
+      </div>
+  </div>
+  {% endif  %}
+</div>
+{% if meetings | length > 1 %} <hr> {% endif %}
+{% else %}
+<div class="meeting">
+  <div class="row">
+    No coming meetings in {{ calendar }}.
+  </div>
+</div>
+{% endfor %}
+{% endblock %}
+
+
+{% block footer %}
+<div class="panel-footer">
+  <div class="row" align="center">
+    <button class="btn btn-default">
+      <strong>Request A New Meeting</strong>
+    </button>
+  </div>
+</div>
+{% endblock %}
diff --git a/hubs/widgets/memberships/__init__.py b/hubs/widgets/memberships/__init__.py
index cd36983..213f024 100644
--- a/hubs/widgets/memberships/__init__.py
+++ b/hubs/widgets/memberships/__init__.py
@@ -18,7 +18,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/memberships.html"
+    template_name = "memberships.html"
 
     def get_context(self, instance, *args, **kwargs):
         hub = instance.hub
diff --git a/hubs/widgets/memberships/templates/memberships.html b/hubs/widgets/memberships/templates/memberships.html
new file mode 100644
index 0000000..2961e84
--- /dev/null
+++ b/hubs/widgets/memberships/templates/memberships.html
@@ -0,0 +1,80 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="card-block">
+  {% if memberships|length > oldest_members|length %}
+  {% for member in oldest_members %}
+  <div class="card-block">
+    <img class="img-responsive membership-avatar col-md-3" src="{{ member.avatar }}" alt="Hub avatar for {{ member.name }}">
+    <a href="/{{member.name}}">{{ member.name }}</a>
+    {% if g.auth.username in member.owners %}
+      <p class="text-muted">Owner</p>
+    {% else %}
+      <p>Member</p>
+    {% endif %}
+  </div>
+  {% endfor %}
+  <a href="#" class="btn btn-default" data-toggle="modal" data-target="#membersModal">View All</a>
+  {% else %}
+  {% for member in memberships %}
+  <div class="card-block">
+    <img class="img-responsive membership-avatar col-md-3" src="{{ member.avatar }}" alt="Hub avatar for {{ member.name }}">
+    <a href="/{{member.name}}">{{ member.name }}</a>
+    {% if g.auth.username in member.owners %}
+      <p class="text-muted">Owner</p>
+    {% else %}
+      <p>Member</p>
+    {% endif %}
+  </div>
+  {% endfor %}
+  {%endif%}
+</div>
+
+<!-- View all modal -->
+<div class="modal fade" id="membersModal" tabindex="-1" role="dialog" aria-labelledby="membersModal" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="myModalLabel">All Memberships</h4>
+      </div>
+      <div id="owners" class="modal-body">
+        <div class="card-block">
+          <div class="row">
+            {% for member in memberships %}
+            <div class="col-sm-6">
+              <img class="img-responsive membership-avatar col-sm-3"
+                src="{{ member.avatar }}" alt="Hub avatar for {{ member.name }}">
+              <a href="/{{member.name}}">{{ member.name }}</a>
+              {% if g.auth.username in member.owners %}
+              <p class="text-muted">Owner</p>
+              {% else %}
+              <p>Member</p>
+              {% endif %}
+            </div>
+            {% if (loop.index % 2) == 0 %}
+              </div>
+              <div class="row">
+            {% endif %}
+          {% endfor %}
+        </div>
+        <div class="modal-footer clearfix">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<style>
+ .membership-avatar {
+   height: 4em;
+   width: 6em;
+ }
+ .modal-header {
+   border-bottom: 0;
+ }
+
+ #owners {
+   padding: 10px;
+ }
+</style>
+{% endblock %}
diff --git a/hubs/widgets/pagure_pr/__init__.py b/hubs/widgets/pagure_pr/__init__.py
index ad047a7..580fece 100644
--- a/hubs/widgets/pagure_pr/__init__.py
+++ b/hubs/widgets/pagure_pr/__init__.py
@@ -27,7 +27,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/pagure_pr.html"
+    template_name = "pagure_pr.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_prs = GetPRs(instance)
diff --git a/hubs/widgets/pagure_pr/templates/pagure_pr.html b/hubs/widgets/pagure_pr/templates/pagure_pr.html
new file mode 100644
index 0000000..9a7f3f2
--- /dev/null
+++ b/hubs/widgets/pagure_pr/templates/pagure_pr.html
@@ -0,0 +1,52 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<ul class="media-list">
+  {% for pr in all_pr[:10] %}
+    <li class="media">
+      <div class="media-left">
+        <a  href="https://pagure.io/{{ repo }}/pull-request/{{ pr['pr_id'] }}"
+            target="_blank">
+        <span class="label label-default">#{{ pr['pr_id'] }}</span>
+        </a>
+      </div>
+      <div class="media-body">
+        <h4 class="media-heading">
+          {{ pr['pr_project_name'] }} -
+          <span title="{{ pr['pr_title_full'] }}">
+            {{ pr['pr_title'] }} {% if
+              pr['pr_title_full'] | length > 45 %} ... {% endif %}
+          </span>
+        </h4>
+        Opened by:
+          <a href="https://pagure.io/user/{{ pr['pr_openedby'] }}"
+              target="_blank">
+            {{ pr['pr_openedby'] }}
+          </a>
+        --
+        {% if pr['pr_assignee'] %}
+          Assigned to:
+          <a href="https://pagure.io/user/{{ pr['pr_assignee'] }}"
+              target="_blank">
+            {{ pr['pr_assignee']['name'] }}
+          </a>
+        {% else %}
+          <span class="text-muted">Unassigned</span>
+        {% endif %}
+      </div>
+    </li>
+  {% endfor %}
+  {% if all_pr | length > 10 %}
+  <li>
+    And {{ all_pr | length - 10 }} more ...
+  </li>
+  {% endif %}
+</ul>
+
+<hr/>
+
+<a class="btn btn-success" target="_blank"
+    href="https://pagure.io/{{ repo }}/pull-requests">
+  All Pull-Requests
+</a>
+{% endblock %}
diff --git a/hubs/widgets/pagureissues/__init__.py b/hubs/widgets/pagureissues/__init__.py
index 690dd86..f3490c9 100644
--- a/hubs/widgets/pagureissues/__init__.py
+++ b/hubs/widgets/pagureissues/__init__.py
@@ -27,7 +27,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/pagureissues.html"
+    template_name = "pagureissues.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_issues = GetIssues(instance)
diff --git a/hubs/widgets/pagureissues/templates/pagureissues.html b/hubs/widgets/pagureissues/templates/pagureissues.html
new file mode 100644
index 0000000..989ccd4
--- /dev/null
+++ b/hubs/widgets/pagureissues/templates/pagureissues.html
@@ -0,0 +1,51 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<a class="btn btn-success" target="_blank"
+    href="https://pagure.io/{{ repo }}/issues">
+  All Issues
+</a>
+<hr/>
+
+<ul class="media-list">
+  {% for issue in all_issues[:10] %}
+    <li class="media">
+      <div class="media-left">
+        <a  href="https://pagure.io/{{ repo }}/issue/{{ issue['issue_id'] }}"
+            target="_blank">
+          {{ issue['issue_project_name'] }}
+        <span class="label label-default">#{{ issue['issue_id'] }}</span>
+        </a>
+      </div>
+      <div class="media-body">
+        <h4 class="media-heading">
+          <span title="{{ issue['issue_title_full'] }}">
+            {{ issue['issue_title'] }} {% if
+              issue['issue_title_full'] | length > 45 %} ... {% endif %}
+          </span>
+        </h4>
+        Opened by:
+          <a href="https://pagure.io/user/{{ issue['issue_openedby'] }}"
+              target="_blank">
+            {{ issue['issue_openedby'] }}
+          </a>
+        --
+        {% if issue['issue_assignee'] %}
+          Assigned to:
+          <a href="https://pagure.io/user/{{issue['issue_assignee'] }}"
+              target="_blank">
+            {{issue['issue_assignee'] }}
+          </a>
+        {% else %}
+          <span class="text-muted">Unassigned</span>
+        {% endif %}
+      </div>
+    </li>
+  {% endfor %}
+  {% if all_issues | length > 10 %}
+  <li>
+    And {{ all_issues | length - 10 }} more ...
+  </li>
+  {% endif %}
+</ul>
+{% endblock %}
diff --git a/hubs/widgets/rules/__init__.py b/hubs/widgets/rules/__init__.py
index 84b2016..e4e874c 100644
--- a/hubs/widgets/rules/__init__.py
+++ b/hubs/widgets/rules/__init__.py
@@ -46,7 +46,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/rules.html"
+    template_name = "rules.html"
 
     def get_context(self, instance, *args, **kwargs):
         owners = instance.hub.owners
diff --git a/hubs/widgets/rules/templates/rules.html b/hubs/widgets/rules/templates/rules.html
new file mode 100644
index 0000000..c5b83f0
--- /dev/null
+++ b/hubs/widgets/rules/templates/rules.html
@@ -0,0 +1,91 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="rules-container">
+  {% if link %}
+  <h6>community rules</h6>
+  <p><a href="{{link}}">Community Rules and Guidelines</a></h6>
+  {% endif %}
+  <h6>group owners ({{ owners|length }})</h6>
+  <div class="row">
+    {% if owners|length > 5%}
+      {% for owner in oldest_owners %}
+        <div class="col-sm-6">
+          <img class="img-circle" src="{{owner['avatar']}}"/>
+          <a href="{{ url_for('hub', name=owner['username']) }}">{{owner['username']}}</a>
+        </div>
+        {% endfor %}
+        <br/>
+        <a href="#" class="btn btn-default" data-toggle="modal" data-target="#ownersModal">View All</a>
+    {% else %}
+      {% for owner in owners %}
+        <div class="col-sm-6">
+          <img class="img-circle" src="{{owners[owner]}}"/>
+          <a href="{{ url_for('hub', name=owner)}}">{{owner}}</a>
+        </div>
+      {% endfor %}
+    {% endif %}
+  </div>
+  {% if schedule_text or schedule_link or minutes_link %}
+  <h6>meetings</h6>
+  {% if schedule_text %}
+  <p>{{schedule_text}}</p>
+  {% endif %}
+  <p>
+  {% if schedule_link %}
+  <a target="_blank" href="{{schedule_link}}">Meeting Schedule</a>
+  {% endif %}
+  {% if schedule_link and minutes_link %}
+  &#8214;
+  {% endif %}
+  {% if minutes_link %}
+  <a target="_blank" href="{{minutes_link}}">Past Meeting Minutes</a>
+  {% endif %}
+  </p>
+  {% endif %}
+</div>
+
+
+<!-- View all modal -->
+<div class="modal fade" id="ownersModal" tabindex="-1" role="dialog" aria-labelledby="ownersModal" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="myModalLabel">All group owners</h4>
+      </div>
+      <div id="owners">
+        {% for owner in owners %}
+        <div class="col-sm-6">
+          <img class="img-circle img-circle-lg" src="{{owners[owner]}}"/>
+          <a href="{{ url_for('hub', name=owner)}}">{{owner}}</a>
+        </div>
+        {% endfor %}
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<style>
+  .rules-table {
+    width: 180px
+    padding: 0px;
+    margin: 0px;
+    display: inline-block;
+  }
+  .rules-table td {
+    font-size: 32pt;
+  }
+
+ .img-circle-lg {
+   height: 4em;
+   width: 4em;
+   padding: 10px;
+ }
+ .modal-header {
+   border-bottom: 0;
+ }
+</style>
+{% endblock %}
diff --git a/hubs/widgets/stats/__init__.py b/hubs/widgets/stats/__init__.py
index 87d4415..67740df 100644
--- a/hubs/widgets/stats/__init__.py
+++ b/hubs/widgets/stats/__init__.py
@@ -17,7 +17,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/stats.html"
+    template_name = "stats.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_stats = GetStats(instance)
diff --git a/hubs/widgets/stats/templates/stats.html b/hubs/widgets/stats/templates/stats.html
new file mode 100644
index 0000000..9e959fc
--- /dev/null
+++ b/hubs/widgets/stats/templates/stats.html
@@ -0,0 +1,78 @@
+{% extends "panel.html" %}
+
+{% block content %}
+<div class="stats-container row">
+<div class="col-md-7">
+  <table class="stats-table">
+    <tr><th>Members</th><th>Subscribers</th></tr>
+    <tr class="text-info">
+      <td>{{members_text}}</td>
+      <td class="text-right">{{subscribers_text}}</td>
+    </tr>
+  </table>
+</div>
+<div class="col-md-5">
+  <ul class="list-unstyled">
+  {% if g.auth.nickname in subscribers %}
+  <li>
+    <form action="{{hub_unsubscribe_url}}" method="POST">
+      <button class="btn btn-info">
+        <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span>
+        Unsubscribe
+      </button>
+    </form>
+  </li>
+  {% else %}
+  <li>
+    <form action="{{hub_subscribe_url}}" method="POST">
+      <button class="btn btn-default">
+        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+        Subscribe
+      </button>
+    </form>
+  </li>
+  {% endif %}
+
+  {% if g.auth.nickname in stargazers %}
+  <li>
+    <form action="{{hub_unstar_url}}" method="POST">
+      <button class="btn btn-info">
+        <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span>
+        Unstar Hub
+      </button>
+    </form>
+  </li>
+  {% else %}
+  <li>
+    <form action="{{hub_star_url}}" method="POST">
+      <button class="btn btn-default">
+        <span class="glyphicon glyphicon-star" aria-hidden="true"></span>
+        Star Hub
+      </button>
+    </form>
+  </li>
+  {% endif %}
+
+  {% if g.auth.nickname in members %}
+  <li>
+    <form action="{{hub_leave_url}}" method="POST">
+      <button class="btn btn-info">
+        <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span>
+        Leave Hub
+      </button>
+    </form>
+  </li>
+  {% else %}
+  <li>
+    <form action="{{hub_join_url}}" method="POST">
+      <button class="btn btn-default">
+        <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+        Join Hub
+      </button>
+    </form>
+  </li>
+  {% endif %}
+  </ul>
+</div>
+</div>
+{% endblock %}
diff --git a/hubs/widgets/sticky/__init__.py b/hubs/widgets/sticky/__init__.py
index 28c8fed..02e7fdf 100644
--- a/hubs/widgets/sticky/__init__.py
+++ b/hubs/widgets/sticky/__init__.py
@@ -22,7 +22,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/sticky.html"
+    template_name = "sticky.html"
 
     def get_context(self, instance, *args, **kwargs):
         # TODO -- render with markdown
diff --git a/hubs/widgets/sticky/templates/sticky.html b/hubs/widgets/sticky/templates/sticky.html
new file mode 100644
index 0000000..f2b2486
--- /dev/null
+++ b/hubs/widgets/sticky/templates/sticky.html
@@ -0,0 +1,5 @@
+{% extends "panel.html" %}
+
+{% block content %}
+{{text}}
+{% endblock %}
diff --git a/hubs/widgets/subscriptions/__init__.py b/hubs/widgets/subscriptions/__init__.py
index 466beb9..14538f0 100644
--- a/hubs/widgets/subscriptions/__init__.py
+++ b/hubs/widgets/subscriptions/__init__.py
@@ -31,7 +31,7 @@ class BaseView(WidgetView):
 
     name = "root"
     url_rules = ["/"]
-    template_name = "templates/subscriptions.html"
+    template_name = "subscriptions.html"
 
     def get_context(self, instance, *args, **kwargs):
         context = dict(title="Hubs")
diff --git a/hubs/widgets/subscriptions/templates/subscriptions.html b/hubs/widgets/subscriptions/templates/subscriptions.html
new file mode 100644
index 0000000..1114d8c
--- /dev/null
+++ b/hubs/widgets/subscriptions/templates/subscriptions.html
@@ -0,0 +1,17 @@
+{% if associations %}
+{% extends "panel.html" %}
+
+{% block content %}
+    {% if memberships %}
+        <p><strong>Belongs to: </strong> {{memberships_text}}</p>
+    {% endif %}
+    <hr/>
+    {% if subscriptions %}
+        <p><strong>Subscribes to:</strong>
+        {% for subscription in subscriptions %}
+        <a href="{{ url_for('hub', name=subscription)}}">
+        {{subscription}}</a>
+        {% endfor %}</p>
+    {% endif %}
+{% endblock %}
+{% endif %}
diff --git a/hubs/widgets/templates/about.html b/hubs/widgets/templates/about.html
deleted file mode 100644
index 3b25a3a..0000000
--- a/hubs/widgets/templates/about.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<p>{{text}}</p>
-{% endblock %}
diff --git a/hubs/widgets/templates/badges.html b/hubs/widgets/templates/badges.html
deleted file mode 100644
index 22a0562..0000000
--- a/hubs/widgets/templates/badges.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="flex-container">
-{% for badge in assertions %}
-  <a width="60px" href="https://badges.fedoraproject.org/badge/{{badge['id']}}">
-    <span class="f-b-{{badge['id']}}"></span>
-  </a>
-{% endfor %}
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/bugzilla.html b/hubs/widgets/templates/bugzilla.html
deleted file mode 100644
index 9809c31..0000000
--- a/hubs/widgets/templates/bugzilla.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<ul class="media-list">
-  {% for item in issues %}
-    <li class="media">
-      <div class="media-left">
-        <a href="https://bugzilla.redhat.com/show_bug.cgi?id={{ item['id'] }}" target="_blank">
-        <span class="label label-default">#{{ item['id'] }}</span>
-        </a>
-      </div>
-      <div class="media-body">
-        <h4 class="media-heading">
-          <a href="https://apps.fedoraproject.org/packages/{{ item['pkg_name'] }}" target="_blank">{{ item['pkg_name'] }}</a>:
-          {{ item['title'] }}
-        </h4>
-      </div>
-    </li>
-  {% endfor %}
-</ul>
-{% endblock %}
diff --git a/hubs/widgets/templates/contact.html b/hubs/widgets/templates/contact.html
deleted file mode 100644
index 9898a18..0000000
--- a/hubs/widgets/templates/contact.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="contactinfo-container">
-  {% if usergroup %}
-    <ul style="list-style: none; padding-left: 5px">
-      <!--<li><i class="fa fa-map-marker" aria-hidden="true"></i>
-          <span class="col-md-offset-1">{{location}}</span></li>-->
-      <li><i class="fa fa-clock-o" aria-hidden="true"></i>
-          <span class="col-md-offset-1">Current-Time :</span>
-          <script type="text/javascript">
-            // TODO: send offset after querying fas3
-            function calcTime(offset) {
-
-              // create Date object for current location
-              d = new Date();
-
-              // convert to msec
-              // add local time zone offset
-              // get UTC time in msec
-              utc = d.getTime() + (d.getTimezoneOffset() * 60000);
-
-              // create new Date object using supplied offset
-              nd = new Date(utc + (3600000 * offset));
-
-              // return time as a string
-              return nd.toLocaleString();
-            }
-
-            setInterval(function() {
-              $("#time").html(calcTime(-4))
-            }, 1000)
-
-            function get_karma_stats() {
-                var karma_url = '{{ karma_url }}';
-                  $.ajax({
-                    method: "GET",
-                    url: karma_url,
-                    dataType: 'html',
-                    success: function(html) {
-                      console.log('Success: ' + html);
-                      karma_arr = JSON.parse(html);
-                      console.log(karma_arr)
-                      $('#karma_current').html("Karma : "+karma_arr['current']+" ("+karma_arr['total']+" all time)");
-                    },
-                    error: function() {
-                      console.log('Error: getting karma');
-                    },
-                  });
-                }
-            get_karma_stats()
-          </script>
-          <span id="time"></span></li>
-      <li><i class="fa fa-envelope" aria-hidden="true"></i>
-          <span class="col-md-offset-1">{{email}}</span></li>
-      <li><i class="fa fa-comment" aria-hidden="true"></i>
-          <span class="col-md-offset-1"></span>{{ircnick}}</li>
-      <li><i class="fa fa-user-plus" aria-hidden="true"></i>
-          <span class="col-md-offset-1"></span><span id="karma_current"></span></li>
-      <li><i class="fa fa-certificate" aria-hidden="true"></i>
-          <span class="col-md-offset-1"></span> Member Since {{account_age}}</li>
-    </ul>
-  {% else %}
-    <ul style="list-style: none">
-      <li><i class="fa fa-comment" aria-hidden="true"></i>
-          <span class="col-md-offset-1"></span>fedora-{{ircchannel}}</li>
-      <li><i class="fa fa-envelope" aria-hidden="true"></i>
-          <span class="col-md-offset-1"><a href="{{ mailinglist }}">{{ hubname }}@lists.fedoraproject.org</a></span></li>
-      <li><i class="fa fa-info" aria-hidden="true"></i>
-          <span class="col-md-offset-1"><a href="{{ wikilink }}">fedoraproject.org/wiki/{{ hubname }}</a></span></li>
-    </ul>
-  {% endif %}
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/dummy.html b/hubs/widgets/templates/dummy.html
deleted file mode 100644
index 6e318ec..0000000
--- a/hubs/widgets/templates/dummy.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-{{text}}
-{% endblock %}
diff --git a/hubs/widgets/templates/fedmsgstats.html b/hubs/widgets/templates/fedmsgstats.html
deleted file mode 100644
index fe369e2..0000000
--- a/hubs/widgets/templates/fedmsgstats.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="stats-container row">
-  <div class="col-sm-7 col-md-12 col-lg-7">
-  <table class="stats-table">
-    <tr><th>subscribers</th><th>subscribed to</th></tr>
-    <tr class="text-info"><td>{{subscribers_text}}</td><td class="text-center">{{subscribed_text}}</td></tr>
-  </table>
-  </div>
-  <div class="col-sm-5 col-md-12 col-lg-5">
-  {% if session['nickname'] != username %}
-    <ul class="list-unstyled">
-    {% if session['nickname'] in subscribers %}
-    <li><form action="{{hub_unsubscribe_url}}" method="POST">
-        <button class="btn btn-info"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> Unsubscribe</button>
-    </form></li>
-    {% else %}
-    <li><form action="{{hub_subscribe_url}}" method="POST">
-        <button class="btn btn-default"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Subscribe</button>
-    </form></li>
-    {% endif %}
-    </ul>
-  {% endif %}
-  </div>
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/fedorahosted.html b/hubs/widgets/templates/fedorahosted.html
deleted file mode 100644
index 5dcc574..0000000
--- a/hubs/widgets/templates/fedorahosted.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-{% if error %}
-<p>{{ error }}</p>
-{% else %}
-<a class="btn btn-success" target="_blank"
-    href="https://fedorahosted.org/{{ project }}/report/1">
-  All Issues
-</a>
-<hr/>
-
-<ul class="media-list">
-  {% for issue in tickets %}
-    <li class="media">
-      <div class="media-left">
-        <a  href="https://fedorahosted.org/{{ project }}/ticket/{{ issue['id'] }}"
-            target="_blank">
-        <span class="label label-default">#{{ issue['id'] }}</span>
-        </a>
-      </div>
-      <div class="media-body">
-        <h4 class="media-heading">
-          <span title="{{ issue['summary'] }}">
-            {{ issue['short_summary'] }} {% if
-              issue['summary'] | length > 45 %} ... {% endif %}
-          </span>
-        </h4>
-        Opened by:
-            {{ issue['reporter'] }}
-        --
-        {% if issue['owner'] %}
-          Assigned to:
-            {{issue['owner'] }}
-        {% else %}
-          <span class="text-muted">Unassigned</span>
-        {% endif %}
-      </div>
-    </li>
-  {% endfor %}
-  {% if total_tickets > tickets | length %}
-  <li>
-    And {{ total_tickets - tickets | length }} more ...
-  </li>
-  {% endif %}
-</ul>
-{% endif %}
-{% endblock %}
diff --git a/hubs/widgets/templates/feed.html b/hubs/widgets/templates/feed.html
deleted file mode 100644
index 84256cc..0000000
--- a/hubs/widgets/templates/feed.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div id="feed">
-</div>
-
-<script type="text/javascript"
-        src ="{{url_for('static', filename='js/hubs.js')}}"></script>
-<script>
- (function() {
-   const FeedElement = React.createElement(Feed, {
-     matches: {{ matches }},
-     url: '{{ feed_url }}',
-     options: {
-       messageLimit: {{ message_limit }}
-     }
-   });
-   ReactDOM.render(FeedElement, document.getElementById('feed'));
- })();
-</script>
-{% endblock %}
diff --git a/hubs/widgets/templates/github_pr.html b/hubs/widgets/templates/github_pr.html
deleted file mode 100644
index 743c9aa..0000000
--- a/hubs/widgets/templates/github_pr.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<a class="btn btn-success" target="_blank"
-    href="https://github.com/{{ organization }}" >
-  Organization Github Page
-</a>
-<hr/>
-<ul class="media-list">
-{% for pr in pulls[:display_number] %}
-  <li class="media">
-    <div class="media-left">
-      <a  href="{{ pr['url'] }}" 
-          target="_blank">
-      <span class="label label-default">#{{ pr['number'] }}</span>
-      </a>
-    </div>
-    <div class="media-body">
-      <h4 class="media-heading">
-        {{ organization }} -
-        <span title="{{ pr['title'] }}">
-          {{ pr['title'] }} {% if
-            pr['title'] | length > 45 %} ... {% endif %}
-        </span>
-      </h4>
-      Opened by:
-        <a href="https://github.com/{{ pr['user'] }}" 
-            target="_blank">
-          {{ pr['user'] }}
-        </a>
-      --
-      {% if pr['assignee'] %}
-        Assigned to:
-        <a href="https://github.com/{{ pr['assignee'] }}"
-            target="_blank">
-          {{ pr['assignee'] }}
-        </a>
-      {% else %}
-        <span class="text-muted">Unassigned</span>
-      {% endif %}
-    </div>
-  </li>
-{% endfor %}
-{% if all_pr | length > display_number %}
-  <li>
-    And {{ all_pr | length - display_number }} more ...
-  </li>
-{% endif %}
-</ul>
-{% endblock %}
diff --git a/hubs/widgets/templates/githubissues.html b/hubs/widgets/templates/githubissues.html
deleted file mode 100644
index 1a57dab..0000000
--- a/hubs/widgets/templates/githubissues.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-{% for i in range(display_number) %}
-<div>
-  <table class="table-responsive table-condensed">
-    <tr>
-      <td valign="top" class="panel-heading">
-        <b>#{{ all_issues[i]['num'] }}</b>
-      </td>
-      <td width="300px">
-        <b>{{ all_issues[i]['title'] }}</b>
-      </td>
-    </tr>
-  </table>
-  <table class="table-responsive table-condensed">
-    <tr>
-      <td width="300px">
-        <font size="2">
-          <i>Opened by <a href="https://github.com/{{ all_issues[i]['openedby'] }}" target="_blank">{{ all_issues[i]['openedby'] }}</a></i>
-          {% if all_issues[i]['assignee']|string() == "None" %}
-            <br /><i>Unclaimed</i>
-          {% else %}
-             <br /><i>Assigned by <a href="https://github.com/{{ all_issues[i]['assignee'] }}" target="_blank">{{ all_issues[i]['assignee'] }}</a></i>
-          {% endif %}
-        </font>
-      </td>
-      <td>
-         <a href="https://github.com/{{ org }}/{{ repo }}/issues/{{ all_issues[i]['num'] }}" target="_blank">
-           <button type="button" class="btn btn-default" aria-label="Left Align">
-             <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-           </button>
-         </a>
-      </td>
-    </tr>
-  </table>
-</div>
-{% endfor %}
-<div class="row">
-  <a href="https://github.com/{{ org }}/{{ repo }}/issues" target="_blank"><center>All Issues</center></a>
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/library.html b/hubs/widgets/templates/library.html
deleted file mode 100644
index a9155b5..0000000
--- a/hubs/widgets/templates/library.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="rules-container">
-  <div class="row">
-    <ul>
-    {% for url in urls %}
-    <li>
-      {{ url }}
-    </li>
-    {% endfor %}
-    </ul>
-  </div>
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/linechart.html b/hubs/widgets/templates/linechart.html
deleted file mode 100644
index 3cc86ef..0000000
--- a/hubs/widgets/templates/linechart.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="flex-container">
-    <img src="{{url}}" />
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/meetings.html b/hubs/widgets/templates/meetings.html
deleted file mode 100644
index 600c82c..0000000
--- a/hubs/widgets/templates/meetings.html
+++ /dev/null
@@ -1,63 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-{% for title, next in meetings.items() %}
-<div class="meeting">
-  <div class="row">
-      <h5>&nbsp;&nbsp;The {{ next.meeting_name }} is {{ next.start_dt | humanize }}</h5>
-  </div>
-  <div class="row">
-    <div class="col-md-4 meeting-date">
-      {% if next.display_duration %}
-      <strong>{{ next.start_date }} - {{ next.stop_date }}</strong>
-      {% else %}
-      <strong>{{next.start_date}}</strong>
-      {% endif %}
-    </div>
-    <div class="col-md-4 meeting-time">
-      {% if next.display_time %}
-      @{{ next.start_time }}{% endif %}<br>
-
-      <a href="#">{{ next.location }}</a>
-    </div>
-    <div class="col-md-4">
-      <a href="https://apps.fedoraproject.org/calendar/ical/calendar/meeting/{{ next.meeting_id }}/">
-        <button class="btn btn-default btn-sm add-calendar">
-          <strong>Add to calendar</strong>
-        </button>
-      </a>
-    </div>
-  </div>
-  {% if next.get('meeting_information_html')  %}
-  <div class="row">
-      <div class="col-md-12 meeting-info">
-        {{ next.meeting_information_html[:150] }}
-        {%- if next.meeting_information_html | length > 150 %}...
-        <p>
-          <a href="https://apps.fedoraproject.org/calendar/meeting/{{ next.meeting_id }}/">Full description</a>
-        </p>
-        {% endif %}
-      </div>
-  </div>
-  {% endif  %}
-</div>
-{% if meetings | length > 1 %} <hr> {% endif %}
-{% else %}
-<div class="meeting">
-  <div class="row">
-    No coming meetings in {{ calendar }}.
-  </div>
-</div>
-{% endfor %}
-{% endblock %}
-
-
-{% block footer %}
-<div class="panel-footer">
-  <div class="row" align="center">
-    <button class="btn btn-default">
-      <strong>Request A New Meeting</strong>
-    </button>
-  </div>
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/memberships.html b/hubs/widgets/templates/memberships.html
deleted file mode 100644
index 57c6d70..0000000
--- a/hubs/widgets/templates/memberships.html
+++ /dev/null
@@ -1,80 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="card-block">
-  {% if memberships|length > oldest_members|length %}
-  {% for member in oldest_members %}
-  <div class="card-block">
-    <img class="img-responsive membership-avatar col-md-3" src="{{ member.avatar }}" alt="Hub avatar for {{ member.name }}">
-    <a href="/{{member.name}}">{{ member.name }}</a>
-    {% if g.auth.username in member.owners %}
-      <p class="text-muted">Owner</p>
-    {% else %}
-      <p>Member</p>
-    {% endif %}
-  </div>
-  {% endfor %}
-  <a href="#" class="btn btn-default" data-toggle="modal" data-target="#membersModal">View All</a>
-  {% else %}
-  {% for member in memberships %}
-  <div class="card-block">
-    <img class="img-responsive membership-avatar col-md-3" src="{{ member.avatar }}" alt="Hub avatar for {{ member.name }}">
-    <a href="/{{member.name}}">{{ member.name }}</a>
-    {% if g.auth.username in member.owners %}
-      <p class="text-muted">Owner</p>
-    {% else %}
-      <p>Member</p>
-    {% endif %}
-  </div>
-  {% endfor %}
-  {%endif%}
-</div>
-
-<!-- View all modal -->
-<div class="modal fade" id="membersModal" tabindex="-1" role="dialog" aria-labelledby="membersModal" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title" id="myModalLabel">All Memberships</h4>
-      </div>
-      <div id="owners" class="modal-body">
-        <div class="card-block">
-          <div class="row">
-            {% for member in memberships %}
-            <div class="col-sm-6">
-              <img class="img-responsive membership-avatar col-sm-3"
-                src="{{ member.avatar }}" alt="Hub avatar for {{ member.name }}">
-              <a href="/{{member.name}}">{{ member.name }}</a>
-              {% if g.auth.username in member.owners %}
-              <p class="text-muted">Owner</p>
-              {% else %}
-              <p>Member</p>
-              {% endif %}
-            </div>
-            {% if (loop.index % 2) == 0 %}
-              </div>
-              <div class="row">
-            {% endif %}
-          {% endfor %}
-        </div>
-        <div class="modal-footer clearfix">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div>
-    </div>
-  </div>
-
-<style>
- .membership-avatar {
-   height: 4em;
-   width: 6em;
- }
- .modal-header {
-   border-bottom: 0;
- }
-
- #owners {
-   padding: 10px;
- }
-</style>
-{% endblock %}
diff --git a/hubs/widgets/templates/pagure_pr.html b/hubs/widgets/templates/pagure_pr.html
deleted file mode 100644
index 735ac7b..0000000
--- a/hubs/widgets/templates/pagure_pr.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<ul class="media-list">
-  {% for pr in all_pr[:10] %}
-    <li class="media">
-      <div class="media-left">
-        <a  href="https://pagure.io/{{ repo }}/pull-request/{{ pr['pr_id'] }}"
-            target="_blank">
-        <span class="label label-default">#{{ pr['pr_id'] }}</span>
-        </a>
-      </div>
-      <div class="media-body">
-        <h4 class="media-heading">
-          {{ pr['pr_project_name'] }} -
-          <span title="{{ pr['pr_title_full'] }}">
-            {{ pr['pr_title'] }} {% if
-              pr['pr_title_full'] | length > 45 %} ... {% endif %}
-          </span>
-        </h4>
-        Opened by:
-          <a href="https://pagure.io/user/{{ pr['pr_openedby'] }}"
-              target="_blank">
-            {{ pr['pr_openedby'] }}
-          </a>
-        --
-        {% if pr['pr_assignee'] %}
-          Assigned to:
-          <a href="https://pagure.io/user/{{ pr['pr_assignee'] }}"
-              target="_blank">
-            {{ pr['pr_assignee']['name'] }}
-          </a>
-        {% else %}
-          <span class="text-muted">Unassigned</span>
-        {% endif %}
-      </div>
-    </li>
-  {% endfor %}
-  {% if all_pr | length > 10 %}
-  <li>
-    And {{ all_pr | length - 10 }} more ...
-  </li>
-  {% endif %}
-</ul>
-
-<hr/>
-
-<a class="btn btn-success" target="_blank"
-    href="https://pagure.io/{{ repo }}/pull-requests">
-  All Pull-Requests
-</a>
-{% endblock %}
diff --git a/hubs/widgets/templates/pagureissues.html b/hubs/widgets/templates/pagureissues.html
deleted file mode 100644
index 55c6a74..0000000
--- a/hubs/widgets/templates/pagureissues.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<a class="btn btn-success" target="_blank"
-    href="https://pagure.io/{{ repo }}/issues">
-  All Issues
-</a>
-<hr/>
-
-<ul class="media-list">
-  {% for issue in all_issues[:10] %}
-    <li class="media">
-      <div class="media-left">
-        <a  href="https://pagure.io/{{ repo }}/issue/{{ issue['issue_id'] }}"
-            target="_blank">
-          {{ issue['issue_project_name'] }}
-        <span class="label label-default">#{{ issue['issue_id'] }}</span>
-        </a>
-      </div>
-      <div class="media-body">
-        <h4 class="media-heading">
-          <span title="{{ issue['issue_title_full'] }}">
-            {{ issue['issue_title'] }} {% if
-              issue['issue_title_full'] | length > 45 %} ... {% endif %}
-          </span>
-        </h4>
-        Opened by:
-          <a href="https://pagure.io/user/{{ issue['issue_openedby'] }}"
-              target="_blank">
-            {{ issue['issue_openedby'] }}
-          </a>
-        --
-        {% if issue['issue_assignee'] %}
-          Assigned to:
-          <a href="https://pagure.io/user/{{issue['issue_assignee'] }}"
-              target="_blank">
-            {{issue['issue_assignee'] }}
-          </a>
-        {% else %}
-          <span class="text-muted">Unassigned</span>
-        {% endif %}
-      </div>
-    </li>
-  {% endfor %}
-  {% if all_issues | length > 10 %}
-  <li>
-    And {{ all_issues | length - 10 }} more ...
-  </li>
-  {% endif %}
-</ul>
-{% endblock %}
diff --git a/hubs/widgets/templates/rules.html b/hubs/widgets/templates/rules.html
deleted file mode 100644
index d233741..0000000
--- a/hubs/widgets/templates/rules.html
+++ /dev/null
@@ -1,91 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="rules-container">
-  {% if link %}
-  <h6>community rules</h6>
-  <p><a href="{{link}}">Community Rules and Guidelines</a></h6>
-  {% endif %}
-  <h6>group owners ({{ owners|length }})</h6>
-  <div class="row">
-    {% if owners|length > 5%}
-      {% for owner in oldest_owners %}
-        <div class="col-sm-6">
-          <img class="img-circle" src="{{owner['avatar']}}"/>
-          <a href="{{ url_for('hub', name=owner['username']) }}">{{owner['username']}}</a>
-        </div>
-        {% endfor %}
-        <br/>
-        <a href="#" class="btn btn-default" data-toggle="modal" data-target="#ownersModal">View All</a>
-    {% else %}
-      {% for owner in owners %}
-        <div class="col-sm-6">
-          <img class="img-circle" src="{{owners[owner]}}"/>
-          <a href="{{ url_for('hub', name=owner)}}">{{owner}}</a>
-        </div>
-      {% endfor %}
-    {% endif %}
-  </div>
-  {% if schedule_text or schedule_link or minutes_link %}
-  <h6>meetings</h6>
-  {% if schedule_text %}
-  <p>{{schedule_text}}</p>
-  {% endif %}
-  <p>
-  {% if schedule_link %}
-  <a target="_blank" href="{{schedule_link}}">Meeting Schedule</a>
-  {% endif %}
-  {% if schedule_link and minutes_link %}
-  &#8214;
-  {% endif %}
-  {% if minutes_link %}
-  <a target="_blank" href="{{minutes_link}}">Past Meeting Minutes</a>
-  {% endif %}
-  </p>
-  {% endif %}
-</div>
-
-
-<!-- View all modal -->
-<div class="modal fade" id="ownersModal" tabindex="-1" role="dialog" aria-labelledby="ownersModal" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title" id="myModalLabel">All group owners</h4>
-      </div>
-      <div id="owners">
-        {% for owner in owners %}
-        <div class="col-sm-6">
-          <img class="img-circle img-circle-lg" src="{{owners[owner]}}"/>
-          <a href="{{ url_for('hub', name=owner)}}">{{owner}}</a>
-        </div>
-        {% endfor %}
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<style>
-  .rules-table {
-    width: 180px
-    padding: 0px;
-    margin: 0px;
-    display: inline-block;
-  }
-  .rules-table td {
-    font-size: 32pt;
-  }
-
- .img-circle-lg {
-   height: 4em;
-   width: 4em;
-   padding: 10px;
- }
- .modal-header {
-   border-bottom: 0;
- }
-</style>
-{% endblock %}
diff --git a/hubs/widgets/templates/stats.html b/hubs/widgets/templates/stats.html
deleted file mode 100644
index f2cba1f..0000000
--- a/hubs/widgets/templates/stats.html
+++ /dev/null
@@ -1,78 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-<div class="stats-container row">
-<div class="col-md-7">
-  <table class="stats-table">
-    <tr><th>Members</th><th>Subscribers</th></tr>
-    <tr class="text-info">
-      <td>{{members_text}}</td>
-      <td class="text-right">{{subscribers_text}}</td>
-    </tr>
-  </table>
-</div>
-<div class="col-md-5">
-  <ul class="list-unstyled">
-  {% if g.auth.nickname in subscribers %}
-  <li>
-    <form action="{{hub_unsubscribe_url}}" method="POST">
-      <button class="btn btn-info">
-        <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span>
-        Unsubscribe
-      </button>
-    </form>
-  </li>
-  {% else %}
-  <li>
-    <form action="{{hub_subscribe_url}}" method="POST">
-      <button class="btn btn-default">
-        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
-        Subscribe
-      </button>
-    </form>
-  </li>
-  {% endif %}
-
-  {% if g.auth.nickname in stargazers %}
-  <li>
-    <form action="{{hub_unstar_url}}" method="POST">
-      <button class="btn btn-info">
-        <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span>
-        Unstar Hub
-      </button>
-    </form>
-  </li>
-  {% else %}
-  <li>
-    <form action="{{hub_star_url}}" method="POST">
-      <button class="btn btn-default">
-        <span class="glyphicon glyphicon-star" aria-hidden="true"></span>
-        Star Hub
-      </button>
-    </form>
-  </li>
-  {% endif %}
-
-  {% if g.auth.nickname in members %}
-  <li>
-    <form action="{{hub_leave_url}}" method="POST">
-      <button class="btn btn-info">
-        <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span>
-        Leave Hub
-      </button>
-    </form>
-  </li>
-  {% else %}
-  <li>
-    <form action="{{hub_join_url}}" method="POST">
-      <button class="btn btn-default">
-        <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
-        Join Hub
-      </button>
-    </form>
-  </li>
-  {% endif %}
-  </ul>
-</div>
-</div>
-{% endblock %}
diff --git a/hubs/widgets/templates/sticky.html b/hubs/widgets/templates/sticky.html
deleted file mode 100644
index 6e318ec..0000000
--- a/hubs/widgets/templates/sticky.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "templates/panel.html" %}
-
-{% block content %}
-{{text}}
-{% endblock %}
diff --git a/hubs/widgets/templates/subscriptions.html b/hubs/widgets/templates/subscriptions.html
deleted file mode 100644
index 99fa9a2..0000000
--- a/hubs/widgets/templates/subscriptions.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% if associations %}
-{% extends "templates/panel.html" %}
-
-{% block content %}
-    {% if memberships %}
-        <p><strong>Belongs to: </strong> {{memberships_text}}</p>
-    {% endif %}
-    <hr/>
-    {% if subscriptions %}
-        <p><strong>Subscribes to:</strong>
-        {% for subscription in subscriptions %}
-        <a href="{{ url_for('hub', name=subscription)}}">
-        {{subscription}}</a>
-        {% endfor %}</p>
-    {% endif %}
-{% endblock %}
-{% endif %}
diff --git a/hubs/widgets/templates/workflow/pendingacls.html b/hubs/widgets/templates/workflow/pendingacls.html
deleted file mode 100644
index 2775fb2..0000000
--- a/hubs/widgets/templates/workflow/pendingacls.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% if pending_acls %}
-
-{% extends "templates/panel.html" %}
-
-{% block content %}
-{% if session['nickname'] == username %}
-<a class="btn btn-success" target="_blank" href="https://admin.fedoraproject.org/pkgdb/acl/pending/">Manage requests</a>
-<hr/>
-{% endif %}
-<ul class="media-list">
-{% for acl in pending_acls %}
-    <li class="media">
-        <div class="media-left">
-            <img class="media-object img-circle" src="{{acl['avatar']}}"/>
-        </div>
-        <div class="media-body">
-            <h4 class="media-heading">{{acl['user']}} is {{acl['status']}}</h4>
-            for {{acl['acl']}} on
-            {{acl['package']}}({{acl['collection']}})
-        </div>
-    </li>
-{% endfor %}
-</ul>
-{% endblock %}
-
-{% endif %}
diff --git a/hubs/widgets/templates/workflow/updates2stable.html b/hubs/widgets/templates/workflow/updates2stable.html
deleted file mode 100644
index 3982895..0000000
--- a/hubs/widgets/templates/workflow/updates2stable.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% if updates %}
-{% extends "templates/panel.html" %}
-
-{% block content %}
-{% if session['nickname'] == username %}
-<a class="btn btn-success" target="_blank" href="https://admin.fedoraproject.org/updates/mine">Manage updates</a>
-<hr/>
-{% endif %}
-<ul class="media-list">
-{% for update in updates %}
-    <li class="media">
-        <div class="media-left">
-            <a href="{{update['link']}}" target="_blank">
-                <img class="media-object square-32" src="{{update['icon']}}"/>
-            </a>
-        </div>
-        <div class="media-body">
-            <h4 class="media-heading">{{update['title']}} (karma {{update['karma']}})</h4>
-            can be pushed to stable
-        </div>
-    </li>
-{% endfor %}
-</ul>
-{% endblock %}
-{% endif %}
diff --git a/hubs/widgets/templating.py b/hubs/widgets/templating.py
deleted file mode 100644
index ac5b3e4..0000000
--- a/hubs/widgets/templating.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from __future__ import unicode_literals
-
-import os
-
-import flask
-import jinja2
-
-here = os.path.dirname(os.path.abspath(__file__))
-
-environment = jinja2.Environment(
-    loader=jinja2.FileSystemLoader(here),
-    trim_blocks=True,
-)
-environment.filters['tojson'] = flask.json.tojson_filter
-environment.globals.update({
-    'session': flask.app.session,
-    'g': flask.g,
-    'url_for': flask.url_for,
-    })
diff --git a/hubs/widgets/view.py b/hubs/widgets/view.py
index 572b670..05a633a 100644
--- a/hubs/widgets/view.py
+++ b/hubs/widgets/view.py
@@ -31,7 +31,8 @@ class WidgetView(View):
         url_rules (list): A list of URL rules that this view must be registered
             for (like the `rule` parameter of Flask's `add_url_rule()`).
         template_name (str): The template name to use for this view. It will be
-            looked for in the widget's template environment.
+            looked for in the widget's `templates` subdirectory first, and
+            then in the global `hubs/widgets/templates/` directory.
 
     This class is Flask-specific. If another framework were to be switched to,
     it would have to be re-implemented.
diff --git a/hubs/widgets/workflow/pendingacls.py b/hubs/widgets/workflow/pendingacls.py
index cc4cb3a..5d891e0 100644
--- a/hubs/widgets/workflow/pendingacls.py
+++ b/hubs/widgets/workflow/pendingacls.py
@@ -27,7 +27,7 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     # TODO -- add approve/deny buttons or just link through to pkgdb
-    template_name = "templates/workflow/pendingacls.html"
+    template_name = "pendingacls.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_pending = GetPending(instance)
diff --git a/hubs/widgets/workflow/templates/pendingacls.html b/hubs/widgets/workflow/templates/pendingacls.html
new file mode 100644
index 0000000..446e723
--- /dev/null
+++ b/hubs/widgets/workflow/templates/pendingacls.html
@@ -0,0 +1,26 @@
+{% if pending_acls %}
+
+{% extends "panel.html" %}
+
+{% block content %}
+{% if session['nickname'] == username %}
+<a class="btn btn-success" target="_blank" href="https://admin.fedoraproject.org/pkgdb/acl/pending/">Manage requests</a>
+<hr/>
+{% endif %}
+<ul class="media-list">
+{% for acl in pending_acls %}
+    <li class="media">
+        <div class="media-left">
+            <img class="media-object img-circle" src="{{acl['avatar']}}"/>
+        </div>
+        <div class="media-body">
+            <h4 class="media-heading">{{acl['user']}} is {{acl['status']}}</h4>
+            for {{acl['acl']}} on
+            {{acl['package']}}({{acl['collection']}})
+        </div>
+    </li>
+{% endfor %}
+</ul>
+{% endblock %}
+
+{% endif %}
diff --git a/hubs/widgets/workflow/templates/updates2stable.html b/hubs/widgets/workflow/templates/updates2stable.html
new file mode 100644
index 0000000..7e72e01
--- /dev/null
+++ b/hubs/widgets/workflow/templates/updates2stable.html
@@ -0,0 +1,25 @@
+{% if updates %}
+{% extends "panel.html" %}
+
+{% block content %}
+{% if session['nickname'] == username %}
+<a class="btn btn-success" target="_blank" href="https://admin.fedoraproject.org/updates/mine">Manage updates</a>
+<hr/>
+{% endif %}
+<ul class="media-list">
+{% for update in updates %}
+    <li class="media">
+        <div class="media-left">
+            <a href="{{update['link']}}" target="_blank">
+                <img class="media-object square-32" src="{{update['icon']}}"/>
+            </a>
+        </div>
+        <div class="media-body">
+            <h4 class="media-heading">{{update['title']}} (karma {{update['karma']}})</h4>
+            can be pushed to stable
+        </div>
+    </li>
+{% endfor %}
+</ul>
+{% endblock %}
+{% endif %}
diff --git a/hubs/widgets/workflow/updates2stable.py b/hubs/widgets/workflow/updates2stable.py
index 00df8fc..d2490a3 100644
--- a/hubs/widgets/workflow/updates2stable.py
+++ b/hubs/widgets/workflow/updates2stable.py
@@ -31,7 +31,7 @@ class BaseView(WidgetView):
     name = "root"
     url_rules = ["/"]
     # TODO -- add approve/deny buttons or just link through to pkgdb
-    template_name = "templates/workflow/updates2stable.html"
+    template_name = "updates2stable.html"
 
     def get_context(self, instance, *args, **kwargs):
         get_pending = GetPending(instance)

From d601bc58325aebbd7c798f081392e8d3b74e4452 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 35/45] Fix compatibility with Python 2


---

diff --git a/hubs/tests/test_widget_base.py b/hubs/tests/test_widget_base.py
index fd6b3b3..bc8a166 100644
--- a/hubs/tests/test_widget_base.py
+++ b/hubs/tests/test_widget_base.py
@@ -43,7 +43,7 @@ class WidgetTest(APPTest):
         test_widget = LocalTestWidget()
         self.assertRaisesRegexp(
             AttributeError, '.* "name" .*', test_widget.validate)
-        test_widget.name = "învalid næme"
+        test_widget.name = "invalid name \xe2\x98\xba"
         self.assertRaisesRegexp(
             AttributeError, '^Invalid widget name: ', test_widget.validate)
         test_widget.name = "localtest"
diff --git a/hubs/tests/test_widget_caching.py b/hubs/tests/test_widget_caching.py
index 967db0e..c04ba76 100644
--- a/hubs/tests/test_widget_caching.py
+++ b/hubs/tests/test_widget_caching.py
@@ -37,9 +37,10 @@ class CachedFunctionTest(APPTest):
         super(CachedFunctionTest, self).tearDown()
 
     def test_get_cache_key(self):
+        value = "%d|DummyFunction" % self.w_instance.idx
         self.assertEqual(
             self.fn.get_cache_key(),
-            b"%d|DummyFunction" % self.w_instance.idx
+            value.encode("ascii"),
             )
 
     def test_result_cached(self):
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
index 9123a4d..824e34d 100644
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -5,6 +5,7 @@ import logging
 import re
 import flask
 import jinja2
+import six
 
 from importlib import import_module
 from .caching import CachedFunction
@@ -129,6 +130,10 @@ class Widget(object):
         """
         for view_name, view_class in self.get_views().items():
             endpoint = "%s_%s" % (self.name, view_name)
+            if six.PY2:
+                # Flask will set the __name__ property, which must be a
+                # bytestring on PY2
+                endpoint = endpoint.encode("ascii", "replace")
             view_func = view_class.as_view(endpoint, self)
             for url_rule in view_class.url_rules:
                 rule = "/<hub>/w/%s/<int:idx>/%s" % (
diff --git a/hubs/widgets/registry.py b/hubs/widgets/registry.py
index 006eced..db463b3 100644
--- a/hubs/widgets/registry.py
+++ b/hubs/widgets/registry.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import six
+
 from importlib import import_module
 from six.moves import UserDict
 from hubs.widgets.base import Widget
@@ -66,3 +68,8 @@ class WidgetRegistry(UserDict):
         """
         for widget in self.values():
             widget.register_routes(app)
+
+    # IterableUserDict is in Python2 but not exported by six.
+    if six.PY2:
+        def __iter__(self):
+            return iter(self.data)

From 81acbdc0cc4279f56cd07bcba04896b4b026988d Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:10 +0000
Subject: [PATCH 36/45] Adapt dev-guide documentation


---

diff --git a/docs/dev-guide.rst b/docs/dev-guide.rst
index 2617a29..5c185b4 100644
--- a/docs/dev-guide.rst
+++ b/docs/dev-guide.rst
@@ -344,67 +344,73 @@ displayed).
 Stubbing out a new Widget
 =========================
 
-You write a new widget in the ``hubs/widgets/`` directory and must declare it
-in the registry dict in ``hubs/widgets/__init__.py``.
+First, some definitions:
 
-In order to be valid, a widget must have:
+- A *widget* is a Python class inheriting from ``hubs.widgets.base.Widget``.
+  It will be registered with the application in the ``hubs.widgets.registry``
+  dictionary.
+- A *widget instance* is a database record (``hubs.models.Widget``), it means
+  that a particular *widget* has been set up for a particular *hub*, with a
+  specific configuration.  A *widget* can be set up more that one time for the
+  same *hub*, with different configurations (for example, the ``sticky``
+  widget).  In this case, there will one *widget* but multiple *widget
+  instances*.
 
-- A ``data(session, widgets, **kwargs)`` function that returns a
-  jsonifiable dict of data.  This will get cached -- more on that later.
-- A ``template`` object that is a jinja2 template for that widget.
-- Optionally, a ``chrome`` decorator.
-- A ``should_invalidate(message, session, widget)`` function that will be used to
-  *potentially* invalidate the widget's cache. That function will get called by
-  a backend daemon listening for fedmsg messages so when you update your group
-  memberships in FAS, a fedmsg message hits the fedora-hubs backend and returns
-  True if the lookup value should be nuked/refreshed in memcached (or some
-  other store).
+As explained above, widgets are Python classes.  They are best isolated in
+their own module and directory.  To create a new widget, you can follow these
+steps:
 
-If you want to try making a new widget:
+- create a new directory in ``hubs/widgets/``
+- write your widget subclass in the ``__init__.py`` file
+- reference the class in your configuration file, or in the general
+  ``hubs/default_config.py`` configuration file.
 
-- Copy an existing one in ``hubs/widgets/``
-- Add it to the registry in ``hubs/widgets/__init__.py``
-- If you want it to show up on a **user** page, add it to ``hubs/defaults.py``
-  in the ``add_user_widgets`` function.
-- If you want it to show up on **group** pages, add it to ``populate.py``.
+In order to be valid, a widget must:
 
-Destroy your database, rebuild it, and re-run the app.  Your widget should show up.
+- inherit from the ``hubs.widgets.base.Widget`` class,
+- have a valid ``name`` attribute,
+- have a valid ``position`` attribute,
+- contain at least one view named "``root``", registered for the "``/``" URL.
+  See the description of widget views below for details.
+
+A widget view is a class which inherits from the
+``hubs.widgets.view.WidgetView`` class.  A widget can have one or more of them.
+
+Widget views can make use of templates following the Jinja2 engine syntax.  The
+templates are looked for in the widget's ``templates`` subdirectrory first, and
+then in the generic ``hubs/widgets/templates/`` directory.  They can make use
+of any Jinja2 feature, including inheritance, macros, etc.
+
+If you want to add filters to youre widget's Jinja2 environment, you can do so
+by overriding the widget's ``get_template_environment()`` method.
+
+Hubs provides the ``panel.html`` master template for widgets that want their
+output to be wrapped in the common panel chrome, just use the ``extends`` tag
+to take advantage of it.  You can also set a ``title`` variable in your root
+view context, and it will be used for the panel title.
+
+Refer to the API documentation to learn more on how to write a widget view.
+
+A widget can also have any number of cached functions.  A cached function is a
+subclass of ``hubs.widgets.caching.CachedFunction``.
+
+The result is cached until a bus message is recieved that marks the former
+result as invalid.  To filter which messages are relevant, a cached function
+has a ``should_invalidate(message)`` method that returns ``True`` if the cached
+result is obsolete, ``False`` otherwise.  A backend daemon will call this
+method on each incoming bus message.
+
+Refer to the API documentation to learn more on how to write a cached function.
+
+If you want it to show up on a new **user** page, add it to
+``hubs/defaults.py`` in the ``add_user_widgets`` function.  If you want it to
+show up on new **group** pages, add it to the ``add_group_widgets`` function in
+the same module.  If you want your widget to be part of the example hubs
+created by default, add it to ``populate.py``.  Then destroy your database,
+rebuild it, and re-run the app.  Your widget should show up.
+
+Feel free to look at existing widgets for inspiration.
 
-Widget-specific views
----------------------
-A widget may also register additional routes by using the
-``hubs.widgets.base.widget_route`` decorator. There are some differences from
-the usual ``route`` decorator or the ``add_url_rule`` function:
-
-- The view function will be passed the database ``session`` and ``widget``
-  instances as first arguments, and then the URL kwargs.
-- The endpoint will be prefixed with ``<widget_name>_``, for example
-  ``meetings_``. Remember that when you want to reverse the URL with
-  ``url_for``.
-- When reversing the URL, you need to pass the ``hub`` and ``idx`` kwargs.
-
-Example: consider this additional method that needs to be exported as a view
-in the ``meetings`` plugin::
-
-    from hubs.widgets.base import widget_route
-    @widget_route(rule="search/<requester>/", methods=["GET", "POST"])
-    def search(session, widget, requester):
-        # Do something, probably using the "requester" variable.
-        return flask.jsonify({"hope_sources": ["Obi-Wan Kenobi"]})
-
-Then, a valid call to ``url_for`` to reverse this URL would look like::
-
-    url_for("meetings_search", hub=widget.hub.name, idx=widget.idx, requester="Leia")
-
-Behind the scenes, the ``widget_route`` decorator adds a ``ROUTES`` global
-variable in the widget module, that contains dictionaries representing the
-arguments passed to Flask's `add_url_rule
-<http://flask.pocoo.org/docs/latest/api/#flask.Flask.add_url_rule>`_ function.
-
-If you want more control, you can edit this ``ROUTES`` list directly, but there
-are a difference from the basic ``add_url_rule`` function: the view function
-name must be given with the dict key ``view_func_name``, and not ``view_func``
-as in the ``add_url_rule`` function.
 
 
 A proposal, client-side templates

From 520184236cc4983627615022bf0d45630f261b08 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:11 +0000
Subject: [PATCH 37/45] Build the API documentation with Sphinx


---

diff --git a/docs/api.rst b/docs/api.rst
new file mode 100644
index 0000000..8cecb30
--- /dev/null
+++ b/docs/api.rst
@@ -0,0 +1,42 @@
+Developer Interfaces
+====================
+
+This documents ways developers can interface with Fedora Hubs.
+
+.. _widgets-api:
+
+
+Widgets
+-------
+
+.. automodule:: hubs.widgets
+   :members:
+   :show-inheritance:
+
+Widgets registry
+^^^^^^^^^^^^^^^^
+
+.. automodule:: hubs.widgets.registry
+   :members:
+   :show-inheritance:
+
+Widget class
+^^^^^^^^^^^^
+
+.. automodule:: hubs.widgets.base
+   :members:
+   :show-inheritance:
+
+Widget view
+^^^^^^^^^^^
+
+.. automodule:: hubs.widgets.view
+   :members:
+   :show-inheritance:
+
+Caching
+^^^^^^^
+
+.. automodule:: hubs.widgets.caching
+   :members:
+   :show-inheritance:
diff --git a/docs/conf.py b/docs/conf.py
index ca55b4f..27b4be2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,20 +16,25 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
+import os
+import sys
+sys.path.insert(0, os.path.abspath('..'))
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #
-# needs_sphinx = '1.0'
+needs_sphinx = '1.3'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    'sphinx.ext.napoleon',
+    'sphinx.ext.viewcode',
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/docs/dev-guide.rst b/docs/dev-guide.rst
index 5c185b4..874a7b1 100644
--- a/docs/dev-guide.rst
+++ b/docs/dev-guide.rst
@@ -344,72 +344,9 @@ displayed).
 Stubbing out a new Widget
 =========================
 
-First, some definitions:
-
-- A *widget* is a Python class inheriting from ``hubs.widgets.base.Widget``.
-  It will be registered with the application in the ``hubs.widgets.registry``
-  dictionary.
-- A *widget instance* is a database record (``hubs.models.Widget``), it means
-  that a particular *widget* has been set up for a particular *hub*, with a
-  specific configuration.  A *widget* can be set up more that one time for the
-  same *hub*, with different configurations (for example, the ``sticky``
-  widget).  In this case, there will one *widget* but multiple *widget
-  instances*.
-
-As explained above, widgets are Python classes.  They are best isolated in
-their own module and directory.  To create a new widget, you can follow these
-steps:
-
-- create a new directory in ``hubs/widgets/``
-- write your widget subclass in the ``__init__.py`` file
-- reference the class in your configuration file, or in the general
-  ``hubs/default_config.py`` configuration file.
-
-In order to be valid, a widget must:
-
-- inherit from the ``hubs.widgets.base.Widget`` class,
-- have a valid ``name`` attribute,
-- have a valid ``position`` attribute,
-- contain at least one view named "``root``", registered for the "``/``" URL.
-  See the description of widget views below for details.
-
-A widget view is a class which inherits from the
-``hubs.widgets.view.WidgetView`` class.  A widget can have one or more of them.
-
-Widget views can make use of templates following the Jinja2 engine syntax.  The
-templates are looked for in the widget's ``templates`` subdirectrory first, and
-then in the generic ``hubs/widgets/templates/`` directory.  They can make use
-of any Jinja2 feature, including inheritance, macros, etc.
-
-If you want to add filters to youre widget's Jinja2 environment, you can do so
-by overriding the widget's ``get_template_environment()`` method.
-
-Hubs provides the ``panel.html`` master template for widgets that want their
-output to be wrapped in the common panel chrome, just use the ``extends`` tag
-to take advantage of it.  You can also set a ``title`` variable in your root
-view context, and it will be used for the panel title.
-
-Refer to the API documentation to learn more on how to write a widget view.
-
-A widget can also have any number of cached functions.  A cached function is a
-subclass of ``hubs.widgets.caching.CachedFunction``.
-
-The result is cached until a bus message is recieved that marks the former
-result as invalid.  To filter which messages are relevant, a cached function
-has a ``should_invalidate(message)`` method that returns ``True`` if the cached
-result is obsolete, ``False`` otherwise.  A backend daemon will call this
-method on each incoming bus message.
-
-Refer to the API documentation to learn more on how to write a cached function.
-
-If you want it to show up on a new **user** page, add it to
-``hubs/defaults.py`` in the ``add_user_widgets`` function.  If you want it to
-show up on new **group** pages, add it to the ``add_group_widgets`` function in
-the same module.  If you want your widget to be part of the example hubs
-created by default, add it to ``populate.py``.  Then destroy your database,
-rebuild it, and re-run the app.  Your widget should show up.
-
-Feel free to look at existing widgets for inspiration.
+Widgets can be added and removed from a Hub to provide a customized experience
+for each user. To learn how to implement a new widget, consult the
+:ref:`widgets-api` documentation.
 
 
 
diff --git a/docs/index.rst b/docs/index.rst
index 1f5379f..72ec92e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,6 +13,7 @@ Contents:
 
    overview
    dev-guide
+   api
 
 
 Indices and tables
diff --git a/hubs/widgets/__init__.py b/hubs/widgets/__init__.py
index 6d5f257..a4cafba 100644
--- a/hubs/widgets/__init__.py
+++ b/hubs/widgets/__init__.py
@@ -1,4 +1,79 @@
 """
+First, some definitions:
+
+- A *widget* is a Python class inheriting from
+  :py:class:`hubs.widgets.base.Widget`.
+  It will be registered with the application in the
+  :py:data:`hubs.widgets.registry` dictionary.
+- A *widget instance* is a database record (:py:class:`hubs.models.Widget`), it
+  means that a particular *widget* has been set up for a particular *hub*, with
+  a specific configuration.  A *widget* can be set up more that one time for
+  the same *hub*, with different configurations (for example, the ``sticky``
+  widget).  In this case, there will one *widget* but multiple *widget
+  instances*.
+
+As explained above, widgets are Python classes.  They are best isolated in
+their own module and directory.  To create a new widget, you can follow these
+steps:
+
+- create a new directory in ``hubs/widgets/``
+- write your widget subclass in the ``__init__.py`` file
+- reference the class in your configuration file, or in the general
+  ``hubs/default_config.py`` configuration file.
+
+In order to be valid, a widget must:
+
+- inherit from the :py:class:`hubs.widgets.base.Widget` class,
+- have a valid :py:attr:`~hubs.widgets.base.Widget.name` attribute,
+- have a valid :py:attr:`~hubs.widgets.base.Widget.position` attribute,
+- contain at least one view named "``root``", registered for the "``/``" URL.
+  See the description of widget views below for details.
+
+A widget view is a class which inherits from the
+:py:class:`hubs.widgets.view.WidgetView` class.  A widget can have one or more
+of them.
+
+Widget views can make use of templates following the Jinja2 engine syntax.  The
+templates are looked for in the widget's ``templates`` subdirectrory first, and
+then in the generic ``hubs/widgets/templates/`` directory.  They can make use
+of any Jinja2 feature, including inheritance, macros, etc.
+
+If you want to add filters to youre widget's Jinja2 environment, you can do so
+by overriding the widget's
+:py:meth:`~hubs.widgets.base.Widget.get_template_environment` method.
+
+Hubs provides the ``panel.html`` master template for widgets that want their
+output to be wrapped in the common panel chrome, just use the ``extends`` tag
+to take advantage of it.  You can also set a ``title`` variable in your root
+view context, and it will be used for the panel title.
+
+Refer to the API documentation to learn more on how to write a widget view.
+
+A widget can also have any number of cached functions.  A cached function is a
+subclass of :py:class:`hubs.widgets.caching.CachedFunction`.
+
+The result is cached until a bus message is recieved that marks the former
+result as invalid.  To filter which messages are relevant, a cached function
+has a
+:py:meth:`~hubs.widgets.caching.CachedFunction.should_invalidate(message)`
+method that returns ``True`` if the cached result is obsolete, ``False``
+otherwise.  A backend daemon will call this method on each incoming bus
+message.
+
+Refer to the API documentation to learn more on how to write a cached function.
+
+If you want it to show up on a new **user** page, add it to
+:py:mod:`hubs.defaults` in the :py:func:`add_user_widgets` function.  If you
+want it to show up on new **group** pages, add it to the
+:py:func:`add_group_widgets` function in the same module.  If you want your
+widget to be part of the example hubs created by default, add it to
+``populate.py``.  Then destroy your database, rebuild it, and re-run the app.
+Your widget should show up.
+
+Feel free to look at existing widgets for inspiration.
+
+The widget registry is instanciated in this module, as :py:data:`registry`.
+
 Attributes:
     registry (dict): This dictionary is a registry of available widgets in
         Fedora Hubs.
diff --git a/tox.ini b/tox.ini
index 24d3f29..03e75ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,9 @@ commands =
 
 [testenv:docs]
 changedir = docs
-deps = sphinx
+deps =
+    -rrequirements.txt
+    sphinx
 whitelist_externals =
     mkdir
 commands=

From 546067eee44faf602796d3e34410ba8561a26a8d Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:11 +0000
Subject: [PATCH 38/45] Improve API doc crossreferences


---

diff --git a/hubs/widgets/__init__.py b/hubs/widgets/__init__.py
index a4cafba..1ec88bc 100644
--- a/hubs/widgets/__init__.py
+++ b/hubs/widgets/__init__.py
@@ -26,8 +26,8 @@ In order to be valid, a widget must:
 - inherit from the :py:class:`hubs.widgets.base.Widget` class,
 - have a valid :py:attr:`~hubs.widgets.base.Widget.name` attribute,
 - have a valid :py:attr:`~hubs.widgets.base.Widget.position` attribute,
-- contain at least one view named "``root``", registered for the "``/``" URL.
-  See the description of widget views below for details.
+- contain at least one widget view named "``root``", registered for the "``/``"
+  URL.
 
 A widget view is a class which inherits from the
 :py:class:`hubs.widgets.view.WidgetView` class.  A widget can have one or more
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
index 824e34d..70dbc9c 100644
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -27,9 +27,10 @@ class Widget(object):
             will appear in some URLs, so be careful to only use simple,
             URL-compatible characters.
         position (str): The position of the widget in the rendered page. It
-            should be one of the following values: 'left', 'right', or 'both'.
+            should be one of the following values: ``left``, ``right``, or
+            ``both``.
         arguments (list): A list of dictionaries that describe a widget's
-            configuration. See `hubs.widgets.base.Argument`.
+            configuration. See :py:class:`hubs.widgets.base.Argument`.
     """
 
     name = None
@@ -40,7 +41,11 @@ class Widget(object):
         self._template_environment = None
 
     def validate(self):
-        """Ensure that the widget has the bits it needs."""
+        """
+        Ensure that the widget has the bits it needs.
+
+        Raises: AttributeError
+        """
         if self.name is None:
             raise AttributeError('Widgets must have a "name" attribute')
         if not re.match('^[\w_.-]+$', self.name):
@@ -89,7 +94,7 @@ class Widget(object):
 
     def _get_local_subclasses(self, parent_class):
         """
-        Returns the subclasses of the `parent_class` defined in this widget's
+        Returns the subclasses of the ``parent_class`` defined in this widget's
         Python module.
         """
         result = []
@@ -111,7 +116,7 @@ class Widget(object):
         """
         Returns:
             dict: A dictionary of the widget-specific views, indexed by their
-                `name` attribute.
+                :py:attr:`~hubs.widgets.view.WidgetView.name` attribute.
         """
         return dict([
             (view.name, view) for view in
diff --git a/hubs/widgets/caching.py b/hubs/widgets/caching.py
index 2eded91..c8a56e8 100644
--- a/hubs/widgets/caching.py
+++ b/hubs/widgets/caching.py
@@ -1,7 +1,7 @@
 """
 Attributes:
     cache (dogpile.cache.region.CacheRegion): The cache where function results
-        will be stored. It is configured with the `fedora-hubs.cache` key in
+        will be stored. It is configured with the ``fedora-hubs.cache`` key in
         fedmsg configuration.
 """
 from __future__ import unicode_literals
@@ -40,17 +40,18 @@ class CachedFunction(object):
 
     To use this class, you must subclass it and implement a couple methods.
     It is instantiated by passing a widget instance (database record) as only
-    argument, which lets it access the `.config` property and act accordingly.
+    argument, which lets it access the :py:attr:`~hubs.models.Widget.config`
+    property and act accordingly.
 
-    You must implement the `execute()` method, which must return a
+    You must implement the :py:meth:`.execute` method, which must return a
     JSON-serializable value.
 
-    You must also implement the `should_invalidate()` method, which takes the
-    bus message as only argument, and returns `True` if the cache should be
-    rebuild, `False` otherwise.
+    You must also implement the :py:meth:`.should_invalidate` method, which
+    takes the bus message as only argument, and returns ``True`` if the cache
+    should be rebuild, ``False`` otherwise.
 
     To call the function, instanciate the class and execute it. You may also
-    call the `.get_data()` method.
+    call the :py:meth:`.get_data` method.
 
     Args:
         instance (hubs.models.Widget): The widget instance.
@@ -111,7 +112,7 @@ class CachedFunction(object):
             message (dict): The recieved bus message.
 
         Returns:
-            bool: If `True`, the cache will be rebuilt.
+            bool: If ``True``, the cache will be rebuilt.
         """
         # if not self._pass_filter(message):
         #     return False
@@ -119,7 +120,8 @@ class CachedFunction(object):
 
     def is_cached(self):
         """
-        Return a boolean indicating if the function's result is currently in the cache.
+        Return a boolean indicating if the function's result is currently in
+        the cache.
 
         Returns:
             bool: Whether the cache currently contains the function result.
diff --git a/hubs/widgets/registry.py b/hubs/widgets/registry.py
index db463b3..109e69a 100644
--- a/hubs/widgets/registry.py
+++ b/hubs/widgets/registry.py
@@ -33,7 +33,7 @@ class WidgetRegistry(UserDict):
 
         Args:
             widget_path (str): Python path to the subclass of
-                `hubs.widgets.base.Widget`.
+                :py:class:`hubs.widgets.base.Widget`.
         """
         mod_path, _, cls_name = widget_path.rpartition('.')
         mod = import_module(mod_path)
diff --git a/hubs/widgets/view.py b/hubs/widgets/view.py
index 05a633a..19ff77c 100644
--- a/hubs/widgets/view.py
+++ b/hubs/widgets/view.py
@@ -9,30 +9,32 @@ class WidgetView(View):
 
     You must subclass this class to use it in your view:
 
-    - the `name` attribute must be defined
-    - the `template_name` attribute must be defined, or the `get_template()`
-      method must be implemented
-    - the `get_context()` method must be implemented
+    - the :py:attr:`.name` attribute must be defined
+    - the :py:attr:`.template_name` attribute must be defined, or the
+      :py:meth:`.get_template` method must be implemented
+    - the :py:meth:`.get_context` method must be implemented
 
-    Every widget must have a view with the name "`root`" registered to `['/']`,
-    which will be the main entry point for the widget.
+    Every widget must have a view with the name "``root``" registered to
+    ``['/']``, which will be the main entry point for the widget.
 
     The resulting endpoint will be composed using the widget name and the view
-    name as `<widget_name>_<view_name>`, for example `meetings_root`.
-    Remember that when you want to reverse the URL with `url_for`.
+    name as ``<widget_name>_<view_name>``, for example ``meetings_root``.
+    Remember that when you want to reverse the URL with :py:meth:`url_for`.
 
     When reversing the URL, you need to pass the ``hub`` and ``idx`` kwargs,
-    which are respectively the hub name (`Hub.name`) and the widget instance
-    (the database record) primary key (`Widget.idx`).
+    which are respectively the hub name (:py:attr:`hubs.models.Hub.name`) and
+    the widget instance (the database record) primary key
+    (:py:attr:`hubs.models.Widget.idx`).
 
     Attributes:
         name (str): The view name. It will be used to compose the URL endpoint,
-            following the "`<widget.name>_<view.name>`" convention.
+            following the "``<widget.name>_<view.name>``" convention.
         url_rules (list): A list of URL rules that this view must be registered
-            for (like the `rule` parameter of Flask's `add_url_rule()`).
+            for (like the ``rule`` parameter of Flask's
+            :py:meth:`add_url_rule`).
         template_name (str): The template name to use for this view. It will be
-            looked for in the widget's `templates` subdirectory first, and
-            then in the global `hubs/widgets/templates/` directory.
+            looked for in the widget's ``templates`` subdirectory first, and
+            then in the global ``hubs/widgets/templates/`` directory.
 
     This class is Flask-specific. If another framework were to be switched to,
     it would have to be re-implemented.
@@ -62,8 +64,8 @@ class WidgetView(View):
 
     def get_template(self):
         """
-        Return the template object, looking for `template_name` in the widget's
-        template environment.
+        Return the template object, looking for :py:attr:`template_name` in the
+        widget's template environment.
         """
         if self.template_name is None:
             return NotImplementedError
@@ -89,8 +91,8 @@ class WidgetView(View):
 
     def dispatch_request(self, *args, **kwargs):
         """
-        The `dispatch_request` method that subclasses of `flask.views.View`
-        must implement. It binds the other methods together.
+        The method that subclasses of :py:class:`flask.views.View` must
+        implement. It binds the other methods together.
         """
         instance = self._get_instance(*args, **kwargs)
         context = self.get_context(instance, *args, **kwargs)

From 6489dd348f7f292bb99f7f71dae39b14f2858c41 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:11 +0000
Subject: [PATCH 39/45] Make a real class for WidgetParameter


---

diff --git a/hubs/models.py b/hubs/models.py
index d322437..2c155b9 100644
--- a/hubs/models.py
+++ b/hubs/models.py
@@ -296,7 +296,7 @@ def _config_default(context):
     widget_name = context.current_parameters['plugin']
     widget = hubs.widgets.registry[widget_name]
     return json.dumps(dict([
-        (arg.name, arg.default) for arg in widget.get_arguments()
+        (param.name, param.default) for param in widget.get_parameters()
         ]))
 
 
diff --git a/hubs/templates/add_widget.html b/hubs/templates/add_widget.html
index 76fc4ac..80d4a8d 100644
--- a/hubs/templates/add_widget.html
+++ b/hubs/templates/add_widget.html
@@ -21,16 +21,16 @@
         {% elif widget %}
         <input name="widget_name" type="hidden" value="{{ widget.name }}">
         <input name="position" type="hidden" value="{{ side }}">
-          {% for arg in widget.get_arguments() %}
+          {% for param in widget.get_parameters() %}
             <fieldset class="form-group ">
-              <strong>{{ arg.label | capitalize }}</strong>
-              <input id="{{ arg.name }}" class="form-control" type="text"
-                value="{{ arg.default if arg.default else '' }}"
-                name="{{ arg.name }}" />
+              <strong>{{ param.label | capitalize }}</strong>
+              <input id="{{ param.name }}" class="form-control" type="text"
+                value="{{ param.default if param.default else '' }}"
+                name="{{ param.name }}" />
             </fieldset>
-            {% if arg.help %}
+            {% if param.help %}
               <div>
-                <small class="text-muted">{{ arg.help }}</small>
+                <small class="text-muted">{{ param.help }}</small>
               </div>
             {% endif %}
           {% else %}
diff --git a/hubs/templates/edit.html b/hubs/templates/edit.html
index 44a7391..5b6241c 100644
--- a/hubs/templates/edit.html
+++ b/hubs/templates/edit.html
@@ -8,16 +8,16 @@
         <h4 class="modal-title">Configure {{ name }}</h4>
       </div>
       <div class="modal-body">
-      {% for arg in widget.module.get_arguments() %}
+      {% for param in widget.module.get_parameters() %}
         <fieldset class="form-group ">
-          <strong>{{ arg.label | capitalize }}</strong>
-          <input id="{{ arg.name }}" class="form-control" type="text"
-              value="{{ widget.config.get(arg.name, arg.default if arg.default else '') }}"
-              name="{{ arg.name }}" />
+          <strong>{{ param.label | capitalize }}</strong>
+          <input id="{{ param.name }}" class="form-control" type="text"
+              value="{{ widget.config.get(param.name, param.default if param.default else '') }}"
+              name="{{ param.name }}" />
         </fieldset>
-        {% if arg.help %}
+        {% if param.help %}
           <div>
-            <small class="text-muted">{{ arg.help }}</small>
+            <small class="text-muted">{{ param.help }}</small>
           </div>
         {% endif %}
       {% else %}
@@ -28,7 +28,7 @@
         <button type="button" class="btn btn-default" data-dismiss="modal">
           Close
         </button>
-        {% if widget.module.get_arguments() %}
+        {% if widget.module.get_parameters() %}
         <button type="submit" class="btn btn-default">
           Save
         </button>
diff --git a/hubs/views/hub.py b/hubs/views/hub.py
index 27e9235..6641711 100644
--- a/hubs/views/hub.py
+++ b/hubs/views/hub.py
@@ -204,16 +204,16 @@ def hub_add_widget_post(name):
         plugin=widget_name, index=-1, left=position == 'left')
     error = False
     config = {}
-    for arg in widget.module.get_arguments():
-        val = flask.request.form.get(arg.name)
+    for param in widget.module.get_parameters():
+        val = flask.request.form.get(param.name)
         if not val:
             flask.flash(
-                'You must provide a value for: %s' % arg.name, 'error')
+                'You must provide a value for: %s' % param.name, 'error')
             error = True
             break
         try:
-            arg.validator(flask.g.db, val)
-            config[arg.name] = val
+            param.validator(flask.g.db, val)
+            config[param.name] = val
         except Exception as err:
             flask.flash('Invalid data provided, error: %s' % err, 'error')
             error = True
diff --git a/hubs/views/widget.py b/hubs/views/widget.py
index cbc002c..192c44d 100644
--- a/hubs/views/widget.py
+++ b/hubs/views/widget.py
@@ -40,16 +40,16 @@ def widget_edit_post(hub, idx):
     widget = get_widget_instance(hub, idx)
     error = False
     config = {}
-    for arg in widget.module.get_arguments():
-        val = flask.request.form.get(arg.name)
+    for param in widget.module.get_parameters():
+        val = flask.request.form.get(param.name)
         if not val:
             flask.flash(
-                'You must provide a value for: %s' % arg.name, 'error')
+                'You must provide a value for: %s' % param.name, 'error')
             error = True
             break
         try:
-            val = arg.validator(flask.g.db, val)
-            config[arg.name] = val
+            val = param.validator(flask.g.db, val)
+            config[param.name] = val
         except Exception as err:
             flask.flash('Invalid data provided, error: %s' % err, 'error')
             error = True
diff --git a/hubs/widgets/about/__init__.py b/hubs/widgets/about/__init__.py
index 1a8cc50..bdb7e7b 100644
--- a/hubs/widgets/about/__init__.py
+++ b/hubs/widgets/about/__init__.py
@@ -9,7 +9,7 @@ class About(Widget):
 
     name = "about"
     position = "both"
-    arguments = [dict(
+    parameters = [dict(
         name="text",
         label="Text",
         default="I am a Fedora user, and this is my about",
diff --git a/hubs/widgets/badges/__init__.py b/hubs/widgets/badges/__init__.py
index 6c76716..79315e1 100644
--- a/hubs/widgets/badges/__init__.py
+++ b/hubs/widgets/badges/__init__.py
@@ -12,7 +12,7 @@ class Badges(Widget):
 
     name = "badges"
     position = "right"
-    arguments = [dict(
+    parameters = [dict(
         name="username",
         label="Username",
         default=None,
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
index 70dbc9c..50b726e 100644
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals, absolute_import
 
-import collections
 import logging
 import re
 import flask
@@ -14,8 +13,33 @@ from .view import WidgetView
 
 log = logging.getLogger(__name__)
 
-Argument = collections.namedtuple(
-    'Argument', ('name', 'label', 'default', 'validator', 'help'))
+
+class WidgetParameter(object):
+    """
+    Configuration option for a widget.
+
+    A widget can be configured differently for each instance of this widget in
+    a hub.  The list of configuration options is described by the list of
+    :py:class:`WidgetParameter` objects returned by the widget's
+    :py:meth:`~Widget.get_parameters` method.
+
+    Attributes:
+        name (str): The name of the parameter.
+        label (str): A humanized name of the parameter, which will be shown in
+            the UI.
+        default: The default value if this parameter is not set.
+        validator (function): A validation function that will be called when
+            a user sets the parameter value.
+        help (str): A help text that will be shown in the UI.
+    """
+
+    _attrs = ('name', 'label', 'default', 'validator', 'help')
+
+    def __init__(self, **kwargs):
+        for name in self._attrs:
+            setattr(self, name, kwargs.pop(name, None))
+        for name in kwargs:
+            raise TypeError("Invalid attribute: %s" % name)
 
 
 class Widget(object):
@@ -29,13 +53,13 @@ class Widget(object):
         position (str): The position of the widget in the rendered page. It
             should be one of the following values: ``left``, ``right``, or
             ``both``.
-        arguments (list): A list of dictionaries that describe a widget's
-            configuration. See :py:class:`hubs.widgets.base.Argument`.
+        parameters (list): A list of dictionaries that describe a widget's
+            configuration. See :py:class:`hubs.widgets.base.WidgetParameter`.
     """
 
     name = None
     position = None
-    arguments = []
+    parameters = []
 
     def __init__(self):
         self._template_environment = None
@@ -65,8 +89,12 @@ class Widget(object):
             raise AttributeError(
                 'The root view must be registered for the "/" URL rule.')
 
-    def get_arguments(self):
-        return [Argument(**arg) for arg in self.arguments]
+    def get_parameters(self):
+        """
+        Return the :py:class:`WidgetParameter` instances that describe this
+        widget's configuration options.
+        """
+        return [WidgetParameter(**param) for param in self.parameters]
 
     def get_template_environment(self):
         """
diff --git a/hubs/widgets/bugzilla/__init__.py b/hubs/widgets/bugzilla/__init__.py
index 5965be1..c63fa3c 100644
--- a/hubs/widgets/bugzilla/__init__.py
+++ b/hubs/widgets/bugzilla/__init__.py
@@ -15,7 +15,7 @@ class Bugzilla(Widget):
 
     name = "bugzilla"
     position = "right"
-    arguments = [dict(
+    parameters = [dict(
         name="username",
         label="Username",
         default=None,
diff --git a/hubs/widgets/dummy/__init__.py b/hubs/widgets/dummy/__init__.py
index 19d43c4..ca4bac8 100644
--- a/hubs/widgets/dummy/__init__.py
+++ b/hubs/widgets/dummy/__init__.py
@@ -8,7 +8,7 @@ class Dummy(Widget):
 
     name = "dummy"
     position = "both"
-    arguments = [dict(
+    parameters = [dict(
         name="text",
         label="Text",
         default="Lorem ipsum dolor...",
diff --git a/hubs/widgets/fedmsgstats/__init__.py b/hubs/widgets/fedmsgstats/__init__.py
index a557148..142548f 100644
--- a/hubs/widgets/fedmsgstats/__init__.py
+++ b/hubs/widgets/fedmsgstats/__init__.py
@@ -17,7 +17,7 @@ class FedmsgStats(Widget):
 
     name = "fedmsgstats"
     position = "both"
-    arguments = [dict(
+    parameters = [dict(
         name="username",
         label="Username",
         default=None,
diff --git a/hubs/widgets/feed/__init__.py b/hubs/widgets/feed/__init__.py
index bd35b61..b1f8299 100644
--- a/hubs/widgets/feed/__init__.py
+++ b/hubs/widgets/feed/__init__.py
@@ -12,7 +12,7 @@ class Feed(Widget):
 
     name = "feed"
     position = "left"
-    arguments = [
+    parameters = [
         {
             "name": "username",
             "label": "Username",
diff --git a/hubs/widgets/fhosted/__init__.py b/hubs/widgets/fhosted/__init__.py
index 2c9d26c..8f60efa 100644
--- a/hubs/widgets/fhosted/__init__.py
+++ b/hubs/widgets/fhosted/__init__.py
@@ -11,7 +11,7 @@ class FedoraHosted(Widget):
 
     name = "fhosted"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="project",
             label="Project",
diff --git a/hubs/widgets/github_pr/__init__.py b/hubs/widgets/github_pr/__init__.py
index 8b9aab3..6961d4a 100644
--- a/hubs/widgets/github_pr/__init__.py
+++ b/hubs/widgets/github_pr/__init__.py
@@ -17,7 +17,7 @@ class GitHubPRs(Widget):
 
     name = "github_pr"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="organization",
             label="Organization",
diff --git a/hubs/widgets/githubissues/__init__.py b/hubs/widgets/githubissues/__init__.py
index 6af020d..e29faa7 100644
--- a/hubs/widgets/githubissues/__init__.py
+++ b/hubs/widgets/githubissues/__init__.py
@@ -11,7 +11,7 @@ class GitHubIssues(Widget):
 
     name = "githubissues"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="org",
             label="Username",
diff --git a/hubs/widgets/library/__init__.py b/hubs/widgets/library/__init__.py
index d15fa1d..351ec4f 100644
--- a/hubs/widgets/library/__init__.py
+++ b/hubs/widgets/library/__init__.py
@@ -9,7 +9,7 @@ class Library(Widget):
 
     name = "library"
     position = "both"
-    arguments = [dict(
+    parameters = [dict(
         name="urls",
         label="URLs",
         default=None,
diff --git a/hubs/widgets/linechart/__init__.py b/hubs/widgets/linechart/__init__.py
index f745e28..dfae632 100644
--- a/hubs/widgets/linechart/__init__.py
+++ b/hubs/widgets/linechart/__init__.py
@@ -8,7 +8,7 @@ class Linechart(Widget):
 
     name = "linechart"
     position = "left"
-    arguments = [dict(
+    parameters = [dict(
         name="username",
         label="Username",
         default=None,
diff --git a/hubs/widgets/meetings/__init__.py b/hubs/widgets/meetings/__init__.py
index c87df27..01908ce 100644
--- a/hubs/widgets/meetings/__init__.py
+++ b/hubs/widgets/meetings/__init__.py
@@ -15,7 +15,7 @@ class Meetings(Widget):
 
     name = "meetings"
     position = "both"
-    arguments = [
+    parameters = [
         dict(
             name="calendar",
             label="Calendar",
diff --git a/hubs/widgets/pagure_pr/__init__.py b/hubs/widgets/pagure_pr/__init__.py
index 580fece..518d12d 100644
--- a/hubs/widgets/pagure_pr/__init__.py
+++ b/hubs/widgets/pagure_pr/__init__.py
@@ -13,7 +13,7 @@ class PagurePRs(Widget):
 
     name = "pagure_pr"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="repo",
             label="Repository",
diff --git a/hubs/widgets/pagureissues/__init__.py b/hubs/widgets/pagureissues/__init__.py
index f3490c9..356d59f 100644
--- a/hubs/widgets/pagureissues/__init__.py
+++ b/hubs/widgets/pagureissues/__init__.py
@@ -13,7 +13,7 @@ class PagureIssues(Widget):
 
     name = "pagureissues"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="repo",
             label="Repository",
diff --git a/hubs/widgets/rules/__init__.py b/hubs/widgets/rules/__init__.py
index e4e874c..498e3a8 100644
--- a/hubs/widgets/rules/__init__.py
+++ b/hubs/widgets/rules/__init__.py
@@ -14,7 +14,7 @@ class Rules(Widget):
 
     name = "rules"
     position = "both"
-    arguments = [
+    parameters = [
         dict(
             name="link",
             label="Link",
diff --git a/hubs/widgets/sticky/__init__.py b/hubs/widgets/sticky/__init__.py
index 02e7fdf..3f038ba 100644
--- a/hubs/widgets/sticky/__init__.py
+++ b/hubs/widgets/sticky/__init__.py
@@ -8,7 +8,7 @@ class Sticky(Widget):
 
     name = "sticky"
     position = "both"
-    arguments = [
+    parameters = [
         dict(
             name="text",
             label="Text",
diff --git a/hubs/widgets/subscriptions/__init__.py b/hubs/widgets/subscriptions/__init__.py
index 14538f0..1641191 100644
--- a/hubs/widgets/subscriptions/__init__.py
+++ b/hubs/widgets/subscriptions/__init__.py
@@ -17,7 +17,7 @@ class Subscriptions(Widget):
 
     name = "subscriptions"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="username",
             label="Username",
diff --git a/hubs/widgets/workflow/pendingacls.py b/hubs/widgets/workflow/pendingacls.py
index 5d891e0..07fd52b 100644
--- a/hubs/widgets/workflow/pendingacls.py
+++ b/hubs/widgets/workflow/pendingacls.py
@@ -12,7 +12,7 @@ class PendingACLs(Widget):
 
     name = "workflow.pendingacls"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="username",
             label="Username",
diff --git a/hubs/widgets/workflow/updates2stable.py b/hubs/widgets/workflow/updates2stable.py
index d2490a3..79fac1f 100644
--- a/hubs/widgets/workflow/updates2stable.py
+++ b/hubs/widgets/workflow/updates2stable.py
@@ -16,7 +16,7 @@ class Updates2Stable(Widget):
 
     name = "workflow.updates2stable"
     position = "right"
-    arguments = [
+    parameters = [
         dict(
             name="username",
             label="Username",

From 316a22855c6977a2676e377c7f572e0d1bd1e0fb Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:11 +0000
Subject: [PATCH 40/45] More explicit widget validation errors


---

diff --git a/hubs/tests/test_widget_base.py b/hubs/tests/test_widget_base.py
index bc8a166..0abe27c 100644
--- a/hubs/tests/test_widget_base.py
+++ b/hubs/tests/test_widget_base.py
@@ -45,13 +45,13 @@ class WidgetTest(APPTest):
             AttributeError, '.* "name" .*', test_widget.validate)
         test_widget.name = "invalid name \xe2\x98\xba"
         self.assertRaisesRegexp(
-            AttributeError, '^Invalid widget name: ', test_widget.validate)
+            AttributeError, '^invalid widget name: ', test_widget.validate)
         test_widget.name = "localtest"
         self.assertRaisesRegexp(
-            AttributeError, '.* "position" .*', test_widget.validate)
+            AttributeError, '"position" .*', test_widget.validate)
         test_widget.position = "invalid"
         self.assertRaisesRegexp(
-            AttributeError, '.* "position" .*', test_widget.validate)
+            AttributeError, '"position" .*', test_widget.validate)
         test_widget.position = "both"
         self.assertRaisesRegexp(
             AttributeError, '.* "root" .*', test_widget.validate)
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
index 50b726e..c6b87af 100644
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -71,23 +71,23 @@ class Widget(object):
         Raises: AttributeError
         """
         if self.name is None:
-            raise AttributeError('Widgets must have a "name" attribute')
+            raise AttributeError('widgets must have a "name" attribute')
         if not re.match('^[\w_.-]+$', self.name):
             raise AttributeError(
-                'Invalid widget name: %r. ' % self.name +
+                'invalid widget name: %r. ' % self.name +
                 'Please use URL-compatible characters.')
         if self.position not in ['left', 'right', 'both']:
             raise AttributeError(
-                '%r\'s "position" is not: `left`, `right` or `both`'
-                % self.name)
+                '"position" attribute is not: `left`, `right` or `both`'
+                )
         root_view = self.get_views().get("root")
         if root_view is None:
             raise AttributeError(
-                'Widgets must have a "root" view, please refer to the '
+                'widgets must have a "root" view, please refer to the '
                 'documentation.')
         if "/" not in root_view.url_rules:
             raise AttributeError(
-                'The root view must be registered for the "/" URL rule.')
+                'the root view must be registered for the "/" URL rule.')
 
     def get_parameters(self):
         """
diff --git a/hubs/widgets/registry.py b/hubs/widgets/registry.py
index 109e69a..ad4d494 100644
--- a/hubs/widgets/registry.py
+++ b/hubs/widgets/registry.py
@@ -52,7 +52,11 @@ class WidgetRegistry(UserDict):
                 widget.name = widget_path[len(prefix):]
             else:
                 widget.name = widget_path
-        widget.validate()
+        try:
+            widget.validate()
+        except AttributeError as e:
+            raise AttributeError(
+                "Error registering %s: %s" % (widget_path, e))
         self.data[widget.name] = widget
 
     def register_routes(self, app):

From cf2ad4387f4c57d09d8617ba6b4abb95d4d4791d Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 09 2017 15:58:11 +0000
Subject: [PATCH 41/45] Allow the widget to declare where the views and cached functions are


---

diff --git a/hubs/tests/test_widget_base.py b/hubs/tests/test_widget_base.py
index 0abe27c..9b53e57 100644
--- a/hubs/tests/test_widget_base.py
+++ b/hubs/tests/test_widget_base.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import six
+
 from hubs.widgets.base import Widget
 from hubs.widgets.caching import CachedFunction
 from hubs.widgets.view import WidgetView
@@ -72,6 +74,20 @@ class WidgetTest(APPTest):
             {"root": TestingView}
             )
 
+    def test_list_views_relative(self):
+        testing_widget = TestingWidget()
+        testing_widget.views_module = ".nowhere"
+        self.assertRaises(AttributeError, testing_widget.get_views)
+        if six.PY2:
+            # On Python2, setting the import module to "." raises a KeyError,
+            # so we can't test.
+            return
+        testing_widget.views_module = "."
+        self.assertEqual(
+            testing_widget.get_views(),
+            {"root": TestingView}
+            )
+
     def test_list_functions(self):
         testing_widget = TestingWidget()
         self.assertEqual(
@@ -79,6 +95,20 @@ class WidgetTest(APPTest):
             {"TestingFunction": TestingFunction}
             )
 
+    def test_list_functions_relative(self):
+        testing_widget = TestingWidget()
+        testing_widget.cached_functions_module = ".nowhere"
+        self.assertRaises(AttributeError, testing_widget.get_cached_functions)
+        if six.PY2:
+            # On Python2, setting the import module to "." raises a KeyError,
+            # so we can't test.
+            return
+        testing_widget.cached_functions_module = "."
+        self.assertEqual(
+            testing_widget.get_cached_functions(),
+            {"TestingFunction": TestingFunction}
+            )
+
     def test_list_views(self):
         class TestView1(WidgetView):
             name = "root"
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
index c6b87af..3d27813 100644
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -55,11 +55,19 @@ class Widget(object):
             ``both``.
         parameters (list): A list of dictionaries that describe a widget's
             configuration. See :py:class:`hubs.widgets.base.WidgetParameter`.
+        views_module (list): The Python path to the module where the widget
+            views must be looked for.  By default, they are looked for in the
+            same module.
+        cached_functions_module (list): The Python path to the module where the
+            cached functions must be looked for.  By default, they are looked
+            for in the same module.
     """
 
     name = None
     position = None
     parameters = []
+    views_module = None
+    cached_functions_module = None
 
     def __init__(self):
         self._template_environment = None
@@ -120,20 +128,27 @@ class Widget(object):
             self._template_environment = env
         return self._template_environment
 
-    def _get_local_subclasses(self, parent_class):
+    def _get_local_subclasses(self, parent_class, module=None):
         """
         Returns the subclasses of the ``parent_class`` defined in this widget's
         Python module.
         """
+        if module is None:
+            module = self.__module__
         result = []
-        widget_module = import_module(self.__module__)
+        try:
+            widget_module = import_module(module, package=self.__module__)
+        except ImportError as e:
+            raise AttributeError(
+                "Could not find subclasses of %s in %s: %s"
+                % (parent_class, module, e))
         for objname in dir(widget_module):
             obj = getattr(widget_module, objname)
             if type(obj) != type(object):
                 continue  # we only look for classes
             if not issubclass(obj, parent_class):
                 continue  # we only want subclasses of the parent_class
-            if obj.__module__ != self.__module__:
+            if obj.__module__ != widget_module.__name__:
                 # we don't want locally imported classes (like the
                 # parent_class itself)
                 continue
@@ -148,7 +163,7 @@ class Widget(object):
         """
         return dict([
             (view.name, view) for view in
-            self._get_local_subclasses(WidgetView)
+            self._get_local_subclasses(WidgetView, self.views_module)
             ])
 
     def register_routes(self, app):
@@ -180,6 +195,7 @@ class Widget(object):
                 their class name.
         """
         result = {}
-        for fn_class in self._get_local_subclasses(CachedFunction):
+        for fn_class in self._get_local_subclasses(
+                CachedFunction, self.cached_functions_module):
             result[fn_class.__name__] = fn_class
         return result

From 4baacce8411c88d3fba3b4237770c907e177b02b Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 10 2017 09:06:54 +0000
Subject: [PATCH 42/45] Implement fixes from jcline's review


---

diff --git a/hubs/default_config.py b/hubs/default_config.py
index be038ad..b600b29 100644
--- a/hubs/default_config.py
+++ b/hubs/default_config.py
@@ -35,26 +35,26 @@ SOURCE_URL = 'https://pagure.io/fedora-hubs/blob/develop/f'  # /hubs/widgets/bad
 
 
 WIDGETS = [
-    'hubs.widgets.dummy.Dummy',
-    'hubs.widgets.stats.Stats',
-    'hubs.widgets.rules.Rules',
-    'hubs.widgets.sticky.Sticky',
-    'hubs.widgets.about.About',
-    'hubs.widgets.badges.Badges',
-    'hubs.widgets.library.Library',
-    'hubs.widgets.linechart.Linechart',
-    'hubs.widgets.fedmsgstats.FedmsgStats',
-    'hubs.widgets.feed.Feed',
-    'hubs.widgets.subscriptions.Subscriptions',
-    'hubs.widgets.meetings.Meetings',
-    'hubs.widgets.pagure_pr.PagurePRs',
-    'hubs.widgets.github_pr.GitHubPRs',
-    'hubs.widgets.pagureissues.PagureIssues',
-    'hubs.widgets.githubissues.GitHubIssues',
-    'hubs.widgets.bugzilla.Bugzilla',
-    'hubs.widgets.fhosted.FedoraHosted',
-    'hubs.widgets.memberships.Memberships',
-    'hubs.widgets.contact.Contact',
-    'hubs.widgets.workflow.pendingacls.PendingACLs',
-    'hubs.widgets.workflow.updates2stable.Updates2Stable',
+    'hubs.widgets.dummy:Dummy',
+    'hubs.widgets.stats:Stats',
+    'hubs.widgets.rules:Rules',
+    'hubs.widgets.sticky:Sticky',
+    'hubs.widgets.about:About',
+    'hubs.widgets.badges:Badges',
+    'hubs.widgets.library:Library',
+    'hubs.widgets.linechart:Linechart',
+    'hubs.widgets.fedmsgstats:FedmsgStats',
+    'hubs.widgets.feed:Feed',
+    'hubs.widgets.subscriptions:Subscriptions',
+    'hubs.widgets.meetings:Meetings',
+    'hubs.widgets.pagure_pr:PagurePRs',
+    'hubs.widgets.github_pr:GitHubPRs',
+    'hubs.widgets.pagureissues:PagureIssues',
+    'hubs.widgets.githubissues:GitHubIssues',
+    'hubs.widgets.bugzilla:Bugzilla',
+    'hubs.widgets.fhosted:FedoraHosted',
+    'hubs.widgets.memberships:Memberships',
+    'hubs.widgets.contact:Contact',
+    'hubs.widgets.workflow.pendingacls:PendingACLs',
+    'hubs.widgets.workflow.updates2stable:Updates2Stable',
     ]
diff --git a/hubs/widgets/__init__.py b/hubs/widgets/__init__.py
index 1ec88bc..76f17b0 100644
--- a/hubs/widgets/__init__.py
+++ b/hubs/widgets/__init__.py
@@ -33,10 +33,12 @@ A widget view is a class which inherits from the
 :py:class:`hubs.widgets.view.WidgetView` class.  A widget can have one or more
 of them.
 
-Widget views can make use of templates following the Jinja2 engine syntax.  The
-templates are looked for in the widget's ``templates`` subdirectrory first, and
-then in the generic ``hubs/widgets/templates/`` directory.  They can make use
-of any Jinja2 feature, including inheritance, macros, etc.
+Widget views can make use of templates following the `Jinja2`_ engine syntax.
+The templates are looked for in the widget's ``templates`` subdirectrory first,
+and then in the generic ``hubs/widgets/templates/`` directory.  They can make
+use of any Jinja2 feature, including inheritance, macros, etc.
+
+.. _Jinja2: http://jinja.pocoo.org/docs/
 
 If you want to add filters to youre widget's Jinja2 environment, you can do so
 by overriding the widget's
diff --git a/hubs/widgets/base.py b/hubs/widgets/base.py
index 3d27813..ac50fd3 100644
--- a/hubs/widgets/base.py
+++ b/hubs/widgets/base.py
@@ -46,7 +46,7 @@ class Widget(object):
     """
     The main widget class, you must subclass it to create a widget.
 
-    Args:
+    Arguments:
         name (str): The widget name. It will not be displayed in the UI, but
             will appear in some URLs, so be careful to only use simple,
             URL-compatible characters.
diff --git a/hubs/widgets/caching.py b/hubs/widgets/caching.py
index c8a56e8..9067410 100644
--- a/hubs/widgets/caching.py
+++ b/hubs/widgets/caching.py
@@ -50,15 +50,13 @@ class CachedFunction(object):
     takes the bus message as only argument, and returns ``True`` if the cache
     should be rebuild, ``False`` otherwise.
 
-    To call the function, instanciate the class and execute it. You may also
+    To call the function, instantiate the class and execute it. You may also
     call the :py:meth:`.get_data` method.
 
     Args:
         instance (hubs.models.Widget): The widget instance.
     """
 
-    # invalidate_filter = {}
-
     def __init__(self, instance):
         self.instance = instance
 
@@ -81,28 +79,12 @@ class CachedFunction(object):
 
     def get_data(self):
         key = self.get_cache_key()
-        # log.debug("Accessing cache key %s", key)
+        log.debug("Accessing cache key %s", key)
         return cache.get_or_create(
-            key, lambda: self.execute())
+            key, self.execute)
 
     __call__ = get_data
 
-    # def _get_topic(self, message):
-    #     return message['topic']
-
-    # def _get_category(self, message):
-    #     return message['topic'].split('.')[3]
-
-    # def pass_filter(self, message):
-    #     topic_filter = self.invalidate_filter.get("topic")
-    #     if topic_filter and self._get_topic(message) not in topic_filter:
-    #         return False
-    #     category_filter = self.invalidate_filter.get("category")
-    #     if category_filter and \
-    #             self._get_category(message) not in category_filter:
-    #         return False
-    #     return True
-
     def should_invalidate(self, message):
         """
         Tell the cache invalidator if the received message should invalidate
@@ -114,8 +96,6 @@ class CachedFunction(object):
         Returns:
             bool: If ``True``, the cache will be rebuilt.
         """
-        # if not self._pass_filter(message):
-        #     return False
         return True
 
     def is_cached(self):
diff --git a/hubs/widgets/registry.py b/hubs/widgets/registry.py
index ad4d494..fe32607 100644
--- a/hubs/widgets/registry.py
+++ b/hubs/widgets/registry.py
@@ -14,6 +14,9 @@ class WidgetRegistry(UserDict):
     It behaves like a dictionary where widget names are keys and widget class
     instances are values.  There are additional methods to register widgets and
     widget-specific routes.
+
+    Widgets are registered using their class path in the following format:
+    `python.path.to.module:TheWidgetClass`.
     """
 
     def register_list(self, widget_list):
@@ -33,9 +36,10 @@ class WidgetRegistry(UserDict):
 
         Args:
             widget_path (str): Python path to the subclass of
-                :py:class:`hubs.widgets.base.Widget`.
+                :py:class:`hubs.widgets.base.Widget`. The format is
+                `python.path.to.module:TheWidgetClass`.
         """
-        mod_path, _, cls_name = widget_path.rpartition('.')
+        mod_path, cls_name = widget_path.split(':', 1)
         mod = import_module(mod_path)
         try:
             widget_class = getattr(mod, cls_name)

From 5e3de90c7d948bb82e4651e9d5b73a63472fa9e9 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 10 2017 10:27:24 +0000
Subject: [PATCH 43/45] Make CachedFunction.should_invalidate() abstract


---

diff --git a/hubs/widgets/caching.py b/hubs/widgets/caching.py
index 9067410..990dce6 100644
--- a/hubs/widgets/caching.py
+++ b/hubs/widgets/caching.py
@@ -88,7 +88,8 @@ class CachedFunction(object):
     def should_invalidate(self, message):
         """
         Tell the cache invalidator if the received message should invalidate
-        this function's cache.
+        this function's cache.  This function must be implemented by
+        subclasses.
 
         Args:
             message (dict): The recieved bus message.
@@ -96,7 +97,7 @@ class CachedFunction(object):
         Returns:
             bool: If ``True``, the cache will be rebuilt.
         """
-        return True
+        raise NotImplementedError
 
     def is_cached(self):
         """

From d6eb8815e9c4e7d6e60a924113b13095c5ccbe7e Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 10 2017 13:56:13 +0000
Subject: [PATCH 44/45] Fix the help text in the widgets config template


---

diff --git a/hubs/templates/add_widget.html b/hubs/templates/add_widget.html
index 80d4a8d..cb3f04d 100644
--- a/hubs/templates/add_widget.html
+++ b/hubs/templates/add_widget.html
@@ -27,12 +27,10 @@
               <input id="{{ param.name }}" class="form-control" type="text"
                 value="{{ param.default if param.default else '' }}"
                 name="{{ param.name }}" />
-            </fieldset>
-            {% if param.help %}
-              <div>
+              {% if param.help %}
                 <small class="text-muted">{{ param.help }}</small>
-              </div>
-            {% endif %}
+              {% endif %}
+            </fieldset>
           {% else %}
             <p>Nothing to configure</p>
           {% endfor %}
diff --git a/hubs/templates/edit.html b/hubs/templates/edit.html
index 5b6241c..928ea91 100644
--- a/hubs/templates/edit.html
+++ b/hubs/templates/edit.html
@@ -14,12 +14,10 @@
           <input id="{{ param.name }}" class="form-control" type="text"
               value="{{ widget.config.get(param.name, param.default if param.default else '') }}"
               name="{{ param.name }}" />
+          {% if param.help %}
+          <small class="text-muted">{{ param.help }}</small>
+          {% endif %}
         </fieldset>
-        {% if param.help %}
-          <div>
-            <small class="text-muted">{{ param.help }}</small>
-          </div>
-        {% endif %}
       {% else %}
         <p>Nothing to configure</p>
       {% endfor %}

From 71893f00e2afa9a2b8c3c2e2b417effabfa8a97e Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 10 2017 15:10:50 +0000
Subject: [PATCH 45/45] Sort the widget registry by name


The order in the configuration will be the order in which widgets will
be proposed for addition in a hub.

---

diff --git a/hubs/default_config.py b/hubs/default_config.py
index b600b29..1c50405 100644
--- a/hubs/default_config.py
+++ b/hubs/default_config.py
@@ -35,26 +35,26 @@ SOURCE_URL = 'https://pagure.io/fedora-hubs/blob/develop/f'  # /hubs/widgets/bad
 
 
 WIDGETS = [
-    'hubs.widgets.dummy:Dummy',
-    'hubs.widgets.stats:Stats',
-    'hubs.widgets.rules:Rules',
-    'hubs.widgets.sticky:Sticky',
     'hubs.widgets.about:About',
     'hubs.widgets.badges:Badges',
+    'hubs.widgets.bugzilla:Bugzilla',
+    'hubs.widgets.contact:Contact',
+    'hubs.widgets.dummy:Dummy',
     'hubs.widgets.library:Library',
     'hubs.widgets.linechart:Linechart',
     'hubs.widgets.fedmsgstats:FedmsgStats',
     'hubs.widgets.feed:Feed',
-    'hubs.widgets.subscriptions:Subscriptions',
-    'hubs.widgets.meetings:Meetings',
-    'hubs.widgets.pagure_pr:PagurePRs',
+    'hubs.widgets.fhosted:FedoraHosted',
     'hubs.widgets.github_pr:GitHubPRs',
-    'hubs.widgets.pagureissues:PagureIssues',
     'hubs.widgets.githubissues:GitHubIssues',
-    'hubs.widgets.bugzilla:Bugzilla',
-    'hubs.widgets.fhosted:FedoraHosted',
+    'hubs.widgets.meetings:Meetings',
     'hubs.widgets.memberships:Memberships',
-    'hubs.widgets.contact:Contact',
+    'hubs.widgets.pagure_pr:PagurePRs',
+    'hubs.widgets.pagureissues:PagureIssues',
+    'hubs.widgets.rules:Rules',
+    'hubs.widgets.stats:Stats',
+    'hubs.widgets.sticky:Sticky',
+    'hubs.widgets.subscriptions:Subscriptions',
     'hubs.widgets.workflow.pendingacls:PendingACLs',
     'hubs.widgets.workflow.updates2stable:Updates2Stable',
     ]
diff --git a/hubs/widgets/registry.py b/hubs/widgets/registry.py
index fe32607..f6e772b 100644
--- a/hubs/widgets/registry.py
+++ b/hubs/widgets/registry.py
@@ -1,19 +1,17 @@
 from __future__ import unicode_literals
 
-import six
-
+from collections import OrderedDict
 from importlib import import_module
-from six.moves import UserDict
 from hubs.widgets.base import Widget
 
 
-class WidgetRegistry(UserDict):
+class WidgetRegistry(OrderedDict):
     """
     The widget registry.
 
-    It behaves like a dictionary where widget names are keys and widget class
-    instances are values.  There are additional methods to register widgets and
-    widget-specific routes.
+    It behaves like an ordered dictionary where widget names are keys and
+    widget class instances are values.  There are additional methods to
+    register widgets and widget-specific routes.
 
     Widgets are registered using their class path in the following format:
     `python.path.to.module:TheWidgetClass`.
@@ -61,7 +59,7 @@ class WidgetRegistry(UserDict):
         except AttributeError as e:
             raise AttributeError(
                 "Error registering %s: %s" % (widget_path, e))
-        self.data[widget.name] = widget
+        self[widget.name] = widget
 
     def register_routes(self, app):
         """
@@ -76,8 +74,3 @@ class WidgetRegistry(UserDict):
         """
         for widget in self.values():
             widget.register_routes(app)
-
-    # IterableUserDict is in Python2 but not exported by six.
-    if six.PY2:
-        def __iter__(self):
-            return iter(self.data)