Merge lp:~marcustomlinson/unity-js-scopes/lp-1524200 into lp:unity-js-scopes

[Marcus Tomlinson]

Bind both the original Variant class and our bound version in order to support direct and indirect access to variants via the bindings

[lp:~marcustomlinson/unity-js-scopes/lp-1524200]

118. By Marcus Tomlinson on 2015-12-09

Bind both the original Variant class and our bound version in order to support direct and indirect access to variants via the bindings

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

+1

=== modified file 'qtc-templates/scope-js/src/data/displayName-settings.ini.in'
--- qtc-templates/scope-js/src/data/displayName-settings.ini.in	2015-10-22 05:41:05 +0000
+++ qtc-templates/scope-js/src/data/displayName-settings.ini.in	2015-12-09 07:25:35 +0000
@@ -1,7 +1,7 @@
 @if "%ContentType%" != "empty"
-# Below are some example settings. You can access your scope's
-# settings by calling settings() from the Query::run() method.
-# E.g. auto location = settings().at("location").get_string();
+# Below are some example settings. You can access your scope's settings by
+# calling scopes.self.settings from anywhere in your scope implementation.
+# E.g. var location = scopes.self.settings["location"].get_string();
 
 #[location]
 #type = string
 
=== modified file 'src/bindings/src/addon.cc'
--- src/bindings/src/addon.cc	2015-11-20 12:10:10 +0000
+++ src/bindings/src/addon.cc	2015-12-09 07:25:35 +0000
@@ -89,6 +89,7 @@
     variant
       .set_constructor<v8::Local<v8::Value>>()
       .add_method("get_int", &Variant::get_int)
+      .add_method("get_int64_t", &Variant::get_int64_t)
       .add_method("get_double", &Variant::get_double)
       .add_method("get_bool", &Variant::get_bool)
       .add_method("get_string", &Variant::get_string)
@@ -98,6 +99,22 @@
       .add_method("which", &Variant::which)
       .add_method("serialize_json", &Variant::serialize_json);
 
+    // Also bind the original Variant class for direct access (E.g. via settings)
+    v8cpp::Class<unity::scopes::Variant> variant_base(isolate);
+    variant_base
+      .add_method("get_int", &unity::scopes::Variant::get_int)
+      .add_method("get_int64_t", &unity::scopes::Variant::get_int64_t)
+      .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);
+
+
     v8cpp::Class<JavascriptScopeRuntime> js_scope(isolate);
     js_scope
       .add_method("scope_base", &JavascriptScopeRuntime::scope_base)
@@ -454,6 +471,7 @@
     module.add_class("SearchQuery", search_query);
     module.add_class("SearchMetadata", search_metadata);
     module.add_class("Variant", variant);
+    module.add_class("VariantBase", variant_base);
 
     // Factory functions
     module.add_function("new_scope", &new_scope);
 
=== modified file 'src/bindings/src/common.cc'
--- src/bindings/src/common.cc	2015-10-08 14:02:02 +0000
+++ src/bindings/src/common.cc	2015-12-09 07:25:35 +0000
@@ -71,6 +71,13 @@
 
 unity::scopes::Variant unity::scopesjs::to_variant(
       v8::Local<v8::Value> value) {
+  try
+  {
+    // Check first that the value recieved is not already a unity::scopes::Variant
+    return v8cpp::from_v8<unity::scopes::Variant>(v8::Isolate::GetCurrent(), value);
+  }
+  catch (std::exception const&) {}
+
   using unity::scopes::Variant;
   using unity::scopes::VariantArray;
   using unity::scopes::VariantMap;
 
=== modified file 'src/bindings/src/variant.cc'
--- src/bindings/src/variant.cc	2015-10-19 20:21:29 +0000
+++ src/bindings/src/variant.cc	2015-12-09 07:25:35 +0000
@@ -64,6 +64,10 @@
   return variant_->get_int();
 }
 
+int64_t Variant::get_int64_t() const {
+  return variant_->get_int64_t();
+}
+
 double Variant::get_double() const {
   return variant_->get_double();
 }
 
=== modified file 'src/bindings/src/variant.h'
--- src/bindings/src/variant.h	2015-10-19 20:21:29 +0000
+++ src/bindings/src/variant.h	2015-12-09 07:25:35 +0000
@@ -37,6 +37,7 @@
   // v8 bindings
   std::string serialize_json() const;
   int get_int() const;
+  int64_t get_int64_t() const;
   double get_double() const;
   bool get_bool() const;
   std::string get_string() const;