Merge lp:~webapps/unity-js-scopes/cleanup-bindings into lp:unity-js-scopes

[Marcus Tomlinson]

Bindings cleanup and fixes for bug #1477640, bug #1480409, and bug #1482131

=== modified file 'README.md'
--- README.md	2015-09-30 19:54:57 +0000
+++ README.md	2015-10-09 07:21:04 +0000
@@ -15,6 +15,5 @@
 
   - Desktop
 
-export NODE_PATH=`pwd`/
-unity-scope-tool `pwd`/examples/simple/simple.ini
+NODE_PATH=`pwd`/ unity-scope-tool `pwd`/examples/simple/simple.ini
 

=== modified file 'debian/control'
--- debian/control	2015-10-01 13:09:54 +0000
+++ debian/control	2015-10-09 07:21:04 +0000
@@ -8,7 +8,6 @@
                pkg-config,
                g++,
                libboost-filesystem-dev,
-               libnet-cpp-dev,
                libunity-scopes-dev,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/unity-js-scopes

=== removed file 'doc/index.html'
=== modified file 'examples/simple-click/src/js-scope.webapps_js-scope.js'
--- examples/simple-click/src/js-scope.webapps_js-scope.js	2015-09-30 11:50:25 +0000
+++ examples/simple-click/src/js-scope.webapps_js-scope.js	2015-10-09 07:21:04 +0000
@@ -36,7 +36,7 @@
                         + scopes.self.scope_config)
         },
         search: function(canned_query, metadata) {
-            return scopes.lib.new_search_query(
+            return scopes.lib.new_SearchQuery(
                 canned_query,
                 metadata,
                 // run
@@ -65,7 +65,7 @@
                         response.on('end', function() {
                             r = JSON.parse(res);
                             for (i = 0; i < r.length; i++) {
-                                var categorised_result = scopes.lib.new_categorised_result(category);
+                                var categorised_result = new scopes.lib.categorised_result(category);
                                 categorised_result.set_uri(r[i].url);
                                 categorised_result.set_title(r[i].title);
                                 categorised_result.set_art(r[i].imageUrl);
@@ -87,14 +87,14 @@
                 });
         },
         preview: function(result, action_metadata) {
-            return scopes.lib.new_preview_query(
+            return scopes.lib.new_PreviewQuery(
                 result,
                 action_metadata,
                 // run
                 function(preview_reply) {
-                    var layout1col = scopes.lib.new_column_layout(1);
-                    var layout2col = scopes.lib.new_column_layout(2);
-                    var layout3col = scopes.lib.new_column_layout(3);
+                    var layout1col = new scopes.lib.column_layout(1);
+                    var layout2col = new scopes.lib.column_layout(2);
+                    var layout3col = new scopes.lib.column_layout(3);
                     layout1col.add_column(["image", "header", "summary"]);
 
                     layout2col.add_column(["image"]);
@@ -106,14 +106,14 @@
 
                     preview_reply.register_layout([layout1col, layout2col, layout3col]);
 
-                    var header = scopes.lib.new_preview_widget("header", "header");
+                    var header = scopes.lib.new_PreviewWidget("header", "header");
                     header.add_attribute_mapping("title", "title");
                     header.add_attribute_mapping("subtitle", "subtitle");
 
-                    var image = scopes.lib.new_preview_widget("image", "image");
+                    var image = scopes.lib.new_PreviewWidget("image", "image");
                     image.add_attribute_mapping("source", "art");
 
-                    var description = scopes.lib.new_preview_widget("summary", "text");
+                    var description = scopes.lib.new_PreviewWidget("summary", "text");
                     description.add_attribute_mapping("text", "description");
 
                     preview_reply.push([image, header, description ]);

=== modified file 'examples/simple/simple.js'
--- examples/simple/simple.js	2015-07-30 12:28:09 +0000
+++ examples/simple/simple.js	2015-10-09 07:21:04 +0000
@@ -32,7 +32,7 @@
                         + scopes.self.scope_config)
         },
         search: function(canned_query, metadata) {
-            return scopes.lib.new_search_query(
+            return scopes.lib.new_SearchQuery(
                 canned_query,
                 metadata,
                 // run
@@ -40,10 +40,14 @@
                     var qs =
                         canned_query.query_string();
                     var category =
-                        search_reply.register_category("simple", "hello world from js", "");
-                    
+                        search_reply.register_category(
+                            "simple",
+                            "hello world from js",
+                            "",
+                            null);
+
                     var categorised_result =
-                        scopes.lib.new_categorised_result(category);
+                        new scopes.lib.categorised_result(category);
                     categorised_result.set_uri("http://www.ubuntu.com");
                     categorised_result.set_title("'" + qs + "'");
                     

=== added directory 'examples/soundcloud'
=== added file 'examples/soundcloud/logo.png'
Binary files examples/soundcloud/logo.png	1970-01-01 00:00:00 +0000 and examples/soundcloud/logo.png	2015-10-09 07:21:04 +0000 differ
=== added file 'examples/soundcloud/soundcloud.ini'
--- examples/soundcloud/soundcloud.ini	1970-01-01 00:00:00 +0000
+++ examples/soundcloud/soundcloud.ini	2015-10-09 07:21:04 +0000
@@ -0,0 +1,13 @@
+[ScopeConfig]
+ScopeRunner=/usr/bin/unity-js-scopes-launcher %S %R
+DisplayName = Soundcloud JS Scope
+Description = Soundcloud JS scope
+Author = WebApps
+Icon = icon.png
+SearchHint = Search
+
+[Appearance]
+PageHeader.Logo = logo.png
+PageHeader.ForegroundColor = white
+PageHeader.Background = color:///black
+ShapeImages = false

=== added file 'examples/soundcloud/soundcloud.js'
--- examples/soundcloud/soundcloud.js	1970-01-01 00:00:00 +0000
+++ examples/soundcloud/soundcloud.js	2015-10-09 07:21:04 +0000
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+var http = require('http')
+var scopes = require('unity-js-scopes')
+
+// TODO: LANG specific host
+var query_scheme = "https://";
+var query_host = "api.soundcloud.com";
+var query_path_tracks = "/tracks.json?client_id={1}&q={2}";
+
+function SoundCloudClient() {
+}
+SoundCloudClient.prototype = {
+    // TODO use promises
+    tracks: function(search_query, callback) {
+        var options = {
+            host: query_host,
+            path: query_path_tracks.
+                replace("{1}", "apigee").
+                replace("{2}", encodeURIComponent(search_query))
+        };
+        request_callback = function(http_response) {
+            var result_data = '';
+
+            http_response.on('data', function(chunk) {
+                result_data += chunk;
+            });
+            http_response.on('end', function() {
+                var results;
+
+                try {
+                    results = JSON.parse(result_data);
+                } catch (e) { }
+
+                if (! results
+                    || ! results.length) {
+                    callback([]);
+                    return;
+                }
+
+                var track_results = [];
+                for (var i = 0;
+                     i < results.length;
+                     i++) {
+                    track_results.push({
+                        id: results[i].id,
+                        art: results[i].artwork_url ? results[i].artwork_url : "",
+                        stream_url: results[i].stream_url,
+                        uri: results[i].uri,
+                        description: results[i].description,
+                        genre: results[i].genre,
+                        artist: {
+                            id: results[i].user.id,
+                            username: results[i].user.username,
+                            search_url: results[i].user.uri
+                        }
+                    });
+                }
+                callback(track_results);
+            });
+        }
+        http.request(options, request_callback).end();
+    }
+};
+
+var client = new SoundCloudClient()
+
+function scope_result_from_search_result(
+    category,
+    result) {
+
+    var categorised_result =
+        new scopes.lib.categorised_result(category);
+
+    categorised_result.set_uri(result.uri)
+    categorised_result.set_title(result.description);
+    categorised_result.set_art(result.art);
+
+//    categorised_result.set("artist", result.artist.username);
+//    categorised_result.set("stream", result.artist.stream_url);
+
+    return categorised_result
+}
+
+function on_search(canned_query, metadata) {
+    var category_description = "{ \
+      \"schema-version\": 1, \
+      \"template\": { \
+        \"category-layout\": \"grid\", \
+        \"card-layout\": \"horizontal\", \
+        \"card-size\": \"large\" \
+      }, \
+      \"components\": { \
+        \"title\": \"title\", \
+        \"art\" : { \
+          \"field\": \"art\" \
+        }, \
+        \"subtitle\": \"artist\" \
+      } \
+    }";
+
+    return scopes.lib.new_SearchQuery(
+        canned_query,
+        metadata,
+        // Query.run
+        function(search_reply) {
+            var category_renderer =
+                new scopes.lib.category_renderer(category_description);
+            var category =
+                search_reply.register_category(
+                    "tracks",
+                    "",
+                    "",
+                    category_renderer);
+            
+            var query_string =
+                canned_query.query_string().trim();
+
+            if (query_string &&
+                query_string.length &&
+                query_string.length != 0) {
+                client.tracks(query_string, function(results) {
+                    for (var i in results) {
+                        var cr = scope_result_from_search_result(
+                            category,
+                            results[i]
+                        );
+                        search_reply.push(cr);
+                    }
+                    search_reply.finished();
+                });
+            }
+            else {
+                client.tracks("blur cover", function(results) {
+                    for (var i in results) {
+                        var cr = scope_result_from_search_result(
+                            category,
+                            results[i]
+                        );
+                        search_reply.push(cr);
+                    }
+                    search_reply.finished();
+                });
+            }
+        },
+        // cancelled
+        function() {
+            console.log('Result query cancelled')
+        });
+};
+
+function on_preview(result, action_metadata) {
+    return scopes.lib.new_PreviewQuery(
+        result,
+        action_metadata,
+        // run
+        function(preview_reply) {
+            var r = this.result();
+
+            var layout1col = new scopes.lib.column_layout(1)
+            layout1col.add_column(["imageId", "headerId", "actionsId"])
+
+            var layout2col = new scopes.lib.column_layout(2)
+            layout2col.add_column(["imageId"])
+            layout2col.add_column(["headerId", "actionsId"])
+
+            preview_reply.register_layout([layout1col, layout2col]);
+
+            var header_widget = scopes.lib.new_PreviewWidget("headerId", "header");
+            header_widget.add_attribute_mapping("title", "title");
+            header_widget.add_attribute_mapping("subtitle", "subtitle");
+
+            var art_widget = scopes.lib.new_PreviewWidget("imageId", "image");
+            art_widget.add_attribute_mapping("source", "art");
+
+            var actions_widget = scopes.lib.new_PreviewWidget("actionsId", "actions");
+            actions_widget.add_attribute_value(
+                "actions",
+                {
+                    "id": "open",
+                    "label": "Open",
+                    // TODO fix
+//                    "uri": r.get("uri")
+                }
+            );
+            preview_reply.push([header_widget, art_widget, actions_widget])
+        },
+        // cancelled
+        function() {
+            console.log('Result preview cancelled')
+        });
+};
+
+scopes.self.initialize(
+    {}
+    ,
+    {
+        run: function() {
+            console.log('Running...')
+        },
+        start: function(scope_id) {
+            console.log('Starting scope id: '
+                        + scope_id
+                        + ', '
+                        + scopes.self.scope_config)
+        },
+        search: on_search,
+        preview: on_preview,
+    }
+);

=== modified file 'src/bindings/CMakeLists.txt'
--- src/bindings/CMakeLists.txt	2015-09-29 11:57:36 +0000
+++ src/bindings/CMakeLists.txt	2015-10-09 07:21:04 +0000
@@ -59,7 +59,6 @@
 pkg_check_modules(
   SCOPE
   libunity-scopes>=0.6.0
-  net-cpp>=1.1.0
   REQUIRED
   )
 

=== modified file 'src/bindings/index.js'
--- src/bindings/index.js	2015-07-29 08:31:17 +0000
+++ src/bindings/index.js	2015-10-09 07:21:04 +0000
@@ -70,22 +70,19 @@
         }
     },
     get scope_directory() {
-        return this._base.get_scope_directory();
+        return this._base.scope_directory();
     },
     get cache_directory() {
-        return this._base.get_cache_directory();
+        return this._base.cache_directory();
     },
     get tmp_directory() {
-        return this._base.get_tmp_directory();
+        return this._base.tmp_directory();
     },
     get registry() {
         return null
     },
     get settings() {
-        return null
-    },
-    get settings() {
-        return null
+        return this._base.settings();
     },
     get scope_config() {
         return this._scope_binding.scope_config();

=== modified file 'src/bindings/src/action-metadata.cc'
--- src/bindings/src/action-metadata.cc	2015-06-23 19:47:08 +0000
+++ src/bindings/src/action-metadata.cc	2015-10-09 07:21:04 +0000
@@ -18,14 +18,23 @@
 
 #include "action-metadata.h"
 
-ActionMetaData::ActionMetaData(unity::scopes::ActionMetadata const &metadata)
-  : metadata_(metadata) {
+ActionMetaData::ActionMetaData(unity::scopes::ActionMetadata const &action_metadata)
+  : unity::scopes::ActionMetadata(action_metadata) {
+}
+
+ActionMetaData::ActionMetaData(std::string const &locale,
+                               std::string const &form_factor)
+  : unity::scopes::ActionMetadata(locale, form_factor) {
 }
 
 ActionMetaData::~ActionMetaData() {
 }
 
-const unity::scopes::ActionMetadata&
-ActionMetaData::get_action_metadata() const {
-  return metadata_;
+unity::scopes::Variant ActionMetaData::get(const std::string& key) {
+  return (*this)[key];
+}
+
+void ActionMetaData::set(const std::string& key,
+                         const unity::scopes::Variant& val) {
+  (*this)[key] = val;;
 }

=== modified file 'src/bindings/src/action-metadata.h'
--- src/bindings/src/action-metadata.h	2015-06-23 19:47:08 +0000
+++ src/bindings/src/action-metadata.h	2015-10-09 07:21:04 +0000
@@ -23,17 +23,17 @@
 
 #include <v8-cpp.h>
 
-class ActionMetaData
+class ActionMetaData : public unity::scopes::ActionMetadata
 {
  public:
-  ActionMetaData(unity::scopes::ActionMetadata const &metadata);
+  ActionMetaData(unity::scopes::ActionMetadata const &action_metadata);
+  ActionMetaData(std::string const &locale,
+                 std::string const &form_factor);
   ~ActionMetaData();
 
-  const unity::scopes::ActionMetadata& get_action_metadata() const;
-
- private:
-
-  unity::scopes::ActionMetadata const &metadata_;
+  // unity::scopes::ActionMetadata extra v8 bindings
+  unity::scopes::Variant get(const std::string& key);
+  void set(const std::string& key, const unity::scopes::Variant& val);
 };
 
 #endif // _UNITY_JS_ACTION_METADATA_H_

=== added file 'src/bindings/src/activation-query-proxy.cc'
--- src/bindings/src/activation-query-proxy.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/activation-query-proxy.cc	2015-10-09 07:21:04 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#include "activation-query-proxy.h"
+
+#include <unity/scopes/Result.h>
+#include <unity/scopes/ActionMetadata.h>
+
+ActivationQueryProxy::ActivationQueryProxy(
+      std::shared_ptr<unity::scopes::ActivationQueryBase> backend)
+  : unity::scopes::ActivationQueryBase(backend->result(), backend->action_metadata()),
+    backend_(backend) {
+}
+
+unity::scopes::ActivationResponse ActivationQueryProxy::activate() {
+  return backend_->activate();
+}
+
+unity::scopes::Result ActivationQueryProxy::result() const {
+  return backend_->result();
+}
+
+unity::scopes::ActionMetadata ActivationQueryProxy::action_metadata() const {
+  return backend_->action_metadata();
+}
+
+std::string ActivationQueryProxy::widget_id() const {
+  return backend_->widget_id();
+}
+
+std::string ActivationQueryProxy::action_id() const {
+  return backend_->action_id();
+}
+
+void ActivationQueryProxy::cancelled() {
+  backend_->cancelled();
+}
+
+bool ActivationQueryProxy::valid() const {
+  return backend_->valid();
+}
+
+unity::scopes::VariantMap ActivationQueryProxy::settings() const {
+  return backend_->settings();
+}

=== added file 'src/bindings/src/activation-query-proxy.h'
--- src/bindings/src/activation-query-proxy.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/activation-query-proxy.h	2015-10-09 07:21:04 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#ifndef _UNITY_JS_ACTIVATION_QUERY_PROXY_H_
+#define _UNITY_JS_ACTIVATION_QUERY_PROXY_H_
+
+#include <unity/scopes/ActivationQueryBase.h>
+
+#include <v8-cpp.h>
+
+
+class ActivationQueryProxy : public unity::scopes::ActivationQueryBase
+{
+ public:
+  ActivationQueryProxy(
+      std::shared_ptr<unity::scopes::ActivationQueryBase> backend);
+
+  unity::scopes::ActivationResponse activate() override;
+  unity::scopes::Result result() const;
+  unity::scopes::ActionMetadata action_metadata() const;
+  std::string widget_id() const;
+  std::string action_id() const;
+  void cancelled() override;
+  bool valid() const;
+  unity::scopes::VariantMap settings() const;
+
+  // TODO handle the subsearch override functions
+
+ private:
+  std::shared_ptr<unity::scopes::ActivationQueryBase> backend_;
+};
+
+#endif // _UNITY_JS_ACTIVATION_QUERY_PROXY_H_
+
+

=== added file 'src/bindings/src/activation-query.cc'
--- src/bindings/src/activation-query.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/activation-query.cc	2015-10-09 07:21:04 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#include "activation-query.h"
+
+#include "event_queue.h"
+
+ActivationQuery::ActivationQuery(
+      unity::scopes::Result const& result,
+      unity::scopes::ActionMetadata const& metadata,
+      const v8::Local<v8::Function> &cancelled_callback)
+    : unity::scopes::ActivationQueryBase(result, metadata),
+      isolate_(v8::Isolate::GetCurrent()),
+      cancelled_callback_(v8::Isolate::GetCurrent(), cancelled_callback) {
+}
+
+ActivationQuery::~ActivationQuery() {
+  if (!cancelled_callback_.IsEmpty()) {
+    cancelled_callback_.Reset();
+  }
+}
+
+void ActivationQuery::cancelled() {
+  if (cancelled_callback_.IsEmpty()) {
+    return;
+  }
+
+  EventQueue::instance().run(isolate_, [this]
+  {
+    v8::Local<v8::Function> cancelled_callback =
+        v8cpp::to_local<v8::Function>(isolate_, cancelled_callback_);
+
+    v8cpp::call_v8_with_receiver(
+        isolate_,
+        v8cpp::to_v8(isolate_, shared_from_this()),
+        cancelled_callback
+    );
+  });
+}
+
+v8::Local<v8::Value>
+ActivationQuery::activate(v8::FunctionCallbackInfo<v8::Value> const& args) {
+  return v8cpp::to_v8(isolate_, nullptr);
+  //   unity::scopes::ActivationResponse 
+}
+

=== added file 'src/bindings/src/activation-query.h'
--- src/bindings/src/activation-query.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/activation-query.h	2015-10-09 07:21:04 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#ifndef _UNITY_JS_ACTIVATION_QUERY_H_
+#define _UNITY_JS_ACTIVATION_QUERY_H_
+
+#include <unity/scopes/ActivationQueryBase.h>
+
+#include <v8-cpp.h>
+
+class ActivationQuery : public unity::scopes::ActivationQueryBase,
+  public std::enable_shared_from_this<ActivationQuery>
+{
+ public:
+  ActivationQuery(unity::scopes::Result const& result,
+                  unity::scopes::ActionMetadata const& metadata,
+                  const v8::Local<v8::Function> &cancelled_callback);
+  ~ActivationQuery() override;
+
+  // v8 bindings
+  v8::Local<v8::Value> activate(v8::FunctionCallbackInfo<v8::Value> const& args);
+
+  // PreviewQueryBase implementation
+  void cancelled() override;
+
+ private:
+  v8::Isolate* isolate_;
+
+  v8::Persistent<v8::Function> cancelled_callback_;
+};
+
+#endif // _UNITY_JS_ACTIVATION_QUERY_H_

=== modified file 'src/bindings/src/addon.cc'
--- src/bindings/src/addon.cc	2015-08-27 11:46:23 +0000
+++ src/bindings/src/addon.cc	2015-10-09 07:21:04 +0000
@@ -20,18 +20,22 @@
 
 #include <stdexcept>
 
+#include <unity/scopes/ActionMetadata.h>
+#include <unity/scopes/CannedQuery.h>
+#include <unity/scopes/Category.h>
+#include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/CategoryRenderer.h>
+#include <unity/scopes/Result.h>
+#include <unity/scopes/SearchReply.h>
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 
 #include <node.h>
 
+#include "activation-query.h"
 #include "scope-base.h"
 #include "scope.h"
-#include "canned-query.h"
-#include "category.h"
-#include "categorised-result.h"
-#include "category-renderer.h"
-#include "column-layout.h"
 #include "search-query.h"
 #include "search-reply.h"
 #include "search-metadata.h"
@@ -46,19 +50,43 @@
   return new JavascriptScopeRuntime(runtime_config);
 }
 
-v8::Handle<v8::Object> new_search_query(
+v8::Handle<v8::Object> get_scopes_runtime_version() {
+  v8::Handle<v8::Object> o =
+    v8::Object::New(v8::Isolate::GetCurrent());
+
+  int major, minor, micro;
+  unity::scopes::ScopeBase::runtime_version(major, minor, micro);
+
+  o->Set(v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), "major"),
+         v8::Integer::New(v8::Isolate::GetCurrent(), major));
+  o->Set(v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), "minor"),
+         v8::Integer::New(v8::Isolate::GetCurrent(), minor));
+  o->Set(v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), "micro"),
+         v8::Integer::New(v8::Isolate::GetCurrent(), micro));
+
+  return o;
+}
+
+std::shared_ptr<unity::scopes::CategoryRenderer>
+new_category_renderer_from_file(const std::string& file_path) {
+  return std::shared_ptr<unity::scopes::CategoryRenderer>(
+      new unity::scopes::CategoryRenderer(
+          unity::scopes::CategoryRenderer::from_file(file_path)));
+}
+
+v8::Handle<v8::Object> new_SearchQuery(
       v8::FunctionCallbackInfo<v8::Value> const& args) {
   if (args.Length() != 4) {
     throw std::runtime_error("Invalid number of arguments");
   }
 
-  CannedQuery *c =
-    v8cpp::from_v8<CannedQuery*>(
+  std::shared_ptr<unity::scopes::CannedQuery> c =
+    v8cpp::from_v8<std::shared_ptr<unity::scopes::CannedQuery>>(
         v8::Isolate::GetCurrent(),
         args[0]->ToObject());
 
-  SearchMetaData *s =
-    v8cpp::from_v8<SearchMetaData*>(
+  std::shared_ptr<SearchMetaData> s =
+    v8cpp::from_v8<std::shared_ptr<SearchMetaData>>(
         v8::Isolate::GetCurrent(),
         args[1]->ToObject());
 
@@ -75,42 +103,31 @@
   v8::Local<v8::Function> cancelled_callback =
     v8::Handle<v8::Function>::Cast(args[3]);
 
-  SearchQuery *sq =
+  std::shared_ptr<SearchQuery> sq(
     new SearchQuery(
-        c->get_canned_query(),
+        *c,
         static_cast<const unity::scopes::SearchMetadata&>(*s),
         run_callback,
-        cancelled_callback);
+        cancelled_callback)
+  );
 
   return v8cpp::to_v8(v8::Isolate::GetCurrent(), sq);
 }
 
-v8::Handle<v8::Object> new_category_renderer(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    throw std::runtime_error("Invalid number of arguments");
-  }
-  if (!args[0]->IsString()) {
-    throw std::runtime_error("Invalid arguments types");
-  }
-
-  std::string json_text = *(v8::String::Utf8Value(args[0]->ToString()));
-
-  CategoryRenderer* category_renderer = new CategoryRenderer(json_text);
-
-  return v8cpp::to_v8(v8::Isolate::GetCurrent(), category_renderer);
-}
-
-v8::Handle<v8::Object> new_preview_query(v8::FunctionCallbackInfo<v8::Value> const& args) {
+v8::Handle<v8::Object> new_PreviewQuery(v8::FunctionCallbackInfo<v8::Value> const& args) {
   if (args.Length() != 4) {
     throw std::runtime_error("Invalid number of arguments");
   }
 
-  Result *r =
-    v8cpp::from_v8<Result*>(v8::Isolate::GetCurrent(), args[0]->ToObject());
+  std::shared_ptr<Result> r =
+    v8cpp::from_v8<std::shared_ptr<Result>>(
+        v8::Isolate::GetCurrent(),
+        args[0]->ToObject());
 
-  ActionMetaData *a =
-    v8cpp::from_v8<ActionMetaData*>(v8::Isolate::GetCurrent(), args[1]->ToObject());
+  std::shared_ptr<unity::scopes::ActionMetadata> a =
+    v8cpp::from_v8<std::shared_ptr<unity::scopes::ActionMetadata>>(
+        v8::Isolate::GetCurrent(),
+        args[1]->ToObject());
 
   if (!r || !a) {
     throw std::runtime_error("Invalid arguments types");
@@ -130,23 +147,25 @@
   v8::Local<v8::Function> cancelled_callback =
     v8::Handle<v8::Function>::Cast(args[3]);
 
-  PreviewQuery *pq =
-    new PreviewQuery(
-        r->get_result(),
-        a->get_action_metadata(),
+  std::shared_ptr<PreviewQuery> pq(
+      new PreviewQuery(
+        *r,
+        *a,
         run_callback,
-        cancelled_callback);
+        cancelled_callback));
+
   return v8cpp::to_v8(v8::Isolate::GetCurrent(), pq);
 }
 
-v8::Handle<v8::Object> new_preview_widget(v8::FunctionCallbackInfo<v8::Value> const& args) {
+v8::Handle<v8::Object> new_PreviewWidget(
+      v8::FunctionCallbackInfo<v8::Value> const& args) {
   if (args.Length() < 1 || args.Length() > 2) {
     throw std::runtime_error("Invalid number of arguments");
   }
 
   if (args.Length() == 2) {
     if (!args[0]->IsString() || !args[1]->IsString()) {
-      throw std::runtime_error("Invalid arguments types");
+      throw std::runtime_error("Invalid arguments types: should be id, widget_type");
     }
     std::string id =
       *(v8::String::Utf8Value(args[0]->ToString()));
@@ -173,34 +192,28 @@
   return v8cpp::to_v8(v8::Isolate::GetCurrent(), preview_widget);
 }
 
-v8::Handle<v8::Object> new_categorised_result(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    throw std::runtime_error("Invalid number of arguments");
-  }
-
-  Category *c =
-    v8cpp::from_v8<Category*>(v8::Isolate::GetCurrent(),
-                             args[0]->ToObject());
-
-  if (!c) {
-    throw std::runtime_error("Invalid arguments types");
-  }
-
-  CategorisedResult *cr = new CategorisedResult(c);
-
-  return v8cpp::to_v8(v8::Isolate::GetCurrent(), cr);
-}
-
-ColumnLayout* new_column_layout(int num_of_columns)
-{
-  return new ColumnLayout(num_of_columns);
-}
-
 void InitAll(v8::Handle<v8::Object> exports)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
 
+    v8cpp::Class<unity::scopes::VariantMap> variant_map(isolate);
+    v8cpp::Class<unity::scopes::VariantArray> variant_array(isolate);
+
+    // TODO: which enum should be bound
+    v8cpp::Class<unity::scopes::Variant> variant(isolate);
+    variant
+      .add_method("get_int", &unity::scopes::Variant::get_int)
+      .add_method("get_double", &unity::scopes::Variant::get_double)
+      .add_method("get_bool", &unity::scopes::Variant::get_bool)
+      .add_method("get_string", &unity::scopes::Variant::get_string)
+      .add_method("get_dict", &unity::scopes::Variant::get_dict)
+      .add_method("get_array", &unity::scopes::Variant::get_array)
+      .add_method("is_null", &unity::scopes::Variant::is_null)
+      .add_method("which", &unity::scopes::Variant::which)
+      .add_method("serialize_json", &unity::scopes::Variant::serialize_json)
+      .add_method("deserialize_json", &unity::scopes::Variant::deserialize_json)
+      .add_method("which", &unity::scopes::Variant::which);
+
     v8cpp::Class<JavascriptScopeRuntime> js_scope(isolate);
     js_scope
       .add_method("scope_base", &JavascriptScopeRuntime::scope_base)
@@ -209,83 +222,162 @@
 
     v8cpp::Class<ScopeBase> scope_base(isolate);
     scope_base
+      .add_inheritance<unity::scopes::ScopeBase>()
       .add_method("onstart", &ScopeBase::onstart)
       .add_method("onstop", &ScopeBase::onstop)
       .add_method("onrun", &ScopeBase::onrun)
       .add_method("onsearch", &ScopeBase::onsearch)
       .add_method("onpreview", &ScopeBase::onpreview)
-      .add_method("get_scope_directory", &ScopeBase::get_scope_directory)
-      .add_method("get_cache_directory", &ScopeBase::get_cache_directory)
-      .add_method("get_tmp_directory", &ScopeBase::get_tmp_directory);
-
-    v8cpp::Class<ActionMetaData> action_metadata(isolate);
-
-    v8cpp::Class<Category> category(isolate);
+      // unity::scopes::ScopeBase
+      .add_method("scope_directory", &unity::scopes::ScopeBase::scope_directory)
+      .add_method("cache_directory", &unity::scopes::ScopeBase::cache_directory)
+      .add_method("tmp_directory", &unity::scopes::ScopeBase::tmp_directory)
+      .add_method("settings", &unity::scopes::ScopeBase::settings)
+      .add_method("registry", &unity::scopes::ScopeBase::registry);
+
+    v8cpp::Class<unity::scopes::ActionMetadata> action_metadata(isolate);
+    action_metadata
+      // unity::scopes::ActionMetadata
+      .add_method("set_scope_data", &unity::scopes::ActionMetadata::set_scope_data)
+      .add_method("scope_data", &unity::scopes::ActionMetadata::scope_data)
+      .add_method("set_hint", &unity::scopes::ActionMetadata::set_hint)
+      .add_method("hints", &unity::scopes::ActionMetadata::hints)
+      .add_method("contains_hint", &unity::scopes::ActionMetadata::contains_hint)
+      // unity::scopes::QueryMetadata
+      .add_method("locale", &unity::scopes::QueryMetadata::locale)
+      .add_method("form_factor", &unity::scopes::QueryMetadata::form_factor)
+      .add_method("set_internet_connectivity", &unity::scopes::QueryMetadata::set_internet_connectivity)
+      .add_method("internet_connectivity", &unity::scopes::QueryMetadata::internet_connectivity);
+
+    v8cpp::Class<ActivationQuery> activation_query(isolate);
+    activation_query
+      .add_inheritance<unity::scopes::ActivationQueryBase>()
+      // ActivationQuery
+      .add_method("activate", &ActivationQuery::activate)
+      // ActivationQueryBase
+      .add_method("result", &unity::scopes::ActivationQueryBase::result)
+      .add_method("action_metadata", &unity::scopes::ActivationQueryBase::action_metadata)
+      .add_method("widget_id", &unity::scopes::ActivationQueryBase::widget_id)
+      .add_method("action_id", &unity::scopes::ActivationQueryBase::action_id)
+      // QueryBase
+      .add_method("valid", &unity::scopes::QueryBase::valid)
+      .add_method("settings", &unity::scopes::QueryBase::settings);
+
+    v8cpp::Class<unity::scopes::Category> category(isolate);
     category
-      .add_method("id", &Category::id)
-      .add_method("title", &Category::title)
-      .add_method("icon", &Category::icon);
+      // unity::scopes::Category
+      .add_method("query", &unity::scopes::Category::query)
+      .add_method("id", &unity::scopes::Category::id)
+      .add_method("title", &unity::scopes::Category::title)
+      .add_method("icon", &unity::scopes::Category::icon);
 
-    v8cpp::Class<CategorisedResult> categorised_result(isolate);
+    v8cpp::Class<unity::scopes::CategorisedResult> categorised_result(isolate);
     categorised_result
-      .add_method("set_uri", &CategorisedResult::set_uri)
-      .add_method("set_title", &CategorisedResult::set_title)
-      .add_method("set_art", &CategorisedResult::set_art);
+      .add_inheritance<unity::scopes::Result>()
+      .set_constructor<unity::scopes::Category::SCPtr>()
+      // unity::scopes::Result
+      .add_method("set_uri", &unity::scopes::Result::set_uri)
+      .add_method("set_title", &unity::scopes::Result::set_title)
+      .add_method("set_art", &unity::scopes::Result::set_art)
+      .add_method("set_dnd_uri", &unity::scopes::Result::set_dnd_uri)
+      .add_method("set_intercept_activation", &unity::scopes::Result::set_intercept_activation)
+      .add_method("direct_activation", &unity::scopes::Result::direct_activation)
+      .add_method("uri", &unity::scopes::Result::uri)
+      .add_method("title", &unity::scopes::Result::title)
+      .add_method("art", &unity::scopes::Result::art)
+      .add_method("dnd_uri", &unity::scopes::Result::dnd_uri)
+      .add_method("contains", &unity::scopes::Result::contains)
+      // Result
+      .add_method("set", &set_result_value<unity::scopes::CategorisedResult>)
+      .add_method("get", &get_result_value<unity::scopes::CategorisedResult>)
+      // unity::scopes::CategorisedResult
+      .add_method("set_category", &unity::scopes::CategorisedResult::set_category)
+      .add_method("category", &unity::scopes::CategorisedResult::category);
 
-    v8cpp::Class<CannedQuery> canned_query(isolate);
+    v8cpp::Class<unity::scopes::CannedQuery> canned_query(isolate);
     canned_query
-      .add_method("query_string", &CannedQuery::query_string)
-      .add_method("to_uri", &CannedQuery::to_uri);
+      .add_method("set_department_id", &unity::scopes::CannedQuery::set_department_id)
+      .add_method("set_query_string", &unity::scopes::CannedQuery::set_query_string)
+      .add_method("set_filter_state", &unity::scopes::CannedQuery::set_filter_state)
+      .add_method("scope_id", &unity::scopes::CannedQuery::scope_id)
+      .add_method("department_id", &unity::scopes::CannedQuery::department_id)
+      .add_method("filter_state", &unity::scopes::CannedQuery::filter_state)
+      .add_method("query_string", &unity::scopes::CannedQuery::query_string)
+      .add_method("to_uri", &unity::scopes::CannedQuery::to_uri);
 
-    v8cpp::Class<CategoryRenderer> category_renderer(isolate);
+    // TODO Should it be more of a value type? (it seems to be used that way
+    // in unity API)
+    v8cpp::Class<unity::scopes::CategoryRenderer> category_renderer(isolate);
     category_renderer
-      .add_method("data", &CategoryRenderer::data);
+      .set_constructor<std::string>()
+      .add_method("data", &unity::scopes::CategoryRenderer::data);
 
-    v8cpp::Class<ColumnLayout> column_layout(isolate);
+    v8cpp::Class<unity::scopes::ColumnLayout> column_layout(isolate);
     column_layout
-      .add_method("add_column", &ColumnLayout::add_column)
-      .add_method("size", &ColumnLayout::size)
-      .add_method("number_of_columns", &ColumnLayout::number_of_columns)
-      .add_method("column", &ColumnLayout::column);
+      .set_constructor<int>()
+      .add_method("add_column", &unity::scopes::ColumnLayout::add_column)
+      .add_method("size", &unity::scopes::ColumnLayout::size)
+      .add_method("number_of_columns", &unity::scopes::ColumnLayout::number_of_columns)
+      .add_method("column", &unity::scopes::ColumnLayout::column);
 
     v8cpp::Class<PreviewWidget> preview_widget(isolate);
     preview_widget
+      .add_inheritance<unity::scopes::PreviewWidget>()
+      // unity::scopes::PreviewWidget
+      .add_method("id", &unity::scopes::PreviewWidget::id)
+      .add_method("widget_type", &unity::scopes::PreviewWidget::widget_type)
+      .add_method("attribute_mappings", &unity::scopes::PreviewWidget::attribute_mappings)
+      .add_method("data", &unity::scopes::PreviewWidget::data)
+      .add_method("add_attribute_mapping", &unity::scopes::PreviewWidget::add_attribute_mapping)
+      // PreviewWidget
       .add_method("add_attribute_value", &PreviewWidget::add_attribute_value)
-      .add_method("add_attribute_mapping", &PreviewWidget::add_attribute_mapping)
-      .add_method("add_widget", &PreviewWidget::add_widget)
-      .add_method("id", &PreviewWidget::id)
-      .add_method("widget_type", &PreviewWidget::widget_type)
-      .add_method("attribute_mappings", &PreviewWidget::attribute_mappings)
-      .add_method("attribute_values", &PreviewWidget::attribute_values)
-      .add_method("widgets", &PreviewWidget::widgets)
-      .add_method("data", &PreviewWidget::data);
+      .add_method("add_widget", &PreviewWidget::add_widget);
 
     v8cpp::Class<PreviewQuery> preview_query(isolate);
     preview_query
-      .add_method("run", &PreviewQuery::run)
-      .add_method("cancelled", &PreviewQuery::cancelled);
+      .add_inheritance<unity::scopes::PreviewQueryBase>()
+      // unity::scopes::QueryBase
+      .add_method("valid", &unity::scopes::QueryBase::valid)
+      .add_method("settings", &unity::scopes::QueryBase::settings)
+      // PreviewQuery
+      .add_method("result", &PreviewQuery::result)
+      .add_method("action_metadata", &PreviewQuery::action_metadata);
 
+    // TODO handle info()
     v8cpp::Class<PreviewReply> preview_reply(isolate);
     preview_reply
+      // PreviewReply
       .add_method("register_layout", &PreviewReply::register_layout)
       .add_method("push", &PreviewReply::push)
-      .add_method("finished", &PreviewReply::finished);
+      // unity::scopes::PreviewReply
+      .add_method("finished", &unity::scopes::PreviewReply::finished);
 
     v8cpp::Class<Result> result(isolate);
     result
-      .add_method("art", &Result::art)
-      .add_method("set_art", &Result::set_art)
-      .add_method("title", &Result::title)
-      .add_method("set_title", &Result::set_title)
-      .add_method("dnd_uri", &Result::dnd_uri)
-      .add_method("set_dnd_uri", &Result::set_dnd_uri)
-      .add_method("uri", &Result::uri)
-      .add_method("set_uri", &Result::set_uri);
+      // unity::scopes::Result
+      .add_method("art", &unity::scopes::Result::art)
+      .add_method("set_art", &unity::scopes::Result::set_art)
+      .add_method("title", &unity::scopes::Result::title)
+      .add_method("set_title", &unity::scopes::Result::set_title)
+      .add_method("dnd_uri", &unity::scopes::Result::dnd_uri)
+      .add_method("set_dnd_uri", &unity::scopes::Result::set_dnd_uri)
+      .add_method("uri", &unity::scopes::Result::uri)
+      .add_method("set_uri", &unity::scopes::Result::set_uri)
+      .add_method("set_intercept_activation", &unity::scopes::Result::set_intercept_activation)
+      .add_method("direct_activation", &unity::scopes::Result::direct_activation)
+      .add_method("has_stored_result", &unity::scopes::Result::has_stored_result)
+      // Result
+      .add_method("set", &set_result_value<unity::scopes::Result>)
+      .add_method("get", &get_result_value<unity::scopes::Result>)
+      .add_method("retrieve_stored_result", &Result::retrieve_stored_result)
+      .add_method("store", &Result::store);
 
     v8cpp::Class<SearchReply> search_reply(isolate);
     search_reply
+      // SearchReply
       .add_method("register_category", &SearchReply::register_category)
       .add_method("push", &SearchReply::push)
+      .add_method("lookup_category", &SearchReply::lookup_category)
       .add_method("finished", &SearchReply::finished);
 
     v8cpp::Class<SearchQuery> search_query(isolate);
@@ -294,11 +386,27 @@
       .add_method("oncancelled", &SearchQuery::oncancelled);
 
     v8cpp::Class<SearchMetaData> search_metadata(isolate);
+    search_metadata
+      .add_inheritance<unity::scopes::SearchMetadata>()
+      // SearchMetadata
+      .add_method("set_cardinality", &unity::scopes::SearchMetadata::set_cardinality)
+      .add_method("cardinality", &unity::scopes::SearchMetadata::cardinality)
+      .add_method("set_location", &unity::scopes::SearchMetadata::set_location)
+      .add_method("location", &unity::scopes::SearchMetadata::location)
+      .add_method("has_location", &unity::scopes::SearchMetadata::has_location)
+      .add_method("set_hint", &unity::scopes::SearchMetadata::set_hint)
+      .add_method("hints", &unity::scopes::SearchMetadata::hints)
+      // QueryMetadata
+      .add_method("locale", &unity::scopes::QueryMetadata::locale)
+      .add_method("form_factor", &unity::scopes::QueryMetadata::form_factor)
+      .add_method("set_internet_connectivity", &unity::scopes::QueryMetadata::set_internet_connectivity)
+      .add_method("internet_connectivity", &unity::scopes::QueryMetadata::internet_connectivity);
 
     v8cpp::Module module(isolate);
     module.add_class("js_scope", js_scope);
     module.add_class("scope_base", scope_base);
     module.add_class("action_metadata", action_metadata);
+    module.add_class("activation_query", activation_query);
     module.add_class("category", category);
     module.add_class("categorised_result", categorised_result);
     module.add_class("canned_query", canned_query);
@@ -311,14 +419,17 @@
     module.add_class("search_reply", search_reply);
     module.add_class("search_query", search_query);
     module.add_class("search_metadata", search_metadata);
+    module.add_class("variant", variant);
+    module.add_class("variant_map", variant_map);
+    module.add_class("variant_array", variant_array);
 
     module.add_function("new_scope", &new_scope);
-    module.add_function("new_search_query", &new_search_query);
-    module.add_function("new_category_renderer", &new_category_renderer);
-    module.add_function("new_preview_query", &new_preview_query);
-    module.add_function("new_preview_widget", &new_preview_widget);
-    module.add_function("new_categorised_result", &new_categorised_result);
-    module.add_function("new_column_layout", &new_column_layout);
+    module.add_function("new_SearchQuery", &new_SearchQuery);
+    module.add_function("new_PreviewQuery", &new_PreviewQuery);
+    module.add_function("new_PreviewWidget", &new_PreviewWidget);
+    module.add_function("new_category_renderer_from_file", &new_category_renderer_from_file);
+
+    module.add_function("runtime_version", &get_scopes_runtime_version);
 
     exports->SetPrototype(module.create_prototype());
 }

=== removed file 'src/bindings/src/canned-query.cc'
--- src/bindings/src/canned-query.cc	2015-06-18 16:39:04 +0000
+++ src/bindings/src/canned-query.cc	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#include "canned-query.h"
-
-CannedQuery::CannedQuery(unity::scopes::CannedQuery const &query)
-  : query_(query) {
-}
-
-CannedQuery::~CannedQuery() {
-}
-
-v8::Local<v8::Value> CannedQuery::query_string(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(v8::Isolate::GetCurrent(), query_.query_string().c_str());
-}
-
-v8::Local<v8::Value> CannedQuery::to_uri(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(v8::Isolate::GetCurrent(), query_.to_uri().c_str());
-}
-
-unity::scopes::CannedQuery const & CannedQuery::get_canned_query() {
-  return query_;
-}

=== removed file 'src/bindings/src/canned-query.h'
--- src/bindings/src/canned-query.h	2015-07-30 12:28:09 +0000
+++ src/bindings/src/canned-query.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#ifndef _UNITY_JS_CANNED_QUERY_H_
-#define _UNITY_JS_CANNED_QUERY_H_
-
-#include <unity/scopes/CannedQuery.h>
-
-#include <v8-cpp.h>
-
-class CannedQuery
-{
- public:
-  CannedQuery(unity::scopes::CannedQuery const &query);
-  ~CannedQuery();
-
-  // v8 binding
-  v8::Local<v8::Value> query_string(
-      v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> to_uri(
-      v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  unity::scopes::CannedQuery const & get_canned_query();
-  
- private:
-
-  unity::scopes::CannedQuery const query_;
-};
-
-#endif // _UNITY_JS_CANNED_QUERY_H_

=== removed file 'src/bindings/src/categorised-result.cc'
--- src/bindings/src/categorised-result.cc	2015-08-11 07:04:10 +0000
+++ src/bindings/src/categorised-result.cc	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#include "categorised-result.h"
-
-CategorisedResult::CategorisedResult(Category * category)
-  : unity::scopes::CategorisedResult(category->get_category()),
-    category_(category) {
-}
-
-CategorisedResult::~CategorisedResult() {
-}
-
-void CategorisedResult::set_uri(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    // TODO fix
-    return;
-  }
-
-  if (!args[0]->IsString()) {
-    // TODO fix
-    return;
-  }
-
-  unity::scopes::CategorisedResult::set_uri(*(v8::String::Utf8Value(args[0]->ToString())));
-}
-
-void CategorisedResult::set_title(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    // TODO fix
-    return;
-  }
-
-  if (!args[0]->IsString()) {
-    // TODO fix
-    return;
-  }
-
-  unity::scopes::CategorisedResult::set_title(*(v8::String::Utf8Value(args[0]->ToString())));
-}
-
-void CategorisedResult::set_art(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    // TODO fix
-    return;
-  }
-
-  if (!args[0]->IsString()) {
-    // TODO fix
-    return;
-  }
-
-  unity::scopes::CategorisedResult::set_art(*(v8::String::Utf8Value(args[0]->ToString())));
-}

=== removed file 'src/bindings/src/categorised-result.h'
--- src/bindings/src/categorised-result.h	2015-08-11 07:04:10 +0000
+++ src/bindings/src/categorised-result.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#ifndef _UNITY_JS_CATEGORISED_RESULT_H_
-#define _UNITY_JS_CATEGORISED_RESULT_H_
-
-#include <unity/scopes/CategorisedResult.h>
-
-#include <v8-cpp.h>
-
-#include "category.h"
-
-class CategorisedResult : public unity::scopes::CategorisedResult
-{
- public:
-  CategorisedResult(Category * category);
-  ~CategorisedResult() override;
-
-  // v8 binding
-  void set_uri(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void set_title(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void set_art(v8::FunctionCallbackInfo<v8::Value> const& args);
-
- private:
-
-  // TODO ownership & lifetime !
-  // better to own the scptr
-  Category * category_;
-};
-
-#endif // _UNITY_JS_CATEGORISED_RESULT_H_

=== removed file 'src/bindings/src/category-renderer.cc'
--- src/bindings/src/category-renderer.cc	2015-06-23 19:47:08 +0000
+++ src/bindings/src/category-renderer.cc	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#include "category-renderer.h"
-
-CategoryRenderer::CategoryRenderer(std::string const &json_text)
-  : renderer_(json_text) {
-}
-
-CategoryRenderer::~CategoryRenderer() {
-}
-
-v8::Local<v8::Value> CategoryRenderer::data(
-    v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), renderer_.data().c_str());
-}

=== removed file 'src/bindings/src/category-renderer.h'
--- src/bindings/src/category-renderer.h	2015-06-23 19:47:08 +0000
+++ src/bindings/src/category-renderer.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#ifndef _UNITY_JS_CATEGORY_RENDERER_H_
-#define _UNITY_JS_CATEGORY_RENDERER_H_
-
-#include <unity/scopes/CategoryRenderer.h>
-
-#include <v8-cpp.h>
-
-class CategoryRenderer
-{
- public:
-  CategoryRenderer(std::string const &json_text);
-  ~CategoryRenderer();
-
-  const unity::scopes::CategoryRenderer&
-    get_renderer() const;
-
-  // v8 implementation
-  v8::Local<v8::Value> data(v8::FunctionCallbackInfo<v8::Value> const& args);
-
- private:
-
-  unity::scopes::CategoryRenderer renderer_;
-};
-
-#endif // _UNITY_JS_SEARCH_METADATA_H_

=== removed file 'src/bindings/src/category.cc'
--- src/bindings/src/category.cc	2015-06-18 16:39:04 +0000
+++ src/bindings/src/category.cc	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#include "category.h"
-
-Category::Category(unity::scopes::Category::SCPtr category)
-  : category_(category) {
-}
-
-Category::~Category() {
-}
-
-v8::Local<v8::Value> Category::id(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  v8::Isolate *isolate = args.GetIsolate();
-  return v8cpp::to_v8(isolate, category_->id().c_str());
-}
-
-v8::Local<v8::Value> Category::title(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  v8::Isolate *isolate = args.GetIsolate();
-  return v8cpp::to_v8(isolate, category_->title().c_str());
-}
-
-v8::Local<v8::Value> Category::icon(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  v8::Isolate *isolate = args.GetIsolate();
-  return v8cpp::to_v8(isolate, category_->icon().c_str());
-}
-
-unity::scopes::Category::SCPtr Category::get_category() {
-  return category_;
-}

=== removed file 'src/bindings/src/category.h'
--- src/bindings/src/category.h	2015-06-18 16:39:04 +0000
+++ src/bindings/src/category.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#ifndef _UNITY_JS_CATEGORY_H_
-#define _UNITY_JS_CATEGORY_H_
-
-#include <unity/scopes/Category.h>
-
-#include <v8-cpp.h>
-
-class Category
-{
- public:
-  Category(unity::scopes::Category::SCPtr category);
-  ~Category();
-
-  // v8 binding
-  v8::Local<v8::Value> id(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> title(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> icon(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  unity::scopes::Category::SCPtr get_category();
-
- private:
-  unity::scopes::Category::SCPtr category_;
-};
-
-#endif // _UNITY_JS_CATEGORY_H_

=== removed file 'src/bindings/src/column-layout.cc'
--- src/bindings/src/column-layout.cc	2015-08-18 21:05:20 +0000
+++ src/bindings/src/column-layout.cc	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#include "column-layout.h"
-
-ColumnLayout::ColumnLayout(int num_of_columns)
-  : column_layout_(num_of_columns) {
-}
-
-ColumnLayout::~ColumnLayout() {
-}
-
-void ColumnLayout::add_column(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    return;
-  }
-
-  if (!args[0]->IsArray()) {
-    return;
-  }
-
-  std::vector<std::string> columns;
-
-  v8::Handle<v8::Array> array =
-    v8::Handle<v8::Array>::Cast(args[0]);
-  for (size_t i = 0; i < array->Length(); i++) {
-    v8::Local<v8::Value> element = array->Get(i);
-    if (!element->IsString()) {
-      return;
-    }
-    columns.push_back(
-        *v8::String::Utf8Value(element->ToString()));
-  }
-  column_layout_.add_column(columns);
-}
-
-v8::Local<v8::Value> ColumnLayout::size(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), column_layout_.size());
-}
-
-v8::Local<v8::Value> ColumnLayout::number_of_columns(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), column_layout_.number_of_columns());
-}
-
-v8::Local<v8::Value> ColumnLayout::column(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1 || !args[0]->IsInt32()) {
-    return v8cpp::to_v8(args.GetIsolate(), nullptr);
-  }
-
-  int index = args[0]->Int32Value();
-  std::vector<std::string> c =
-    column_layout_.column(index);
-
-  v8::Handle<v8::Array> array =
-    v8::Array::New(args.GetIsolate(), c.size());
-
-  for (std::vector<std::string>::size_type i = 0;
-       i < c.size();
-       ++i) {
-    array->Set(i, v8::String::NewFromUtf8(args.GetIsolate(), c[i].c_str()));
-  }
-  return array;
-}
-
-const unity::scopes::ColumnLayout& ColumnLayout::get_column_layout() const {
-  return column_layout_;
-}

=== removed file 'src/bindings/src/column-layout.h'
--- src/bindings/src/column-layout.h	2015-06-23 19:47:08 +0000
+++ src/bindings/src/column-layout.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of unity-js-scopes.
- *
- * unity-js-scopes 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.
- *
- * unity-js-scopes 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/>.
- */
-
-#ifndef _UNITY_JS_COLUMN_LAYOUT_H_
-#define _UNITY_JS_COLUMN_LAYOUT_H_
-
-#include <unity/scopes/ColumnLayout.h>
-
-#include <v8-cpp.h>
-
-class ColumnLayout
-{
- public:
-  ColumnLayout(int num_of_columns);
-  ~ColumnLayout();
-
-  // v8 implementation
-  void add_column(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> size(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> number_of_columns(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> column(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  const unity::scopes::ColumnLayout&
-    get_column_layout() const;
-
- private:
-
-  unity::scopes::ColumnLayout column_layout_;
-};
-
-#endif // _UNITY_JS_COLUMN_LAYOUT_H_

=== added file 'src/bindings/src/common.cc'
--- src/bindings/src/common.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/common.cc	2015-10-09 07:21:04 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#include "common.h"
+
+v8::Local<v8::Value> unity::scopesjs::from_variant(
+      const unity::scopes::Variant& variant) {
+  switch(variant.which()) {
+  case unity::scopes::Variant::Null:
+    return v8::Null(v8::Isolate::GetCurrent());
+    break;
+  case unity::scopes::Variant::Int:
+    return v8::Integer::New(v8::Isolate::GetCurrent(), variant.get_int());
+    break;
+  case unity::scopes::Variant::Bool:
+    return v8::Boolean::New(v8::Isolate::GetCurrent(), variant.get_bool());
+    break;
+  case unity::scopes::Variant::String:
+    return v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), variant.get_string().c_str());
+    break;
+  case unity::scopes::Variant::Double:
+    return v8::Number::New(v8::Isolate::GetCurrent(), variant.get_double());
+    break;
+  case unity::scopes::Variant::Int64:
+    return v8::Number::New(v8::Isolate::GetCurrent(), variant.get_int());
+    break;
+  case unity::scopes::Variant::Dict:
+    {
+      v8::Handle<v8::Object> o = v8::Object::New(v8::Isolate::GetCurrent());
+      for (const auto& e : variant.get_dict()) {
+        o->Set(v8::String::NewFromUtf8(
+                                       v8::Isolate::GetCurrent(),
+                                       e.first.c_str()),
+               from_variant(e.second));
+      }
+      return o;
+    }
+    break;
+  case unity::scopes::Variant::Array:
+    {
+      const unity::scopes::VariantArray & va =
+        variant.get_array();
+      v8::Handle<v8::Array> a =
+        v8::Array::New(v8::Isolate::GetCurrent(), variant.get_array().size());
+      
+      for (size_t i = 0; i < va.size(); ++i) {
+        a->Set(i, from_variant(va[i]));
+      }
+      return a;
+    }
+    break;
+  }
+
+  return v8::Null(v8::Isolate::GetCurrent());
+}
+
+unity::scopes::Variant unity::scopesjs::to_variant(
+      v8::Local<v8::Value> value) {
+  using unity::scopes::Variant;
+  using unity::scopes::VariantArray;
+  using unity::scopes::VariantMap;
+
+  Variant v;
+
+  if (value->IsString()) {
+    v = *(v8::String::Utf8Value(value->ToString()));
+  } else if (value->IsUint32()) {
+    v = Variant((double) value->ToUint32()->Value());
+  } else if (value->IsInt32()) {
+    v = Variant(value->ToInt32()->Value());
+  } else if (value->IsBoolean()) {
+    v = Variant(value->ToBoolean()->Value());
+  } else if (value->IsNumber()) {
+    v = Variant(value->NumberValue());
+  } else if (value->IsObject()) {
+    v8::Handle<v8::Object> o = v8::Handle<v8::Object>::Cast(value);
+
+    v8::Local<v8::Array> names = o->GetPropertyNames();
+
+    VariantMap vm;
+
+    for (size_t i = 0; i < names->Length(); ++i) {
+      std::string name = *(v8::String::Utf8Value(names->Get(i)));
+      vm[name] = to_variant(o->Get(v8::String::NewFromUtf8(
+                                   v8::Isolate::GetCurrent(), name.c_str())));
+    }
+
+    v = vm;
+  } else if (value->IsArray()) {
+    v8::Handle<v8::Object> o = v8::Handle<v8::Object>::Cast(value);
+
+    VariantArray va;
+
+    for (size_t i = 0;
+         i < o->Get(v8::String::NewFromUtf8(
+                      v8::Isolate::GetCurrent(), "length"))->ToObject()->Uint32Value();
+         ++i) {
+      va.push_back(to_variant(o->Get(i)));
+    }
+
+    v = va;
+  }
+
+  return v;
+}

=== added file 'src/bindings/src/common.h'
--- src/bindings/src/common.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/common.h	2015-10-09 07:21:04 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#include <string>
+
+#include <v8-cpp.h>
+
+#include "unity/scopes/Variant.h"
+
+
+namespace unity {
+namespace scopesjs {
+
+unity::scopes::Variant
+to_variant(v8::Local<v8::Value> value);
+
+v8::Local<v8::Value>
+from_variant(const unity::scopes::Variant& variant);
+
+} // namespace scopesjs
+} // namespace unity
+

=== added file 'src/bindings/src/preview-query-proxy.cc'
--- src/bindings/src/preview-query-proxy.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/preview-query-proxy.cc	2015-10-09 07:21:04 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#include "preview-query-proxy.h"
+
+#include <unity/scopes/Result.h>
+#include <unity/scopes/ActionMetadata.h>
+
+PreviewQueryProxy::PreviewQueryProxy(
+      std::shared_ptr<unity::scopes::PreviewQueryBase> backend)
+    : unity::scopes::PreviewQueryBase(backend->result(), backend->action_metadata()),
+    backend_(backend) {
+}
+
+void PreviewQueryProxy::run(unity::scopes::PreviewReplyProxy const &reply) {
+  backend_->run(reply);
+}
+
+unity::scopes::Result PreviewQueryProxy::result() const {
+  return backend_->result();
+}
+
+unity::scopes::ActionMetadata PreviewQueryProxy::action_metadata() const {
+  return backend_->action_metadata();
+}
+
+void PreviewQueryProxy::cancelled() {
+  backend_->cancelled();
+}
+
+bool PreviewQueryProxy::valid() const {
+  return backend_->valid();
+}
+
+unity::scopes::VariantMap PreviewQueryProxy::settings() const {
+  return backend_->settings();
+}

=== added file 'src/bindings/src/preview-query-proxy.h'
--- src/bindings/src/preview-query-proxy.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/preview-query-proxy.h	2015-10-09 07:21:04 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#ifndef _UNITY_JS_PREVIEW_QUERY_PROXY_H_
+#define _UNITY_JS_PREVIEW_QUERY_PROXY_H_
+
+#include <unity/scopes/PreviewQueryBase.h>
+
+#include <v8-cpp.h>
+
+
+class PreviewQueryProxy : public unity::scopes::PreviewQueryBase
+{
+ public:
+  PreviewQueryProxy(
+      std::shared_ptr<unity::scopes::PreviewQueryBase> backend);
+
+  void run(unity::scopes::PreviewReplyProxy const &reply) override;
+  unity::scopes::Result result () const;
+  unity::scopes::ActionMetadata action_metadata () const;
+  bool valid() const;
+  unity::scopes::VariantMap settings() const;
+  void cancelled() override;
+
+  // TODO handle the subsearch override functions
+
+ private:
+  std::shared_ptr<unity::scopes::PreviewQueryBase> backend_;
+};
+
+#endif // _UNITY_JS_SEARCH_QUERY_PROXY_H_
+
+

=== modified file 'src/bindings/src/preview-query.cc'
--- src/bindings/src/preview-query.cc	2015-08-27 11:46:23 +0000
+++ src/bindings/src/preview-query.cc	2015-10-09 07:21:04 +0000
@@ -40,26 +40,6 @@
   }
 }
 
-void PreviewQuery::onrun(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    // TODO fix
-    return;
-  }
-
-  if (!args[0]->IsFunction()) {
-    // TODO fix
-    return;
-  }
-
-  if (!run_callback_.IsEmpty()) {
-    run_callback_.Reset();
-  }
-
-  v8::Local<v8::Function> cb = v8::Handle<v8::Function>::Cast(args[0]);
-  run_callback_.Reset(args.GetIsolate(), cb);
-}
-
 void PreviewQuery::run(unity::scopes::PreviewReplyProxy const& reply) {
   if (run_callback_.IsEmpty()) {
     return;
@@ -67,17 +47,46 @@
 
   EventQueue::instance().run(isolate_, [this, reply]
   {
-    // wrap & fire
-    PreviewReply *pr = new PreviewReply(reply);
-
-    auto wrapped_pr = v8cpp::to_v8(isolate_, pr);
+    std::shared_ptr<PreviewReply> r =
+      std::shared_ptr<PreviewReply>(new PreviewReply(reply));
 
     v8::Local<v8::Function> run_callback =
         v8cpp::to_local<v8::Function>(isolate_, run_callback_);
 
-    v8cpp::call_v8(isolate_, run_callback, wrapped_pr);
+    v8cpp::call_v8_with_receiver(
+        isolate_,
+        v8cpp::to_v8(isolate_, shared_from_this()),
+        run_callback,
+        v8cpp::to_v8(isolate_, r)
+    );
   });
 }
 
 void PreviewQuery::cancelled() {
+  if (cancelled_callback_.IsEmpty()) {
+    return;
+  }
+
+  EventQueue::instance().run(isolate_, [this]
+  {
+    v8::Local<v8::Function> cancelled_callback =
+        v8cpp::to_local<v8::Function>(isolate_, cancelled_callback_);
+
+    v8cpp::call_v8_with_receiver(
+        isolate_,
+        v8cpp::to_v8(isolate_, shared_from_this()),
+        cancelled_callback
+    );
+  });
+}
+
+std::shared_ptr<unity::scopes::ActionMetadata>
+PreviewQuery::action_metadata() const {
+  return std::shared_ptr<unity::scopes::ActionMetadata>(
+      new unity::scopes::ActionMetadata(unity::scopes::PreviewQueryBase::action_metadata()));
+}
+
+std::shared_ptr<unity::scopes::Result> PreviewQuery::result() const {
+  return std::shared_ptr<unity::scopes::Result>(
+      new unity::scopes::Result(unity::scopes::PreviewQueryBase::result()));
 }

=== modified file 'src/bindings/src/preview-query.h'
--- src/bindings/src/preview-query.h	2015-08-27 11:46:23 +0000
+++ src/bindings/src/preview-query.h	2015-10-09 07:21:04 +0000
@@ -19,11 +19,14 @@
 #ifndef _UNITY_JS_PREVIEW_QUERY_H_
 #define _UNITY_JS_PREVIEW_QUERY_H_
 
+#include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/PreviewQueryBase.h>
+#include <unity/scopes/Result.h>
 
 #include <v8-cpp.h>
 
-class PreviewQuery : public unity::scopes::PreviewQueryBase
+class PreviewQuery : public unity::scopes::PreviewQueryBase,
+    public std::enable_shared_from_this<PreviewQuery>
 {
  public:
   PreviewQuery(unity::scopes::Result const& result,
@@ -34,12 +37,13 @@
 
   // PreviewQueryBase implementation
   void run(unity::scopes::PreviewReplyProxy const& reply);
-  void cancelled();
-
-  // v8 binding
-  void onrun(v8::FunctionCallbackInfo<v8::Value> const& args);
-  //  v8::Local<v8::Value> get_result(v8::FunctionCallbackInfo<v8::Value> const& args);
-  //  v8::Local<v8::Value> get_action_metadata(v8::FunctionCallbackInfo<v8::Value> const& args);
+
+  // QueryBase implementation
+  void cancelled() override;
+
+  // v8 bindings
+  std::shared_ptr<unity::scopes::ActionMetadata> action_metadata() const;
+  std::shared_ptr<unity::scopes::Result> result() const;
   
  private:
   v8::Isolate* isolate_;

=== modified file 'src/bindings/src/preview-reply.cc'
--- src/bindings/src/preview-reply.cc	2015-09-01 10:31:12 +0000
+++ src/bindings/src/preview-reply.cc	2015-10-09 07:21:04 +0000
@@ -27,20 +27,22 @@
 PreviewReply::~PreviewReply() {
 }
 
-void PreviewReply::register_layout(std::vector<ColumnLayout*> const& columns) {
+void PreviewReply::register_layout(
+      std::vector<std::shared_ptr<unity::scopes::ColumnLayout>> const& columns) {
   unity::scopes::ColumnLayoutList columns_list;
   for (auto const& column : columns)
   {
-    columns_list.emplace_back(column->get_column_layout());
+    columns_list.push_back(*column);
   }
   reply_->register_layout(columns_list);
 }
 
-void PreviewReply::push(std::vector<PreviewWidget*> const& widgets) {
+void PreviewReply::push(
+      std::vector<std::shared_ptr<unity::scopes::PreviewWidget>> const& widgets) {
   unity::scopes::PreviewWidgetList widgets_list;
   for (auto const& widget : widgets)
   {
-    widgets_list.emplace_back(widget->get_preview_widget());
+    widgets_list.push_back(*widget);
   }
   reply_->push(widgets_list);
 }

=== modified file 'src/bindings/src/preview-reply.h'
--- src/bindings/src/preview-reply.h	2015-09-01 10:31:12 +0000
+++ src/bindings/src/preview-reply.h	2015-10-09 07:21:04 +0000
@@ -20,7 +20,7 @@
 #define _UNITY_JS_PREVIEW_REPLY_H_
 
 #include <unity/scopes/PreviewReply.h>
-#include "column-layout.h"
+
 #include "preview-widget.h"
 
 #include <v8-cpp.h>
@@ -32,8 +32,10 @@
   ~PreviewReply();
 
   // v8 bindings
-  void register_layout(std::vector<ColumnLayout*> const& columns);
-  void push(std::vector<PreviewWidget*> const& widgets);
+  void register_layout(
+      std::vector<std::shared_ptr<unity::scopes::ColumnLayout>> const& columns);
+  void push(
+      std::vector<std::shared_ptr<unity::scopes::PreviewWidget>> const& widgets);
   void finished();
 
  private:

=== modified file 'src/bindings/src/preview-widget.cc'
--- src/bindings/src/preview-widget.cc	2015-07-09 18:30:28 +0000
+++ src/bindings/src/preview-widget.cc	2015-10-09 07:21:04 +0000
@@ -18,13 +18,18 @@
 
 #include "preview-widget.h"
 
+#include <unity/scopes/VariantBuilder.h>
+
+#include "common.h"
+
+
 PreviewWidget::PreviewWidget(std::string const &id,
                              std::string const &widget_type)
-  : preview_widget_(id, widget_type) {
+  : unity::scopes::PreviewWidget(id, widget_type) {
 }
 
 PreviewWidget::PreviewWidget(std::string const &definition)
-  : preview_widget_(definition) {
+  : unity::scopes::PreviewWidget(definition) {
 }
 
 PreviewWidget::~PreviewWidget() {
@@ -45,89 +50,40 @@
   if (args[1]->IsString()) {
     unity::scopes::Variant v(
         *v8::String::Utf8Value(args[1]->ToString()));
-    preview_widget_.add_attribute_value(key, v);
+    unity::scopes::PreviewWidget::add_attribute_value(key, v);
   } else if (args[1]->IsBoolean()) {
     unity::scopes::Variant v(
         args[1]->BooleanValue());
-    preview_widget_.add_attribute_value(key, v);
+    unity::scopes::PreviewWidget::add_attribute_value(key, v);
   } else if (args[1]->IsInt32()) {
     unity::scopes::Variant v(
         args[1]->Int32Value());
-    preview_widget_.add_attribute_value(key, v);
+    unity::scopes::PreviewWidget::add_attribute_value(key, v);
   } else if (args[1]->IsNumber()) {
     unity::scopes::Variant v(
         args[1]->NumberValue());
-    preview_widget_.add_attribute_value(key, v);
-  }
-}
-
-void PreviewWidget::add_attribute_mapping(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 2) {
-    return;
-  }
-  if (!args[0]->IsString() || !args[1]->IsString()) {
-    return;
-  }
-
-  std::string key =
-    *v8::String::Utf8Value(args[0]->ToString());
-
-  std::string field_name =
-    *v8::String::Utf8Value(args[1]->ToString());
-
-  preview_widget_.add_attribute_mapping(
-      key, field_name);
+    unity::scopes::PreviewWidget::add_attribute_value(key, v);
+  } else if (args[1]->IsObject()) {
+    unity::scopes::VariantBuilder vb;
+
+    unity::scopes::Variant v =
+      unity::scopesjs::to_variant(args[1]);
+
+    if (v.which() == unity::scopes::Variant::Dict) {
+      unity::scopes::VariantMap vm = v.get_dict();
+      std::vector<std::pair<std::string, unity::scopes::Variant>> t;
+
+      for (auto &c : vm) {
+        t.push_back({c.first, c.second});
+      }
+
+      vb.add_tuple(t);
+      unity::scopes::PreviewWidget::add_attribute_value(key, vb.end());
+    }
+  }
 }
 
 void PreviewWidget::add_widget(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    return;
-  }
-
-  PreviewWidget *pw =
-    v8cpp::from_v8<PreviewWidget*>(args.GetIsolate(), args[0]);
-  if (!pw) {
-    return;
-  }
-
-  preview_widget_.add_widget(pw->get_preview_widget());
-}
-
-const unity::scopes::PreviewWidget&
-PreviewWidget::get_preview_widget() const {
-  return preview_widget_;
-}
-
-v8::Local<v8::Value> PreviewWidget::id(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), preview_widget_.id());
-}
-
-v8::Local<v8::Value> PreviewWidget::widget_type(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), preview_widget_.widget_type());
-}
-
-v8::Local<v8::Value> PreviewWidget::attribute_mappings(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  std::map<std::string, std::string> am =
-    preview_widget_.attribute_mappings();
-  return v8cpp::to_v8(args.GetIsolate(), am);
-}
-
-v8::Local<v8::Value> PreviewWidget::attribute_values(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), nullptr);
-}
-
-v8::Local<v8::Value> PreviewWidget::widgets(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), nullptr);
-}
-
-v8::Local<v8::Value> PreviewWidget::data(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), preview_widget_.data().c_str());
+      std::shared_ptr<unity::scopes::PreviewWidget> preview_widget) {
+  unity::scopes::PreviewWidget::add_widget(*preview_widget.get());
 }

=== modified file 'src/bindings/src/preview-widget.h'
--- src/bindings/src/preview-widget.h	2015-06-23 19:47:08 +0000
+++ src/bindings/src/preview-widget.h	2015-10-09 07:21:04 +0000
@@ -23,7 +23,7 @@
 
 #include <v8-cpp.h>
 
-class PreviewWidget
+class PreviewWidget : public unity::scopes::PreviewWidget
 {
  public:
   PreviewWidget(std::string const &id,
@@ -33,21 +33,7 @@
 
   // v8 binding
   void add_attribute_value(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void add_attribute_mapping(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void add_widget(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  v8::Local<v8::Value> id(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> widget_type(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  v8::Local<v8::Value> attribute_mappings(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> attribute_values(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> widgets(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> data(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  const unity::scopes::PreviewWidget& get_preview_widget() const;
-
- private:
-  unity::scopes::PreviewWidget preview_widget_;
+  void add_widget(std::shared_ptr<unity::scopes::PreviewWidget> preview_widget);
 };
 
 #endif // _UNITY_JS_PREVIEW_WIDGET_H_

=== modified file 'src/bindings/src/result.cc'
--- src/bindings/src/result.cc	2015-06-23 19:47:08 +0000
+++ src/bindings/src/result.cc	2015-10-09 07:21:04 +0000
@@ -19,61 +19,20 @@
 #include "result.h"
 
 Result::Result(unity::scopes::Result const &result)
-  : result_(result) {
-}
-
-Result::~Result() {
-}
-
-v8::Local<v8::Value> Result::uri(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  std::string uri = result_.uri();
-  return v8cpp::to_v8(args.GetIsolate(), uri.c_str());
-}
-
-void Result::set_uri(v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1 || !args[0]->IsString()) {
-    throw std::runtime_error("Invalid arguments");
-  }
-  result_.set_uri(*(v8::String::Utf8Value(args[0]->ToString())));
-}
-
-v8::Local<v8::Value> Result::title(v8::FunctionCallbackInfo<v8::Value> const& args) {
-  std::string title = result_.title();
-  return v8cpp::to_v8(args.GetIsolate(), title.c_str());
-}
-
-void Result::set_title(v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1 || !args[0]->IsString()) {
-    throw std::runtime_error("Invalid arguments");
-  }
-  result_.set_title(*(v8::String::Utf8Value(args[0]->ToString())));
-}
-
-v8::Local<v8::Value> Result::art(v8::FunctionCallbackInfo<v8::Value> const& args) {
-  std::string art = result_.art();
-  return v8cpp::to_v8(args.GetIsolate(), art.c_str());
-}
-
-void Result::set_art(v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1 || !args[0]->IsString()) {
-    throw std::runtime_error("Invalid arguments");
-  }
-  result_.set_art(*(v8::String::Utf8Value(args[0]->ToString())));
-}
-
-v8::Local<v8::Value> Result::dnd_uri(v8::FunctionCallbackInfo<v8::Value> const& args) {
-  std::string dnd_uri = result_.dnd_uri();
-  return v8cpp::to_v8(args.GetIsolate(), dnd_uri.c_str());
-}
-
-void Result::set_dnd_uri(v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1 || !args[0]->IsString()) {
-    throw std::runtime_error("Invalid arguments");
-  }
-  result_.set_dnd_uri(*(v8::String::Utf8Value(args[0]->ToString())));
-}
-
-const unity::scopes::Result& Result::get_result() const {
-  return result_;
+  : unity::scopes::Result(result) {
+}
+
+std::shared_ptr<Result>
+Result::retrieve_stored_result() const {
+  return std::shared_ptr<Result>(
+      new Result(unity::scopes::Result::retrieve()));
+}
+
+void Result::store(
+      std::shared_ptr<Result> result,
+      bool intercept_activation) {
+  unity::scopes::Result::store(
+      *result,
+      intercept_activation
+  );
 }

=== modified file 'src/bindings/src/result.h'
--- src/bindings/src/result.h	2015-06-23 19:47:08 +0000
+++ src/bindings/src/result.h	2015-10-09 07:21:04 +0000
@@ -23,29 +23,41 @@
 
 #include <v8-cpp.h>
 
-class Result
+#include "common.h"
+
+class Result : public unity::scopes::Result
 {
  public:
   Result(unity::scopes::Result const &result);
-  ~Result();
-
-  // v8 binding
-  v8::Local<v8::Value> uri(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void set_uri(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  v8::Local<v8::Value> title(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void set_title(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  v8::Local<v8::Value> art(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void set_art(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  v8::Local<v8::Value> dnd_uri(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void set_dnd_uri(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  const unity::scopes::Result& get_result() const;
-
- private:
-  unity::scopes::Result result_;
+
+  // v8 bindings
+  std::shared_ptr<Result> retrieve_stored_result() const;
+  void store(std::shared_ptr<Result> result, bool intercept_activation);
+
 };
 
+template <typename T>
+void set_result_value(T * self,
+                      v8::FunctionCallbackInfo<v8::Value> const& args) {
+  if (args.Length() != 2) {
+    throw std::runtime_error("Invalid number of arguments");
+  }
+
+  if (!args[0]->IsString()) {
+    throw std::runtime_error("Invalid argument type");
+  }
+
+  std::string key =
+    *(v8::String::Utf8Value(args[0]->ToString()));
+
+  (*static_cast<unity::scopes::Result*>(self))[key] = unity::scopesjs::to_variant(args[1]);
+}
+
+template <typename T>
+v8::Handle<v8::Value> get_result_value(const T * self,
+                                       const std::string& key) {
+  return unity::scopesjs::from_variant((*static_cast<const unity::scopes::Result*>(self))[key]);
+}
+
+
 #endif // _UNITY_JS_RESULT_H_

=== modified file 'src/bindings/src/scope-base.cc'
--- src/bindings/src/scope-base.cc	2015-08-25 09:40:42 +0000
+++ src/bindings/src/scope-base.cc	2015-10-09 07:21:04 +0000
@@ -18,12 +18,15 @@
 
 #include "scope-base.h"
 
-#include "canned-query.h"
+#include "action-metadata.h"
+#include "activation-query.h"
+#include "activation-query-proxy.h"
 #include "search-query.h"
+#include "search-query-proxy.h"
 #include "search-metadata.h"
 #include "result.h"
-#include "action-metadata.h"
 #include "preview-query.h"
+#include "preview-query-proxy.h"
 #include "event_queue.h"
 
 ScopeBase::ScopeBase()
@@ -54,9 +57,11 @@
     v8::Local<v8::Function> start_callback =
         v8cpp::to_local<v8::Function>(isolate_, start_callback_);
 
-    v8cpp::call_v8(isolate_,
-                   start_callback,
-                   v8cpp::to_v8(isolate_, scope_id.c_str()));
+    v8cpp::call_v8(
+        isolate_,
+        start_callback,
+        v8cpp::to_v8(isolate_, scope_id.c_str())
+    );
   });
 }
 
@@ -70,7 +75,10 @@
     v8::Local<v8::Function> stop_callback =
         v8cpp::to_local<v8::Function>(isolate_, stop_callback_);
 
-    v8cpp::call_v8(isolate_, stop_callback);
+    v8cpp::call_v8(
+        isolate_,
+        stop_callback
+    );
   });
 }
 
@@ -84,7 +92,10 @@
     v8::Local<v8::Function> run_callback =
         v8cpp::to_local<v8::Function>(isolate_, run_callback_);
 
-    v8cpp::call_v8(isolate_, run_callback);
+    v8cpp::call_v8(
+        isolate_,
+        run_callback
+    );
   });
 }
 
@@ -98,23 +109,27 @@
   return EventQueue::instance().run<unity::scopes::SearchQueryBase::UPtr>(isolate_, [this, query, metadata]
   {
     // wrap & fire
-    CannedQuery *q = new CannedQuery(query);
-    SearchMetaData *m = new SearchMetaData(metadata);
+    std::shared_ptr<unity::scopes::CannedQuery> q(
+        new unity::scopes::CannedQuery(std::move(query)));
+
+    std::shared_ptr<SearchMetaData> m(
+      new SearchMetaData(metadata));
 
     v8::Local<v8::Function> search_callback =
         v8cpp::to_local<v8::Function>(isolate_, search_callback_);
 
     v8::Handle<v8::Value> result =
-        v8cpp::call_v8(isolate_,
-                       search_callback,
-                       v8cpp::to_v8(isolate_, q),
-                       v8cpp::to_v8(isolate_, m));
-
-    // TODO watch out release
-    SearchQuery * sq =
-        v8cpp::from_v8<SearchQuery*>(isolate_, result);
-
-    return unity::scopes::SearchQueryBase::UPtr(sq);
+      v8cpp::call_v8(
+        isolate_,
+        search_callback,
+        v8cpp::to_v8(isolate_, q),
+        v8cpp::to_v8(isolate_, m)
+      );
+
+    std::shared_ptr<SearchQuery> sq =
+      v8cpp::from_v8<std::shared_ptr<SearchQuery>>(isolate_, result);
+
+    return unity::scopes::SearchQueryBase::UPtr(new SearchQueryProxy(sq));
   });
 }
 
@@ -132,9 +147,37 @@
       unity::scopes::ActionMetadata const &metadata,
       std::string const &widget_id,
       std::string const &action_id) {
-  return EventQueue::instance().run<unity::scopes::ActivationQueryBase::UPtr>(isolate_, [this]
-  {
+  if (perform_action_callback_.IsEmpty()) {
     return nullptr;
+  }
+
+  return EventQueue::instance().run<unity::scopes::ActivationQueryBase::UPtr>(
+      isolate_,
+      [this, result, metadata, widget_id, action_id] {
+
+    std::shared_ptr<Result> r(new Result(result));
+    std::shared_ptr<unity::scopes::ActionMetadata> m(
+        new unity::scopes::ActionMetadata(metadata));
+
+    v8::Local<v8::Function> perform_action_callback =
+        v8cpp::to_local<v8::Function>(isolate_, perform_action_callback_);
+
+    v8::Handle<v8::Value> wrapped_activation_query =
+        v8cpp::call_v8(
+          isolate_,
+          perform_action_callback,
+          v8cpp::to_v8(isolate_, r),
+          v8cpp::to_v8(isolate_, m),
+          widget_id,
+          action_id
+        );
+
+    std::shared_ptr<ActivationQuery> aq =
+      v8cpp::from_v8<std::shared_ptr<ActivationQuery>>(
+          isolate_,
+          wrapped_activation_query);
+
+    return unity::scopes::ActivationQueryBase::UPtr(new ActivationQueryProxy(aq));
   });
 }
 
@@ -145,26 +188,34 @@
     return nullptr;
   }
 
-  return EventQueue::instance().run<unity::scopes::PreviewQueryBase::UPtr>(isolate_, [this, result, action_metadata]
+  return EventQueue::instance().run<unity::scopes::PreviewQueryBase::UPtr>(
+      isolate_,
+      [this, result, action_metadata]
   {
     // wrap & fire
-    Result *r = new Result(result);
-    ActionMetaData *m = new ActionMetaData(action_metadata);
+    std::shared_ptr<Result> r(new Result(result));
+
+    std::shared_ptr<unity::scopes::ActionMetadata> m(
+        new unity::scopes::ActionMetadata(action_metadata));
 
     v8::Local<v8::Function> preview_callback =
         v8cpp::to_local<v8::Function>(isolate_, preview_callback_);
 
     v8::Handle<v8::Value> wrapped_preview =
-        v8cpp::call_v8(isolate_,
-                       preview_callback,
-                       v8cpp::to_v8(isolate_, r),
-                       v8cpp::to_v8(isolate_, m));
+        v8cpp::call_v8(
+          isolate_,
+          preview_callback,
+          v8cpp::to_v8(isolate_, r),
+          v8cpp::to_v8(isolate_, m)
+        );
 
     // TODO watch out release
-    PreviewQuery * sq =
-        v8cpp::from_v8<PreviewQuery*>(isolate_, wrapped_preview);
+    std::shared_ptr<PreviewQuery> sq =
+      v8cpp::from_v8<std::shared_ptr<PreviewQuery>>(
+          isolate_,
+          wrapped_preview);
 
-    return unity::scopes::PreviewQueryBase::UPtr(sq);
+    return unity::scopes::PreviewQueryBase::UPtr(new PreviewQueryProxy(sq));
   });
 }
 
@@ -267,18 +318,3 @@
   v8::Local<v8::Function> cb = v8::Handle<v8::Function>::Cast(args[0]);
   preview_callback_.Reset(args.GetIsolate(), cb);
 }
-
-v8::Local<v8::Value> ScopeBase::get_scope_directory(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), scope_directory().c_str());
-}
-
-v8::Local<v8::Value> ScopeBase::get_cache_directory(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), cache_directory().c_str());
-}
-
-v8::Local<v8::Value> ScopeBase::get_tmp_directory(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), tmp_directory().c_str());
-}

=== modified file 'src/bindings/src/scope-base.h'
--- src/bindings/src/scope-base.h	2015-07-28 12:15:26 +0000
+++ src/bindings/src/scope-base.h	2015-10-09 07:21:04 +0000
@@ -36,13 +36,8 @@
 
   void onsearch(v8::FunctionCallbackInfo<v8::Value> const& args);
   void onpreview(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  v8::Local<v8::Value> get_scope_directory(
-      v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> get_cache_directory(
-      v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> get_tmp_directory(
-      v8::FunctionCallbackInfo<v8::Value> const& args);
+  void onactivate(v8::FunctionCallbackInfo<v8::Value> const& args);
+  void onperform_action(v8::FunctionCallbackInfo<v8::Value> const& args);
 
   // unity::scopes::ScopeBase implementation
   void start(std::string const& scope_id) override;
@@ -76,6 +71,8 @@
 
   v8::Persistent<v8::Function> search_callback_;
   v8::Persistent<v8::Function> preview_callback_;
+  v8::Persistent<v8::Function> activate_callback_;
+  v8::Persistent<v8::Function> perform_action_callback_;
 };
 
 #endif // _UNITY_JS_SCOPES_BASE_H_

=== added file 'src/bindings/src/search-query-proxy.cc'
--- src/bindings/src/search-query-proxy.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/search-query-proxy.cc	2015-10-09 07:21:04 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#include "search-query-proxy.h"
+
+#include <unity/scopes/Result.h>
+#include <unity/scopes/SearchMetadata.h>
+
+SearchQueryProxy::SearchQueryProxy(
+      std::shared_ptr<unity::scopes::SearchQueryBase> backend)
+    : unity::scopes::SearchQueryBase(backend->query(), backend->search_metadata()),
+      backend_(backend) {
+}
+
+void SearchQueryProxy::run(unity::scopes::SearchReplyProxy const &reply) {
+  backend_->run(reply);
+}
+
+unity::scopes::CannedQuery SearchQueryProxy::query() const {
+  return backend_->query();
+}
+
+unity::scopes::SearchMetadata SearchQueryProxy::search_metadata() const {
+  return backend_->search_metadata();
+}
+
+void SearchQueryProxy::cancelled() {
+  backend_->cancelled();
+}
+
+bool SearchQueryProxy::valid() const {
+  return backend_->valid();
+}
+
+unity::scopes::VariantMap SearchQueryProxy::settings() const {
+  return backend_->settings();
+}

=== added file 'src/bindings/src/search-query-proxy.h'
--- src/bindings/src/search-query-proxy.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/search-query-proxy.h	2015-10-09 07:21:04 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes 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/>.
+ */
+
+#ifndef _UNITY_JS_SEARCH_QUERY_PROXY_H_
+#define _UNITY_JS_SEARCH_QUERY_PROXY_H_
+
+#include <unity/scopes/SearchQueryBase.h>
+
+#include <v8-cpp.h>
+
+
+class SearchQueryProxy : public unity::scopes::SearchQueryBase
+{
+ public:
+  SearchQueryProxy(
+      std::shared_ptr<unity::scopes::SearchQueryBase> backend);
+
+  void run(unity::scopes::SearchReplyProxy const &reply) override;
+  unity::scopes::CannedQuery query() const;
+  unity::scopes::SearchMetadata search_metadata() const;
+  void cancelled() override;
+  bool valid() const;
+  unity::scopes::VariantMap settings() const;
+
+  // TODO handle the subsearch override functions
+
+ private:
+  std::shared_ptr<unity::scopes::SearchQueryBase> backend_;
+};
+
+#endif // _UNITY_JS_SEARCH_QUERY_PROXY_H_
+
+

=== modified file 'src/bindings/src/search-query.cc'
--- src/bindings/src/search-query.cc	2015-08-25 09:40:42 +0000
+++ src/bindings/src/search-query.cc	2015-10-09 07:21:04 +0000
@@ -18,7 +18,6 @@
 
 #include "search-query.h"
 
-#include "canned-query.h"
 #include "search-metadata.h"
 #include "search-reply.h"
 #include "event_queue.h"
@@ -83,14 +82,6 @@
   cancelled_callback_.Reset(args.GetIsolate(), cb);
 }
 
-v8::Local<v8::Value> SearchQuery::query(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  CannedQuery *q =
-    new CannedQuery(unity::scopes::SearchQueryBase::query());
-
-  return v8cpp::to_v8(isolate_, q);
-}
-
 void SearchQuery::run(unity::scopes::SearchReplyProxy const& reply) {
   if (run_callback_.IsEmpty()) {
     return;
@@ -99,14 +90,18 @@
   EventQueue::instance().run(isolate_, [this, reply]
   {
     // wrap & fire
-    SearchReply *sr = new SearchReply(reply);
-
-    auto wrapped_sr = v8cpp::to_v8(isolate_, sr);
+    std::shared_ptr<SearchReply> sr =
+      std::shared_ptr<SearchReply>(new SearchReply(reply));
 
     v8::Local<v8::Function> run_callback =
-        v8cpp::to_local<v8::Function>(isolate_, run_callback_);
+      v8cpp::to_local<v8::Function>(isolate_, run_callback_);
 
-    v8cpp::call_v8(isolate_, run_callback, wrapped_sr);
+    v8cpp::call_v8_with_receiver(
+        isolate_,
+        v8cpp::to_v8(isolate_, shared_from_this()),
+        run_callback,
+        v8cpp::to_v8(isolate_, sr)
+    );
   });
 }
 
@@ -120,23 +115,10 @@
     v8::Local<v8::Function> cancelled_callback =
         v8cpp::to_local<v8::Function>(isolate_, cancelled_callback_);
 
-    v8cpp::call_v8(isolate_, cancelled_callback);
+    v8cpp::call_v8_with_receiver(
+        isolate_,
+        v8cpp::to_v8(isolate_, shared_from_this()),
+        cancelled_callback
+    );
   });
 }
-
-v8::Local<v8::Value> SearchQuery::valid(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(
-      args.GetIsolate(),
-      unity::scopes::SearchQueryBase::valid());
-}
-
-v8::Local<v8::Value> SearchQuery::settings(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), nullptr);
-}
-
-v8::Local<v8::Value> SearchQuery::search_metadata(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  return v8cpp::to_v8(args.GetIsolate(), nullptr);
-}

=== modified file 'src/bindings/src/search-query.h'
--- src/bindings/src/search-query.h	2015-07-29 08:31:17 +0000
+++ src/bindings/src/search-query.h	2015-10-09 07:21:04 +0000
@@ -23,7 +23,8 @@
 
 #include <v8-cpp.h>
 
-class SearchQuery : public unity::scopes::SearchQueryBase
+class SearchQuery : public unity::scopes::SearchQueryBase,
+    public std::enable_shared_from_this<SearchQuery>
 {
  public:
   SearchQuery(unity::scopes::CannedQuery const& query,
@@ -35,11 +36,6 @@
   // v8 binding
   void onrun(v8::FunctionCallbackInfo<v8::Value> const& args);
   void oncancelled(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> query(v8::FunctionCallbackInfo<v8::Value> const& args);
-
-  v8::Local<v8::Value> valid(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> settings(v8::FunctionCallbackInfo<v8::Value> const& args);
-  v8::Local<v8::Value> search_metadata(v8::FunctionCallbackInfo<v8::Value> const& args);
  
   // unity::scopes::SearchQueryBase implementation
   void run(unity::scopes::SearchReplyProxy const& reply) override;

=== modified file 'src/bindings/src/search-reply.cc'
--- src/bindings/src/search-reply.cc	2015-08-27 11:46:23 +0000
+++ src/bindings/src/search-reply.cc	2015-10-09 07:21:04 +0000
@@ -22,8 +22,6 @@
 
 #include <unity/scopes/SearchReply.h>
 
-#include "categorised-result.h"
-#include "category.h"
 
 SearchReply::SearchReply(unity::scopes::SearchReplyProxy const& reply)
   : reply_(reply){
@@ -32,51 +30,26 @@
 SearchReply::~SearchReply() {
 }
 
-v8::Local<v8::Value> SearchReply::register_category(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 3) {
-    // TODO fix
-    throw std::runtime_error("Invalid number of arguments");
-  }
-
-  if (!args[0]->IsString()
-      || !args[1]->IsString()
-      || !args[2]->IsString()) {
-    // TODO fix
-    throw std::runtime_error("Invalid type of arguments");
-  }
-
-  std::string id;
-  std::string title;
-  std::string icon;
-
-  id = *(v8::String::Utf8Value(args[0]->ToString()));
-  title = *(v8::String::Utf8Value(args[1]->ToString()));
-  icon = *(v8::String::Utf8Value(args[2]->ToString()));
-
-  Category *category = new Category(reply_->register_category(id, title, icon));
-
-  v8::Isolate *isolate = args.GetIsolate();
-
-  return v8cpp::to_v8(isolate, category);
+unity::scopes::Category::SCPtr SearchReply::lookup_category(
+      const std::string& id) {
+  return reply_->lookup_category(id);
 }
 
 void SearchReply::push(
-      v8::FunctionCallbackInfo<v8::Value> const& args) {
-  if (args.Length() != 1) {
-    // TODO fix
-    throw std::runtime_error("Invalid number of arguments");
-  }
-
-  CategorisedResult *r =
-    v8cpp::from_v8<CategorisedResult*>(
-        v8::Isolate::GetCurrent(),
-        args[0]->ToObject());
-  if (!r) {
-    throw std::runtime_error("Invalid argument type");
-  }
-
-  reply_->push(static_cast<const unity::scopes::CategorisedResult &>(*r));
+      std::shared_ptr<unity::scopes::CategorisedResult> categorised_result) {
+  reply_->push(*categorised_result);
+}
+
+unity::scopes::Category::SCPtr SearchReply::register_category(
+      const std::string& id,
+      const std::string& title,
+      const std::string& icon,
+      std::shared_ptr<unity::scopes::CategoryRenderer> category_renderer) {
+  return reply_->register_category(
+      id,
+      title,
+      icon,
+      category_renderer ? *category_renderer : unity::scopes::CategoryRenderer());
 }
 
 void SearchReply::finished()

=== modified file 'src/bindings/src/search-reply.h'
--- src/bindings/src/search-reply.h	2015-08-27 11:46:23 +0000
+++ src/bindings/src/search-reply.h	2015-10-09 07:21:04 +0000
@@ -20,17 +20,29 @@
 #define _UNITY_JS_SEARCH_REPLY_H_
 
 #include <unity/scopes/SearchReplyProxyFwd.h>
+#include <unity/scopes/Category.h>
+#include <unity/scopes/CategorisedResult.h>
 
 #include <v8-cpp.h>
 
+
 class SearchReply
 {
  public:
   SearchReply(unity::scopes::SearchReplyProxy const& reply);
   ~SearchReply();
 
-  v8::Local<v8::Value> register_category(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void push(v8::FunctionCallbackInfo<v8::Value> const& args);
+  unity::scopes::Category::SCPtr register_category(
+      const std::string& id,
+      const std::string& title,
+      const std::string& icon,
+      std::shared_ptr<unity::scopes::CategoryRenderer> category_renderer);
+
+  unity::scopes::Category::SCPtr
+    lookup_category(const std::string& id);
+
+  void push(std::shared_ptr<unity::scopes::CategorisedResult> categorised_result);
+
   void finished();
 
  private:

=== modified file 'src/launcher/config.h.in'
--- src/launcher/config.h.in	2015-09-30 06:40:08 +0000
+++ src/launcher/config.h.in	2015-10-09 07:21:04 +0000
@@ -3,11 +3,11 @@
  *
  * This file is part of unity-js-scopes.
  *
- * webbrowser-app is free software; you can redistribute it and/or modify
+ * unity-js-scopes 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.
  *
- * webbrowser-app is distributed in the hope that it will be useful,
+ * unity-js-scopes 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.

=== modified file 'src/tool/config.h.in'
--- src/tool/config.h.in	2015-09-30 06:40:08 +0000
+++ src/tool/config.h.in	2015-10-09 07:21:04 +0000
@@ -3,11 +3,11 @@
  *
  * This file is part of unity-js-scopes.
  *
- * webbrowser-app is free software; you can redistribute it and/or modify
+ * unity-js-scopes 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.
  *
- * webbrowser-app is distributed in the hope that it will be useful,
+ * unity-js-scopes 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.

=== modified file 'src/tool/main.cc'
--- src/tool/main.cc	2015-10-05 05:39:27 +0000
+++ src/tool/main.cc	2015-10-09 07:21:04 +0000
@@ -219,26 +219,28 @@
 
       if (should_build)
       {
+        std::vector<std::string> environment_updates;
+        
         std::cout << "Setting target arch to '" << current_arch << "' ..." << std::endl;
         if (current_arch == "armhf")
         {
           if (boost::filesystem::exists("/usr/bin/arm-linux-gnueabihf-gcc-5"))
           {
             std::cout << "Setting armhf compiler to 'GCC 5' ..." << std::endl;
-            putenv("CC=arm-linux-gnueabihf-gcc-5");
-            putenv("CXX=arm-linux-gnueabihf-g++-5");
-            putenv("LINK=arm-linux-gnueabihf-g++-5");
-            putenv("AR=arm-linux-gnueabihf-ar");
-            putenv("npm_config_arch=arm");
+            environment_updates.push_back("CC=arm-linux-gnueabihf-gcc-5");
+            environment_updates.push_back("CXX=arm-linux-gnueabihf-g++-5");
+            environment_updates.push_back("LINK=arm-linux-gnueabihf-g++-5");
+            environment_updates.push_back("AR=arm-linux-gnueabihf-ar");
+            environment_updates.push_back("npm_config_arch=arm");
           }
           else if (boost::filesystem::exists("/usr/bin/arm-linux-gnueabihf-gcc-4.9"))
           {
             std::cout << "Setting armhf compiler to 'GCC 4.9' ..." << std::endl;
-            putenv("CC=arm-linux-gnueabihf-gcc-4.9");
-            putenv("CXX=arm-linux-gnueabihf-g++-4.9");
-            putenv("LINK=arm-linux-gnueabihf-g++-4.9");
-            putenv("AR=arm-linux-gnueabihf-ar");
-            putenv("npm_config_arch=arm");
+            environment_updates.push_back("CC=arm-linux-gnueabihf-gcc-4.9");
+            environment_updates.push_back("CXX=arm-linux-gnueabihf-g++-4.9");
+            environment_updates.push_back("LINK=arm-linux-gnueabihf-g++-4.9");
+            environment_updates.push_back("AR=arm-linux-gnueabihf-ar");
+            environment_updates.push_back("npm_config_arch=arm");
           }
           else
           {
@@ -246,6 +248,10 @@
           }
         }
 
+        for (auto e: environment_updates) {
+          putenv(const_cast<char*>(e.c_str()));
+        }
+        
         // Reinstall the unity-js-scopes module for new target arch
         install_unity_js_scopes(modules_dir);