Merge lp:~super-friends/qml-friends/raring into lp:qml-friends

[Ken VanDine]

  * Added StreamModel
    - Filters available for stream, service, and account (LP: #1156941)
  * Added Refresh
  * Added tests
  * Updated for the schema changes in friends
  * debian/control
    - build depend on libdee-qt5-dev
    - Added build depends for running tests: dbus-test-runner, xvfb,
      qtdeclarative5-qtquick2-plugin, and qtdeclarative5-test-plugin
    - build depend on friends-dispatcher (>= 0.1.2daily13.03.14)

Merged queued changes for raring now that the FFe is approved

[Ken VanDine (ken-vandine)]

These changes have been reviewed before merging into the raring branch

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-07 16:38:08 +0000
+++ debian/changelog	2013-03-20 13:31:31 +0000
@@ -1,3 +1,18 @@
+qml-friends (0.1.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Added StreamModel 
+    - Filters available for stream, service, and account (LP: #1156941)
+  * Added Refresh
+  * Added tests
+  * Updated for the schema changes in friends
+  * debian/control
+    - build depend on libdee-qt5-dev
+    - Added build depends for running tests: dbus-test-runner, xvfb, 
+      qtdeclarative5-qtquick2-plugin, and qtdeclarative5-test-plugin
+    - build depend on friends-dispatcher (>= 0.1.2daily13.03.14)
+
+ -- Ken VanDine <[e-mail]>  Mon, 18 Mar 2013 22:49:02 -0400
+
 qml-friends (0.1.0bzr13.03.07-0ubuntu1) raring; urgency=low
 
   * Use the correct callback for likeAsync
 
=== modified file 'debian/control'
--- debian/control	2013-03-05 18:52:53 +0000
+++ debian/control	2013-03-20 13:31:31 +0000
@@ -11,7 +11,14 @@
                qt5-qmake,
                qtbase5-dev,
                qtdeclarative5-dev,
+               qtdeclarative5-test-plugin,
+               libdee-qt5-dev,
+               friends-dispatcher (>= 0.1.2daily13.03.14),
                libfriends-dev (>= 0.1.1bzr13.02.07-0ubuntu1),
+               dbus-test-runner,
+               xvfb,
+               qtdeclarative5-qtquick2-plugin,
+               qtdeclarative5-test-plugin,
 Standards-Version: 3.9.3
 Section: libs
 Homepage: https://launchpad.net/qml-friends
 
=== added file 'examples/README'
--- examples/README	1970-01-01 00:00:00 +0000
+++ examples/README	2013-03-20 13:31:31 +0000
@@ -0,0 +1,95 @@
+Code examples for qml-friends
+
+All the dependencies can be installed from ppa:super-friends/ppa
+
+Installing the qtdeclarative5-friends-plugin package should bring in the necessary dependencies
+
+/* Sending 
+   http://bazaar.launchpad.net/~super-friends/qml-friends/raring/view/head:/examples/poster.qml  */
+   
+import Friends 0.1
+
+FriendsDispatcher {
+    id: friends
+    // use this to check if the send was successfull
+    onSendComplete: {
+         if (success) {
+             console.log ("Send completed successfully");
+         } else {
+             console.log ("Send failed: " + errorMessage);
+         }
+     }
+}
+
+Button {
+    id: sendButton
+    text: i18n.tr("Send")
+    onClicked: {
+        /* async method to send, connect to onSendComplete for success/failure */
+        friends.sendAsync(entry.text);
+    }
+}
+
+Getting a model of the data from Friends
+http://bazaar.launchpad.net/~super-friends/qml-friends/raring/view/head:/examples/streamview.qml
+
+/* To get a model of all posts, suitable for use in a ListView, 
+   Repeater, etc */
+StreamModel {
+    id: streamModel 
+}
+
+/* The roleNames provided from streamModel isn't all that intuitive right now.
+    service:        column_0
+    account_id:     column_1
+    message_id:     column_2
+    stream:         column_3
+    sender:         column_4
+    sender_id:      column_5
+    sender_nick:    column_6
+    from_me:        column_7
+    timestamp:      column_8
+    message:        column_9
+    icon_uri:       column_10
+    url:            column_11
+    likes:          column_12
+    liked:          column_13
+    link_picture:   column_14
+    link_name:      column_15
+    link_url:       column_16
+    link_desc:      column_17
+    link_caption:   column_18
+    link_icon:      column_19
+    location:       column_20
+    latitude:       column_21
+    longitude:      column_22
+*/
+
+/* To get a model of all images */
+StreamModel { 
+    stream: "images"
+}
+
+/* To get a model of content from twitter */
+StreamModel { 
+    service: "twitter"
+}
+
+/* To get a model of content from accountId 2 */
+StreamModel { 
+    account: 2
+}
+
+/* To get a model of threads on a post */
+StreamModel { 
+    stream: "reply_to/"+messageId
+}
+
+/* convenience function for converting timestamps into time delta 
+   strings, like "2 hours ago" */
+FriendsUtils {
+    id: friendsUtils
+}
+
+friendsUtils.createTimeString(column_8)
+
 
=== added file 'examples/streamview.qml'
--- examples/streamview.qml	1970-01-01 00:00:00 +0000
+++ examples/streamview.qml	2013-03-20 13:31:31 +0000
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Friends 0.1
+
+MainView {
+    width: units.gu(50)
+    height: units.gu(100)
+
+    FriendsUtils {
+        id: friendsUtils
+    }
+
+    ListView {
+        id: listView
+        anchors {
+            fill: parent
+        }
+        snapMode: ListView.SnapToItem
+        /* Reverse ListView order */
+        verticalLayoutDirection: ListView.BottomToTop
+        cacheBuffer: parent.height
+        model: StreamModel { 
+            //stream: "messages"
+            //service: "facebook"
+            /* account Id from libaccounts */
+            //account: 1
+        }
+        populate: Transition {
+            ScriptAction { script: listView.positionViewAtEnd() }
+        }
+
+        delegate: Item {
+            id: tile
+            height: status_update_content.height
+            width: parent.width
+            anchors {
+                margins: units.gu(1)
+            }
+
+            UbuntuShape {
+                id: avatarImage
+                radius: "medium"
+                height: units.dp(48)
+                width: units.dp(48)
+                anchors {
+                    left: parent.left
+                    top: parent.top
+                    leftMargin: units.gu(1)
+                    topMargin: units.gu(1)
+                }
+                image: Image {
+                    anchors.fill: parent
+                    source: Qt.resolvedUrl(column_10)
+                    asynchronous: true
+                    fillMode: Image.PreserveAspectFit
+                }
+            }
+
+            Item {
+                id: status_update_content
+                anchors {
+                    left: avatarImage.right
+                    right: parent.right
+                    top: parent.top
+                    topMargin: units.gu(1)
+                    leftMargin: units.gu(1)
+                    bottomMargin: units.gu(1)
+                    rightMargin: units.gu(1)
+                }
+                height: childrenRect.height + units.gu(2)
+                Column {
+                    spacing: units.gu(1)
+                    anchors {
+                        left: parent.left;
+                        right: parent.right
+                        bottomMargin: units.gu(2)
+                    }
+                    Label {
+                        id: sender
+                        text: column_4
+                        fontSize: "medium"
+                        font.bold: true
+                        font.family: "Ubuntu"
+                        width: parent.width
+                    }
+                    Label {
+                        id: message
+                        text: column_9
+                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                        width: parent.width - units.gu(3)
+                        font.family: "Ubuntu"
+                    }
+                }
+                Row {
+                    anchors.right: parent.right
+                    anchors.rightMargin: units.gu(1)
+                    anchors.top: parent.top
+                    spacing: units.gu(1)
+
+                    Label {
+                        id: time
+                        text: friendsUtils.createTimeString(column_8)
+                        fontSize: "small"
+                        font.family: "Ubuntu"
+                    }
+                }
+            }
+            ThinDivider {}
+        }
+    }
+}
 
=== removed file 'examples/streamview.qml'
--- examples/streamview.qml	2013-03-08 15:19:38 +0000
+++ examples/streamview.qml	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
-import Dee 3.0
-import Friends 0.1
-
-MainView {
-    width: units.gu(50)
-    height: units.gu(100)
-
-    FriendsUtils {
-        id: friendsUtils
-    }
-
-    ListView {
-        id: listView
-        anchors {
-            fill: parent
-        }
-        snapMode: ListView.SnapToItem
-        verticalLayoutDirection: ListView.BottomToTop
-        cacheBuffer: parent.height
-
-        model: DeeListModel { name: "com.canonical.Friends.Streams" }
-
-        delegate: Item {
-            id: tile
-            height: status_update_content.height
-            width: parent.width
-            anchors {
-                margins: units.gu(1)
-            }
-
-            UbuntuShape {
-                id: avatarImage
-                radius: "medium"
-                height: units.dp(48)
-                width: units.dp(48)
-                anchors {
-                    left: parent.left
-                    top: parent.top
-                    leftMargin: units.gu(1)
-                    topMargin: units.gu(1)
-                }
-                image: Image {
-                    anchors.fill: parent
-                    source: Qt.resolvedUrl(column_8)
-                    asynchronous: true
-                    fillMode: Image.PreserveAspectFit
-                }
-            }
-
-            Item {
-                id: status_update_content
-                anchors {
-                    left: avatarImage.right
-                    right: parent.right
-                    top: parent.top
-                    topMargin: units.gu(1)
-                    leftMargin: units.gu(1)
-                    bottomMargin: units.gu(1)
-                    rightMargin: units.gu(1)
-                }
-                height: childrenRect.height + units.gu(2)
-                Column {
-                    spacing: units.gu(1)
-                    anchors {
-                        left: parent.left;
-                        right: parent.right
-                        bottomMargin: units.gu(2)
-                    }
-                    Label {
-                        id: sender
-                        text: column_2
-                        fontSize: "medium"
-                        font.bold: true
-                        font.family: "Ubuntu"
-                        width: parent.width
-                    }
-                    Label {
-                        id: message
-                        text: column_7
-                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                        width: parent.width - units.gu(3)
-                        font.family: "Ubuntu"
-                    }
-                }
-                Row {
-                    anchors.right: parent.right
-                    anchors.rightMargin: units.gu(1)
-                    anchors.top: parent.top
-                    spacing: units.gu(1)
-
-                    Label {
-                        id: time
-                        text: friendsUtils.createTimeString(column_6)
-                        fontSize: "small"
-                        font.family: "Ubuntu"
-                    }
-                }
-            }
-            ThinDivider {}
-        }
-    }
-}
 
=== modified file 'friends.pro'
--- friends.pro	2013-01-15 19:49:40 +0000
+++ friends.pro	2013-03-20 13:31:31 +0000
@@ -15,3 +15,6 @@
 dist.depends = distclean
 
 QMAKE_EXTRA_TARGETS += dist
+
+SUBDIRS += \
+    tests
 
=== modified file 'modules/Friends/plugin/friendsdispatcher.cpp'
--- modules/Friends/plugin/friendsdispatcher.cpp	2013-03-06 17:51:39 +0000
+++ modules/Friends/plugin/friendsdispatcher.cpp	2013-03-20 13:31:31 +0000
@@ -299,3 +299,11 @@
                                  &sendReplyCompleteCallback, (gpointer) this);
 }
 
+void FriendsDispatcherQml::refresh() const
+{
+    GError* error = NULL;
+    friends_dispatcher_refresh(m_dispatcher, &error);
+
+    if (error != NULL)
+        g_error_free (error);
+}
 
=== modified file 'modules/Friends/plugin/friendsdispatcher.h'
--- modules/Friends/plugin/friendsdispatcher.h	2013-02-14 15:26:37 +0000
+++ modules/Friends/plugin/friendsdispatcher.h	2013-03-20 13:31:31 +0000
@@ -46,6 +46,8 @@
     void likeAsync(const int& account_id, const QString& message_id) const;
     void unlike(const int& account_id, const QString& message_id) const;
     void unlikeAsync(const int& account_id, const QString& message_id) const;
+    void refresh() const;
+
 
 Q_SIGNALS:
     void uploadComplete(QString resultUrl, bool success, QString errorMessage);
 
=== modified file 'modules/Friends/plugin/friendsutils.cpp'
--- modules/Friends/plugin/friendsutils.cpp	2012-11-28 18:22:36 +0000
+++ modules/Friends/plugin/friendsutils.cpp	2013-03-20 13:31:31 +0000
@@ -17,9 +17,7 @@
 
 #include "friendsutils.h"
 
-#include <QGuiApplication>
 #include <QtQuick/QQuickView>
-#include <QtQuick/QQuickItem>
 
 #include <glib-object.h>
 
 
=== modified file 'modules/Friends/plugin/friendsutils.h'
--- modules/Friends/plugin/friendsutils.h	2012-11-28 18:22:36 +0000
+++ modules/Friends/plugin/friendsutils.h	2013-03-20 13:31:31 +0000
@@ -18,14 +18,9 @@
 #ifndef FRIENDSUTILS_H
 #define FRIENDSUTILS_H
 
-#include <QtCore/QObject>
-#include <QtQuick/QQuickView>
+#include <QObject>
 #include <friends.h>
 
-class QQuickItem;
-class QQmlEngine;
-class QJSEngine;
-
 class FriendsUtilsQml : public QObject
 {
     Q_OBJECT
 
=== modified file 'modules/Friends/plugin/plugin.cpp'
--- modules/Friends/plugin/plugin.cpp	2013-02-09 15:33:54 +0000
+++ modules/Friends/plugin/plugin.cpp	2013-03-20 13:31:31 +0000
@@ -14,25 +14,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtQml>
-#include <QtQml/QQmlContext>
-
-#include "plugin.h"
 #include "friendsutils.h"
 #include "friendsdispatcher.h"
-
-#include <glib-object.h>
-#include <friends.h>
+#include "streammodel.h"
+#include "plugin.h"
+
+#include <QDebug>
+#include <QQmlComponent>
+
 
 void FriendsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Friends"));
 
+    qDebug() << Q_FUNC_INFO << uri;
+
     qmlRegisterType<FriendsUtilsQml>(uri, 0, 1, "FriendsUtils");
     qmlRegisterType<FriendsDispatcherQml>(uri, 0, 1, "FriendsDispatcher");
+    qmlRegisterType<StreamModel>(uri, 0, 1, "StreamModel");
 }
 
-void FriendsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
-    QQmlExtensionPlugin::initializeEngine(engine, uri);
-}
 
=== modified file 'modules/Friends/plugin/plugin.h'
--- modules/Friends/plugin/plugin.h	2012-11-28 18:22:36 +0000
+++ modules/Friends/plugin/plugin.h	2013-03-20 13:31:31 +0000
@@ -17,8 +17,7 @@
 #ifndef FRIENDS_PLUGIN_H
 #define FRIENDS_PLUGIN_H
 
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlExtensionPlugin>
+#include <QQmlExtensionPlugin>
 
 class FriendsPlugin : public QQmlExtensionPlugin
 {
@@ -27,7 +26,7 @@
 
 public:
     void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
 };
+
 #endif // FRIENDS_PLUGIN_H
 
 
=== modified file 'modules/Friends/plugin/plugin.pro'
--- modules/Friends/plugin/plugin.pro	2013-02-09 15:33:54 +0000
+++ modules/Friends/plugin/plugin.pro	2013-03-20 13:31:31 +0000
@@ -2,26 +2,28 @@
 
 TEMPLATE = lib
 TARGET = ../Friends
-QT += qml quick
+QT += qml
 CONFIG += qt plugin no_keywords link_pkgconfig
-PKGCONFIG += friends-0.1 gobject-2.0
-
+PKGCONFIG += friends-0.1 gobject-2.0 libdee-qt5
 #comment in the following line to disable traces
 #DEFINES += QT_NO_DEBUG_OUTPUT
 
+QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+
 TARGET = $$qtLibraryTarget($$TARGET)
 uri = Friends
 
 HEADERS += plugin.h \
     friendsutils.h \
-    friendsdispatcher.h
+    friendsdispatcher.h \
+    streammodel.h
 
 SOURCES += plugin.cpp \
     friendsutils.cpp \
-    friendsdispatcher.cpp
+    friendsdispatcher.cpp \
+    streammodel.cpp
 
 # deployment rules for the plugin
 installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
 target.path = $$installPath
 INSTALLS += target
-
 
=== added file 'modules/Friends/plugin/streammodel.cpp'
--- modules/Friends/plugin/streammodel.cpp	1970-01-01 00:00:00 +0000
+++ modules/Friends/plugin/streammodel.cpp	2013-03-20 13:31:31 +0000
@@ -0,0 +1,176 @@
+#include <glib-object.h>
+#include "streammodel.h"
+#include <QDebug>
+#include <QProcessEnvironment>
+
+class StreamModelPrivate: public DeeListModel
+{
+    Q_DECLARE_PUBLIC(StreamModel)
+
+public:
+    StreamModelPrivate(StreamModel *model);
+    ~StreamModelPrivate();
+    static void onModelReady(GObject* parent, GParamSpec *pspec, StreamModelPrivate *q);
+    void updateResults(StreamModelPrivate *d);
+
+private:
+    mutable StreamModel *q_ptr;
+    QString streamId = NULL;
+    QString serviceId = NULL;
+    uint accountId = 0;
+    DeeModel* m_resultsModel;
+    DeeModel* m_sharedModel;
+    DeeModel* m_sortedModel;
+};
+
+StreamModelPrivate::StreamModelPrivate(StreamModel *model):
+    DeeListModel(model),
+    q_ptr(model)
+{
+    qDebug() << Q_FUNC_INFO;
+    QString modelName = "com.canonical.Friends.Streams";
+    /* read environment variables */
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    if (environment.contains(QLatin1String("FRIENDS_STREAMS_MODEL")))
+    {
+        modelName = environment.value(QLatin1String("FRIENDS_STREAMS_MODEL"));
+    }
+
+    qDebug() << "MODEL: " << modelName;
+
+    m_sharedModel = dee_shared_model_new (modelName.toUtf8());
+    m_resultsModel = m_sharedModel;
+    m_sortedModel = dee_sequence_model_new ();
+    g_signal_connect(m_sharedModel, "notify::synchronized", G_CALLBACK(onModelReady), this);
+}
+
+void
+StreamModelPrivate::onModelReady(GObject* parent __attribute__ ((unused)), GParamSpec *pspec, StreamModelPrivate *d)
+{
+    qDebug() << Q_FUNC_INFO;
+    DeeModel *model = (DeeModel*)parent;
+    DeeFilter _sort_filter;
+    dee_filter_new_collator (8, &_sort_filter);
+    d->m_sortedModel = dee_filter_model_new (model, &_sort_filter);
+    qDebug() << Q_FUNC_INFO << " " << dee_model_get_n_rows (d->m_sortedModel);
+    d->updateResults(d);
+}
+
+void StreamModelPrivate::updateResults(StreamModelPrivate *d)
+{
+    /* Only updateResults if the model is populated */
+    if (dee_model_get_n_rows (d->m_sortedModel) < 1) return;
+
+    if (d->streamId != NULL)
+    {
+        DeeFilter _key_filter;
+        dee_filter_new_for_key_column (3, d->streamId.toUtf8().data(), &_key_filter);
+        d->m_resultsModel = dee_filter_model_new (d->m_sortedModel, &_key_filter);
+    } else
+    {
+        GRegex *regex;
+        regex = g_regex_new ("^((?!reply_to).)*$", G_REGEX_FIRSTLINE, G_REGEX_MATCH_PARTIAL, NULL);
+        DeeFilter _regex_filter;
+        dee_filter_new_regex (3, regex, &_regex_filter);
+        g_regex_unref (regex);
+        d->m_resultsModel = dee_filter_model_new (d->m_sortedModel, &_regex_filter);
+    }
+    qDebug () << "STREAM: " << d->streamId << " ROWS: " << dee_model_get_n_rows (d->m_resultsModel);
+
+    if (d->serviceId != NULL)
+    {
+        DeeFilter _service_filter;
+        dee_filter_new_for_key_column (0, d->serviceId.toUtf8().data(), &_service_filter);
+        d->m_resultsModel = dee_filter_model_new (d->m_resultsModel, &_service_filter);
+    }
+    qDebug () << "SERVICE: " << d->serviceId << " ROWS: " << dee_model_get_n_rows (d->m_resultsModel);
+
+    if (d->accountId != 0)
+    {
+        DeeFilter _account_filter;
+        dee_filter_new_for_any_column (1, g_variant_new_uint64(d->accountId), &_account_filter);
+        d->m_resultsModel = dee_filter_model_new (d->m_resultsModel, &_account_filter);
+        qDebug () << "ACCOUNT: " << d->accountId << " ROWS: " << dee_model_get_n_rows (d->m_resultsModel);
+    }
+
+    q_ptr->setModel(m_resultsModel);
+    Q_EMIT q_ptr->streamChanged();
+}
+
+StreamModelPrivate::~StreamModelPrivate()
+{
+}
+
+StreamModel::StreamModel(DeeListModel *parent) :
+    DeeListModel(parent),
+    d_ptr(new StreamModelPrivate(this))
+{
+}
+
+StreamModel::~StreamModel()
+{
+}
+
+
+void StreamModel::classBegin()
+{
+}
+
+void StreamModel::componentComplete()
+{
+}
+
+void StreamModel::setStream(const QString& streamId)
+{
+    Q_D(StreamModel);
+    if (streamId == d->streamId) return;
+    d->streamId = streamId;
+    d->updateResults(d);
+}
+
+/*!
+ * \qmlproperty string StreamModel::stream
+ * If set, the model will include only this stream
+ */
+QString StreamModel::stream() const
+{
+    Q_D(const StreamModel);
+    return d->streamId;
+}
+
+void StreamModel::setService(const QString& serviceId)
+{
+    Q_D(StreamModel);
+    if (serviceId == d->serviceId) return;
+    d->serviceId = serviceId;
+    d->updateResults(d);
+}
+
+/*!
+ * \qmlproperty string StreamModel::service
+ * If set, the model will include only this service
+ */
+QString StreamModel::service() const
+{
+    Q_D(const StreamModel);
+    return d->serviceId;
+}
+
+void StreamModel::setAccount(uint account)
+{
+    Q_D(StreamModel);
+    if (account == d->accountId) return;
+    d->accountId = account;
+    d->updateResults(d);
+    qDebug() << "Account: " << account;
+}
+
+/*!
+ * \qmlproperty string StreamModel::account
+ * If set, the model will include only this account
+ */
+uint StreamModel::account() const
+{
+    Q_D(const StreamModel);
+    return d->accountId;
+}
 
=== added file 'modules/Friends/plugin/streammodel.h'
--- modules/Friends/plugin/streammodel.h	1970-01-01 00:00:00 +0000
+++ modules/Friends/plugin/streammodel.h	2013-03-20 13:31:31 +0000
@@ -0,0 +1,46 @@
+#ifndef StreamModel_H
+#define StreamModel_H
+
+
+#include <QObject>
+#include <QString>
+#include <QQmlParserStatus>
+#include <QQmlListProperty>
+#include "deelistmodel.h"
+#include <dee-1.0/dee.h>
+
+class StreamModelPrivate;
+class StreamModel : public DeeListModel, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QString stream READ stream WRITE setStream NOTIFY streamChanged)
+    Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged)
+    Q_PROPERTY(uint account READ account WRITE setAccount NOTIFY accountChanged)
+
+public:
+    explicit StreamModel(DeeListModel *parent = 0);
+    ~StreamModel();
+
+    void setStream(const QString& streamId);
+    QString stream() const;
+    void setService(const QString& serviceId);
+    QString service() const;
+    void setAccount(uint account);
+    uint account() const;
+    void classBegin();
+    void componentComplete();
+
+    
+Q_SIGNALS:
+    void streamChanged();
+    void serviceChanged();
+    void accountChanged();
+
+private:
+    StreamModelPrivate* const d_ptr;
+    Q_DECLARE_PRIVATE(StreamModel)
+
+};
+
+#endif // StreamModel_H
 
=== added directory 'tests'
=== added file 'tests/tests.pro'
--- tests/tests.pro	1970-01-01 00:00:00 +0000
+++ tests/tests.pro	2013-03-20 13:31:31 +0000
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    unit
 
=== added directory 'tests/unit'
=== added file 'tests/unit/main.cpp'
--- tests/unit/main.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/main.cpp	2013-03-20 13:31:31 +0000
@@ -0,0 +1,2 @@
+#include <QtQuickTest/quicktest.h>
+QUICK_TEST_MAIN(unit)
 
=== added file 'tests/unit/run.sh'
--- tests/unit/run.sh	1970-01-01 00:00:00 +0000
+++ tests/unit/run.sh	2013-03-20 13:31:31 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export FRIENDS_STREAMS_MODEL=com.canonical.Friends.TestSharedModel
+export QML2_IMPORT_PATH=../../modules
+
+xvfb-run -a dbus-test-runner -t friends-dispatcher -p --test \
+    --task-name FriendsService --ignore-return -t ./unit -m 120
 
=== added file 'tests/unit/tst_test.qml'
--- tests/unit/tst_test.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_test.qml	2013-03-20 13:31:31 +0000
@@ -0,0 +1,140 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Friends 0.1
+
+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
+
+Item {
+    // The objects
+
+    FriendsDispatcher {
+        id: friends
+    }
+
+    SignalSpy {
+        id: signalSpy
+        target: friends
+    }
+    TestCase {
+        name: "testFriendsDispatcher"
+
+        function test_features () {
+            var input = ["facebook"]
+            var res = friends.featuresForProtocol (input[0]);
+            compare (res, input);
+        }
+
+        function test_uploadForAccountAsync () {
+            var acct = 1;
+            var uri = "file:///tmp/foo.png";
+            var desc = "Something interesting to say";
+            signalSpy.clear ();
+            signalSpy.signalName = "onUploadComplete"
+            friends.uploadForAccountAsync (acct, uri, desc)
+            signalSpy.wait ();
+            compare(1, signalSpy.count, "onUploadComplete emitted");
+        }
+
+        function test_sendforAccountAsync () {
+            var acct = 1;
+            var msg = "Something interesting to say";
+            signalSpy.clear ();
+            signalSpy.signalName = "onSendComplete"
+            friends.sendForAccountAsync (acct, msg)
+            signalSpy.wait ();
+            compare(1, signalSpy.count, "onSendComplete emitted");
+        }
+
+        function test_sendAsync () {
+            var msg = "Something interesting to say";
+            signalSpy.clear ();
+            signalSpy.signalName = "onSendComplete"
+            friends.sendAsync (msg)
+            signalSpy.wait ();
+            compare(1, signalSpy.count, "onSendComplete emitted");
+        }
+
+        function test_sendReplyAsync () {
+            var acct = 1;
+            var msgId = "10";
+            var msg = "Something interesting to say";
+            signalSpy.clear ();
+            signalSpy.signalName = "onSendComplete"
+            friends.sendReplyAsync (acct, msgId, msg)
+            signalSpy.wait ();
+            compare(1, signalSpy.count, "onSendComplete emitted");
+        }
+
+        function test_retweetAsync () {
+            var acct = 1;
+            var msgId = "10";
+            signalSpy.clear ();
+            signalSpy.signalName = "onRetweetComplete"
+            friends.retweetAsync (acct, msgId)
+            signalSpy.wait ();
+            compare(1, signalSpy.count, "onRetweetComplete emitted");
+        }
+
+        function test_likeAsync () {
+            var acct = 1;
+            var msgId = "10";
+            signalSpy.clear ();
+            signalSpy.signalName = "onLikeComplete"
+            friends.likeAsync (acct, msgId)
+            signalSpy.wait ();
+            compare(1, signalSpy.count, "onLikeComplete emitted");
+        }
+
+        function test_unlikeAsync () {
+            var acct = 1;
+            var msgId = "10";
+            signalSpy.clear ();
+            signalSpy.signalName = "onUnlikeComplete"
+            friends.unlikeAsync (acct, msgId)
+            signalSpy.wait ();
+            compare(1, signalSpy.count, "onUnlikeComplete emitted");
+        }
+    }
+
+    StreamModel {
+        id: streamModel
+    }
+    
+    TestCase {
+        name: "testStreamModel"
+        
+        function init() {
+            console.debug(">> init");
+            console.debug("<< init");    
+        }
+        
+        function cleanup() {
+            console.debug(">> cleanup");
+            console.debug("<< cleanup");
+        }
+        
+        function initTestCase() {
+            console.debug(">> initTestCase");
+            console.debug("<< initTestCase");
+        }
+        
+        function cleanupTestCase() {
+            console.debug(">> cleanupTestCase");
+            console.debug("<< cleanupTestCase");
+        }
+
+        function test_streamModelStream() {
+            streamModel.stream = "messages";
+            compare(0, streamModel.count, "Test StreamModel row count filtered by stream");
+        }
+
+        function test_streamModelService() {
+            streamModel.service = "twitter";
+            compare(0, streamModel.count, "Test StreamModel row count filtered by service");
+        }
+        function test_streamModelAccount() {
+            streamModel.account = 1;
+            compare(0, streamModel.count, "Test StreamModel row count filtered by account");
+        }
+    }
+}
 
=== added file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/unit.pro	2013-03-20 13:31:31 +0000
@@ -0,0 +1,13 @@
+TEMPLATE = app
+QT += qml quick qmltest
+CONFIG += no_keywords
+
+TARGET = unit
+SOURCES += main.cpp
+
+OTHER_FILES += $$system(ls *.qml)
+check.commands = "sh run.sh"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check
+
+#system(cp $$PWD/*.qml $$OUT_PWD)