Merge lp:~abreu-alexandre/unity-js-scopes/search-reply-activation-response into lp:unity-js-scopes

[Alexandre Abreu]

Handle SearchReply as an activation response creation parameter

Handle SearchReply as an activation response creation parameter

[Alberto Mardegan (mardy)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'examples/soundcloud/soundcloud.js'
--- examples/soundcloud/soundcloud.js	2016-02-15 20:34:33 +0000
+++ examples/soundcloud/soundcloud.js	2016-02-17 14:43:26 +0000
@@ -268,20 +268,20 @@
                 action_id,
                 // activate
                 function() {
-                    console.log('activate called');
+                    console.log('Activate called');
 
-                    var result;
+                    var activation_response;
                     switch (action_id) {
                         case 'updateId':
-                            result = activateUpdatePreview();
+                            activation_response = activateUpdatePreview();
                             break;
                         default:
-                            result = new scopes.lib.ActivationResponse(
+                            activation_response = new scopes.lib.ActivationResponse(
                                 scopes.defs.ActivationResponseStatus.NotHandled);
                             break;
                     }
 
-                    return result;
+                    return activation_response;
                 },
                 // cancelled
                 function() {

=== modified file 'src/bindings/index.js'
--- src/bindings/index.js	2016-02-13 16:01:06 +0000
+++ src/bindings/index.js	2016-02-17 14:43:26 +0000
@@ -221,7 +221,9 @@
     ShowDash: 1,
     HideDash: 2,
     ShowPreview: 3,
-    PerformQuery: 4
+    PerformQuery: 4,
+    UpdateResult: 5,
+    UpdatePreview: 6
 };
 
 module.exports = {

=== modified file 'src/bindings/src/activation-response.cc'
--- src/bindings/src/activation-response.cc	2016-02-15 20:34:33 +0000
+++ src/bindings/src/activation-response.cc	2016-02-17 14:43:26 +0000
@@ -51,13 +51,24 @@
     activation_response_.reset(
         new unity::scopes::ActivationResponse(widgets_list));
   } else {
-    auto query =
-        v8cpp::from_v8<std::shared_ptr<CannedQuery>>(
-            v8::Isolate::GetCurrent(),
-            arg);
-    activation_response_.reset(
-        new unity::scopes::ActivationResponse(
-            query->canned_query()));
+    // TODO fix at the v8cpp level
+    try {
+      auto query =
+          v8cpp::from_v8<std::shared_ptr<CannedQuery>>(
+              v8::Isolate::GetCurrent(),
+              arg);
+      activation_response_.reset(
+          new unity::scopes::ActivationResponse(
+              query->canned_query()));
+    } catch (std::invalid_argument& e) {
+      auto result =
+          v8cpp::from_v8<std::shared_ptr<Result>>(
+              v8::Isolate::GetCurrent(),
+              arg);
+      activation_response_.reset(
+          new unity::scopes::ActivationResponse(
+              *result));
+    }
   }
 }
 

=== modified file 'src/bindings/src/activation-response.h'
--- src/bindings/src/activation-response.h	2016-02-15 20:34:33 +0000
+++ src/bindings/src/activation-response.h	2016-02-17 14:43:26 +0000
@@ -41,7 +41,11 @@
 --doc:constructor
  *
  * @constructor
- * @param status|query|{Array of PreviewWidget} ActivationResponseStatus to create a response with given status OR CannedQuery to create an ActivationResponse with status defs.ActivationResponseStatus.PerformQuery and a search query to be executed OR an array of PreviewWidgets to create an ActivationResponse with status defs.ActivationResponseStatus.UpdatePreview to update the given widgets
+ * @param status|query|result|{Array of PreviewWidget} The parameter can be of different types depending on the intended ActivationResponse:
+                                                         - ActivationResponseStatus to create a response with given status
+                                                         - CannedQuery to create an ActivationResponse with status defs.ActivationResponseStatus.PerformQuery and a search query to be executed
+                                                         - SearchResult to create an ActivationResponse with status defs.ActivationResponseStatus.UpdateResult
+                                                         -  an array of PreviewWidgets to create an ActivationResponse with status defs.ActivationResponseStatus.UpdatePreview to update the given widgets
 --/doc:constructor
 
 --doc:prototype ActivationResponse