Merge lp:~abreu-alexandre/unity-js-scopes/add-filter-state-handling into lp:unity-js-scopes

[Alexandre Abreu]

Add FilterState handling

Add FilterState handling

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/unity-js-scopes/add-filter-state-handling]

87. By Alexandre Abreu on 2015-10-21

merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/18/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Left some inline comments.

review: Needs Fixing

[lp:~abreu-alexandre/unity-js-scopes/add-filter-state-handling]

88. By Alexandre Abreu on 2015-10-22

updated

[Alexandre Abreu (abreu-alexandre)]

updated

[Marcus Tomlinson (marcustomlinson)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/21/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/simple/simple.js'
--- examples/simple/simple.js	2015-10-13 17:53:25 +0000
+++ examples/simple/simple.js	2015-10-22 13:54:24 +0000
@@ -50,7 +50,17 @@
                         new scopes.lib.categorised_result(category);
                     categorised_result.set_uri("http://www.ubuntu.com");
                     categorised_result.set_title("'" + qs + "'");
-                    
+
+                    var filter_state =
+                        new scopes.lib.filter_state();
+                    var option_filter =
+                        new scopes.lib.option_selector_filter('me', 'push', false);
+                    var option = option_filter.add_option("id", "yes");
+
+                    var p = search_reply.push([option_filter], filter_state);
+
+                    console.log(' push : ' + p);
+
                     search_reply.push(categorised_result);
                 },
                 // cancelled

=== modified file 'src/bindings/src/addon.cc'
--- src/bindings/src/addon.cc	2015-10-19 14:03:37 +0000
+++ src/bindings/src/addon.cc	2015-10-22 13:54:24 +0000
@@ -21,7 +21,6 @@
 #include <stdexcept>
 
 #include <unity/scopes/ActionMetadata.h>
-#include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/Category.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/Result.h>
@@ -34,9 +33,11 @@
 
 #include "action-metadata.h"
 #include "activation-query.h"
+#include "canned-query.h"
 #include "categorised-result.h"
 #include "department.h"
 #include "online-account-client.h"
+#include "option-selector-filter.h"
 #include "preview-query.h"
 #include "preview-reply.h"
 #include "preview-widget.h"
@@ -183,16 +184,17 @@
       .add_method("set_category", &CategorisedResult::set_category)
       .add_method("category", &CategorisedResult::category);
 
-    v8cpp::Class<unity::scopes::CannedQuery> canned_query(isolate);
+    v8cpp::Class<CannedQuery> canned_query(isolate);
     canned_query
-      .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);
+      .set_constructor<v8::FunctionCallbackInfo<v8::Value>>()
+      .add_method("set_department_id", &CannedQuery::set_department_id)
+      .add_method("set_query_string", &CannedQuery::set_query_string)
+      .add_method("set_filter_state", &CannedQuery::set_filter_state)
+      .add_method("scope_id", &CannedQuery::scope_id)
+      .add_method("department_id", &CannedQuery::department_id)
+      .add_method("query_string", &CannedQuery::query_string)
+      .add_method("to_uri", &CannedQuery::to_uri)
+      .add_method("filter_state", &CannedQuery::filter_state);
 
     // TODO Should it be more of a value type? (it seems to be used that way
     // in unity API)
@@ -246,6 +248,33 @@
       .add_method("region_name", &unity::scopes::Location::region_name)
       .add_method("has_vertical_accuracy", &unity::scopes::Location::has_vertical_accuracy);
 
+    v8cpp::Class<unity::scopes::FilterState> filter_state(isolate);
+    filter_state
+      .set_constructor<>()
+      .add_method("has_filter", &unity::scopes::FilterState::has_filter)
+      .add_method("remove", &unity::scopes::FilterState::remove);
+
+    v8cpp::Class<unity::scopes::FilterOption> filter_option(isolate);
+    filter_option
+      .add_method("id", &unity::scopes::FilterOption::id)
+      .add_method("label", &unity::scopes::FilterOption::label);
+
+    v8cpp::Class<OptionSelectorFilter> option_selector_filter(isolate);
+    option_selector_filter
+      .set_constructor<std::string, std::string, bool>()
+      .add_method("label", &OptionSelectorFilter::label)
+      .add_method("multi_select", &OptionSelectorFilter::multi_select)
+      .add_method("add_option", &OptionSelectorFilter::add_option)
+      .add_method("options", &OptionSelectorFilter::options)
+      .add_method("has_active_option", &OptionSelectorFilter::has_active_option)
+      .add_method("active_options", &OptionSelectorFilter::active_options)
+      .add_method("update_state", &OptionSelectorFilter::update_state)
+      // FilterBase
+      .add_method("set_display_hints", &OptionSelectorFilter::set_display_hints)
+      .add_method("display_hints", &OptionSelectorFilter::display_hints)
+      .add_method("id", &OptionSelectorFilter::id)
+      .add_method("filter_type", &OptionSelectorFilter::filter_type);
+
     v8cpp::Class<PreviewWidget> preview_widget(isolate);
     preview_widget
       .set_constructor<v8::Local<v8::Value>, v8::Local<v8::Value>>()
@@ -311,7 +340,7 @@
 
     v8cpp::Class<SearchQuery> search_query(isolate);
     search_query
-      .set_constructor<std::shared_ptr<unity::scopes::CannedQuery>, std::shared_ptr<unity::scopes::SearchMetadata>, v8::Local<v8::Function>, v8::Local<v8::Function>>()
+      .set_constructor<std::shared_ptr<CannedQuery>, std::shared_ptr<unity::scopes::SearchMetadata>, v8::Local<v8::Function>, v8::Local<v8::Function>>()
       .add_method("onrun", &SearchQuery::onrun)
       .add_method("oncancelled", &SearchQuery::oncancelled);
 
@@ -368,8 +397,11 @@
     module.add_class("category_renderer", category_renderer);
     module.add_class("column_layout", column_layout);
     module.add_class("department", department);
+    module.add_class("filter_option", filter_option);
+    module.add_class("filter_state", filter_state);
     module.add_class("location", location);
     module.add_class("online_account_client", online_account_client);
+    module.add_class("option_selector_filter", option_selector_filter);
     module.add_class("preview_widget", preview_widget);
     module.add_class("preview_query", preview_query);
     module.add_class("preview_reply", preview_reply);
@@ -387,6 +419,8 @@
     // Standalone functions
     module.add_function("new_category_renderer_from_file", &new_category_renderer_from_file);
 
+    module.add_function("create_option_selector_filter", &unity::scopes::OptionSelectorFilter::create);
+    
     module.add_function("runtime_version", &get_scopes_runtime_version);
 
     exports->SetPrototype(module.create_prototype());

=== added file 'src/bindings/src/canned-query.cc'
--- src/bindings/src/canned-query.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/canned-query.cc	2015-10-22 13:54:24 +0000
@@ -0,0 +1,90 @@
+/*
+ * 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(v8::FunctionCallbackInfo<v8::Value> const& args) {
+  if (args.Length() != 3) {
+    throw std::runtime_error("Invalid number of arguments");
+  }
+
+  if (!args[0]->IsString()) {
+    throw std::runtime_error("Invalid type for argument index 1");
+  }
+
+  std::string scope_id =
+    *(v8::String::Utf8Value(args[0]->ToString()));
+
+  if (args[1]->IsString() && args[2]->IsString()) {
+
+    std::string query_str =
+      *(v8::String::Utf8Value(args[1]->ToString()));
+
+    std::string department_id =
+      *(v8::String::Utf8Value(args[2]->ToString()));
+
+    query_.reset(
+        new unity::scopes::CannedQuery(
+            scope_id,
+            query_str,
+            department_id));
+  } else {
+    query_.reset(
+        new unity::scopes::CannedQuery(scope_id));
+  }
+}
+
+CannedQuery::CannedQuery(const unity::scopes::CannedQuery& canned_query) {
+  query_.reset(new unity::scopes::CannedQuery(canned_query));
+}
+
+void CannedQuery::set_department_id(const std::string& department_id) {
+  query_->set_department_id(department_id);
+}
+
+void CannedQuery::set_query_string(const std::string& query_string) {
+  query_->set_query_string(query_string);
+}
+
+void CannedQuery::set_filter_state(std::shared_ptr<unity::scopes::FilterState> filter_state) {
+  query_->set_filter_state(*filter_state);
+}
+
+std::string CannedQuery::scope_id() const {
+  return query_->scope_id();
+}
+
+std::string CannedQuery::department_id() const {
+  return query_->department_id();
+}
+
+std::string CannedQuery::query_string() const {
+  return query_->query_string();
+}
+
+std::string CannedQuery::to_uri() const {
+  return query_->to_uri();
+}
+
+unity::scopes::FilterState CannedQuery::filter_state() const {
+  return query_->filter_state();
+}
+
+unity::scopes::CannedQuery & CannedQuery::canned_query() {
+  return *query_.get();
+}

=== added file 'src/bindings/src/canned-query.h'
--- src/bindings/src/canned-query.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/canned-query.h	2015-10-22 13:54:24 +0000
@@ -0,0 +1,49 @@
+/*
+ * 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(const unity::scopes::CannedQuery& canned_query);
+  CannedQuery(v8::FunctionCallbackInfo<v8::Value> const& args);
+
+  // v8 bindings
+  void set_department_id(const std::string& department_id);
+  void set_query_string(const std::string& query_string);
+  void set_filter_state(std::shared_ptr<unity::scopes::FilterState> filter_state);
+
+  std::string scope_id() const;
+  std::string department_id() const;
+  std::string query_string() const;
+  std::string to_uri() const;
+  unity::scopes::FilterState filter_state() const;
+
+  unity::scopes::CannedQuery & canned_query();
+
+ private:
+  std::unique_ptr<unity::scopes::CannedQuery> query_;
+};
+
+#endif // _UNITY_JS_CANNED_QUERY_H_

=== added file 'src/bindings/src/option-selector-filter.cc'
--- src/bindings/src/option-selector-filter.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/option-selector-filter.cc	2015-10-22 13:54:24 +0000
@@ -0,0 +1,86 @@
+/*
+ * 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 "option-selector-filter.h"
+
+
+OptionSelectorFilter::OptionSelectorFilter(
+      std::string const &id,
+      std::string const &label,
+      bool multi_select)
+  : filter_(unity::scopes::OptionSelectorFilter::create(id, label, multi_select)){
+}
+
+std::string OptionSelectorFilter::label() const {
+  return filter_->label();
+}
+
+bool OptionSelectorFilter::multi_select() const {
+  return filter_->multi_select();
+}
+
+unity::scopes::FilterOption::SCPtr OptionSelectorFilter::add_option(
+      std::string const& id,
+      std::string const& label) {
+  return filter_->add_option(id, label);
+}
+
+std::list<unity::scopes::FilterOption::SCPtr> OptionSelectorFilter::options() const {
+  return filter_->options();
+}
+
+bool OptionSelectorFilter::has_active_option(
+      unity::scopes::FilterState const& filter_state) const {
+  return filter_->has_active_option(filter_state);
+}
+
+std::set<unity::scopes::FilterOption::SCPtr> OptionSelectorFilter::active_options(
+      unity::scopes::FilterState const& filter_state) const {
+  return filter_->active_options(filter_state);
+}
+
+void OptionSelectorFilter::update_state(
+      unity::scopes::FilterState& filter_state,
+      unity::scopes::FilterOption::SCPtr option,
+      bool active) const {
+  filter_->update_state(filter_state, option, active);
+}
+
+void OptionSelectorFilter::set_display_hints(int hints) {
+  filter_->set_display_hints(hints);
+}
+
+int OptionSelectorFilter::display_hints() const {
+  return filter_->display_hints();
+}
+
+std::string OptionSelectorFilter::id() const {
+  return filter_->id();
+}
+
+unity::scopes::VariantMap OptionSelectorFilter::serialize() const {
+  return filter_->serialize();
+}
+
+std::string OptionSelectorFilter::filter_type() const {
+  return filter_->filter_type();
+}
+
+unity::scopes::OptionSelectorFilter::SPtr OptionSelectorFilter::get_filter() {
+  return filter_;
+}

=== added file 'src/bindings/src/option-selector-filter.h'
--- src/bindings/src/option-selector-filter.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/option-selector-filter.h	2015-10-22 13:54:24 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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_OPTION_SELECTOR_FILTER_H_
+#define _UNITY_JS_OPTION_SELECTOR_FILTER_H_
+
+#include <unity/scopes/OptionSelectorFilter.h>
+
+#include <v8-cpp.h>
+
+
+class OptionSelectorFilter
+{
+ public:
+  OptionSelectorFilter(std::string const &id, std::string const &label, bool multi_select);
+
+  std::string label() const;
+  bool multi_select() const;
+  unity::scopes::FilterOption::SCPtr add_option(std::string const& id, std::string const& label);
+  std::list<unity::scopes::FilterOption::SCPtr> options() const;
+  bool has_active_option(unity::scopes::FilterState const& filter_state) const;
+  std::set<unity::scopes::FilterOption::SCPtr> active_options(unity::scopes::FilterState const& filter_state) const;
+  void update_state(unity::scopes::FilterState& filter_state, unity::scopes::FilterOption::SCPtr option, bool active) const;
+
+  void set_display_hints(int hints);
+  int display_hints() const;
+  std::string id() const;
+  unity::scopes::VariantMap serialize() const;
+  std::string filter_type() const;
+
+  unity::scopes::OptionSelectorFilter::SPtr get_filter();
+
+ private:
+  unity::scopes::OptionSelectorFilter::SPtr filter_;
+};
+
+#endif // _UNITY_JS_OPTION_SELECTOR_FILTER_H_
+
+

=== modified file 'src/bindings/src/scope-base.cc'
--- src/bindings/src/scope-base.cc	2015-10-09 17:00:22 +0000
+++ src/bindings/src/scope-base.cc	2015-10-22 13:54:24 +0000
@@ -21,6 +21,7 @@
 #include "action-metadata.h"
 #include "activation-query.h"
 #include "activation-query-proxy.h"
+#include "canned-query.h"
 #include "search-query.h"
 #include "search-query-proxy.h"
 #include "search-metadata.h"
@@ -109,8 +110,8 @@
   return EventQueue::instance().run<unity::scopes::SearchQueryBase::UPtr>(isolate_, [this, query, metadata]
   {
     // wrap & fire
-    std::shared_ptr<unity::scopes::CannedQuery> q(
-        new unity::scopes::CannedQuery(std::move(query)));
+    std::shared_ptr<CannedQuery> q(
+        new CannedQuery(query));
 
     std::shared_ptr<SearchMetaData> m(
       new SearchMetaData(metadata));

=== modified file 'src/bindings/src/search-query.cc'
--- src/bindings/src/search-query.cc	2015-10-13 17:53:25 +0000
+++ src/bindings/src/search-query.cc	2015-10-22 13:54:24 +0000
@@ -23,11 +23,11 @@
 #include "event_queue.h"
 
 SearchQuery::SearchQuery(
-      std::shared_ptr<unity::scopes::CannedQuery> query,
+      std::shared_ptr<CannedQuery> query,
       std::shared_ptr<unity::scopes::SearchMetadata> metadata,
       const v8::Local<v8::Function> &run_callback,
       const v8::Local<v8::Function> &cancelled_callback)
-  : unity::scopes::SearchQueryBase(*query, *metadata),
+  : unity::scopes::SearchQueryBase(query->canned_query(), *metadata),
     isolate_(v8::Isolate::GetCurrent()),
     run_callback_(v8::Isolate::GetCurrent(), run_callback),
     cancelled_callback_(v8::Isolate::GetCurrent(), cancelled_callback) {

=== modified file 'src/bindings/src/search-query.h'
--- src/bindings/src/search-query.h	2015-10-13 17:53:25 +0000
+++ src/bindings/src/search-query.h	2015-10-22 13:54:24 +0000
@@ -21,13 +21,15 @@
 
 #include <unity/scopes/SearchQueryBase.h>
 
+#include "canned-query.h"
+
 #include <v8-cpp.h>
 
 class SearchQuery : public unity::scopes::SearchQueryBase,
     public std::enable_shared_from_this<SearchQuery>
 {
  public:
-  SearchQuery(std::shared_ptr<unity::scopes::CannedQuery> query,
+  SearchQuery(std::shared_ptr<CannedQuery> query,
               std::shared_ptr<unity::scopes::SearchMetadata> metadata,
               const v8::Local<v8::Function> &run_callback,
               const v8::Local<v8::Function> &cancelled_callback);

=== modified file 'src/bindings/src/search-reply.cc'
--- src/bindings/src/search-reply.cc	2015-10-19 14:03:37 +0000
+++ src/bindings/src/search-reply.cc	2015-10-22 13:54:24 +0000
@@ -18,16 +18,40 @@
 
 #include "search-reply.h"
 
+#include "categorised-result.h"
+#include "option-selector-filter.h"
+
 #include <stdexcept>
 
 #include <unity/scopes/SearchReply.h>
 
 
+namespace {
+
+unity::scopes::Filters from_v8_to_filters(
+      v8::Isolate* isolate,
+      v8::Local<v8::Value> value) {
+  unity::scopes::Filters
+    filter_bases;
+  v8::Handle<v8::Object> o = v8::Handle<v8::Object>::Cast(value);
+  for (size_t i = 0;
+       i < o->Get(v8::String::NewFromUtf8(isolate, "length"))->ToObject()->Uint32Value();
+       ++i) {
+    v8::Local<v8::Value> fv = o->Get(i);
+    try {
+      auto f = v8cpp::from_v8<std::shared_ptr<OptionSelectorFilter>>(isolate, fv);
+      filter_bases.push_back(f->get_filter());
+    } catch(...) { }
+  }
+  return filter_bases;
+}
+  
+}
+
+
 SearchReply::SearchReply(unity::scopes::SearchReplyProxy const& reply)
-  : reply_(reply){
-}
-
-SearchReply::~SearchReply() {
+  : isolate_(v8::Isolate::GetCurrent())
+  , reply_(reply){
 }
 
 unity::scopes::Category::SCPtr SearchReply::lookup_category(
@@ -35,9 +59,24 @@
   return reply_->lookup_category(id);
 }
 
-void SearchReply::push(
-      std::shared_ptr<CategorisedResult> categorised_result) {
-  reply_->push(*categorised_result);
+bool SearchReply::push(v8::FunctionCallbackInfo<v8::Value> const& args) {
+  if (args.Length() != 1 && args.Length() != 2) {
+    throw std::runtime_error("Invalid number of arguments");
+  }
+
+  if (args.Length() == 1) {
+    auto cr =
+      v8cpp::from_v8<std::shared_ptr<CategorisedResult>>(isolate_, args[0]);
+    return reply_->push(*cr);
+  }
+
+  auto filter_state =
+      v8cpp::from_v8<std::shared_ptr<unity::scopes::FilterState>>(isolate_, args[1]);
+
+  // TODO fix v8cpp shortcoming here
+  return reply_->push(
+      from_v8_to_filters(isolate_, args[0]),
+      *filter_state);
 }
 
 unity::scopes::Category::SCPtr SearchReply::register_category(

=== modified file 'src/bindings/src/search-reply.h'
--- src/bindings/src/search-reply.h	2015-10-16 19:33:32 +0000
+++ src/bindings/src/search-reply.h	2015-10-22 13:54:24 +0000
@@ -32,7 +32,6 @@
 {
  public:
   SearchReply(unity::scopes::SearchReplyProxy const& reply);
-  ~SearchReply();
 
   void register_departments(std::shared_ptr<Department> department);
 
@@ -45,12 +44,13 @@
   unity::scopes::Category::SCPtr
     lookup_category(const std::string& id);
 
-  void push(std::shared_ptr<CategorisedResult> categorised_result);
+  bool push(v8::FunctionCallbackInfo<v8::Value> const& args);
 
   void finished();
 
  private:
 
+  v8::Isolate* isolate_;
   unity::scopes::SearchReplyProxy const reply_;
 };