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

[Marcus Tomlinson]

* Check if the value given to unity::scopesjs::to_variant() is not already a bound Variant type.
* Do array check before object check in unity::scopesjs::to_variant() (arrays are also objects).
* Handle array of dicts when recieving object variants in PreviewWidget::add_attribute_value().

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

Good stuff, +1

review: Approve

[Marcus Tomlinson (marcustomlinson)]

Top approving

=== modified file 'src/bindings/src/common.cc'
--- src/bindings/src/common.cc	2015-12-09 07:22:06 +0000
+++ src/bindings/src/common.cc	2016-02-04 10:18:11 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "common.h"
+#include "variant.h"
 
 v8::Local<v8::Value> unity::scopesjs::from_variant(
       const unity::scopes::Variant& variant) {
@@ -73,6 +74,13 @@
       v8::Local<v8::Value> value) {
   try
   {
+    // Check first that the value recieved is not already a Variant
+    auto variant = v8cpp::from_v8<::Variant>(v8::Isolate::GetCurrent(), value);
+    return variant.variant();
+  }
+  catch (std::exception const&) {}
+  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);
   }
@@ -94,6 +102,19 @@
     v = Variant(value->ToBoolean()->Value());
   } else if (value->IsNumber()) {
     v = Variant(value->NumberValue());
+  } 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;
   } else if (value->IsObject()) {
     v8::Handle<v8::Object> o = v8::Handle<v8::Object>::Cast(value);
 
@@ -108,19 +129,6 @@
     }
 
     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;
 
=== modified file 'src/bindings/src/preview-widget.cc'
--- src/bindings/src/preview-widget.cc	2015-12-10 09:43:59 +0000
+++ src/bindings/src/preview-widget.cc	2016-02-04 10:18:11 +0000
@@ -86,7 +86,24 @@
     unity::scopes::Variant v =
       unity::scopesjs::to_variant(args[1]);
 
-    if (v.which() == unity::scopes::Variant::Dict) {
+    if (v.which() == unity::scopes::Variant::Array) {
+      unity::scopes::VariantArray va = v.get_array();
+
+      for (auto &d : va) {
+        if (d.which() == unity::scopes::Variant::Dict) {
+          unity::scopes::VariantMap vm = d.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);
+        }
+      }
+      preview_widget_->add_attribute_value(key, vb.end());
+    }
+    else if (v.which() == unity::scopes::Variant::Dict) {
       unity::scopes::VariantMap vm = v.get_dict();
       std::vector<std::pair<std::string, unity::scopes::Variant>> t;
 
 
=== modified file 'src/bindings/src/variant.cc'
--- src/bindings/src/variant.cc	2015-12-09 07:22:06 +0000
+++ src/bindings/src/variant.cc	2016-02-04 10:18:11 +0000
@@ -104,3 +104,7 @@
   return variant_string_from_type(variant_->which());
 }
 
+unity::scopes::Variant Variant::variant() const
+{
+  return * variant_;
+}
 
=== modified file 'src/bindings/src/variant.h'
--- src/bindings/src/variant.h	2015-12-09 07:22:06 +0000
+++ src/bindings/src/variant.h	2016-02-04 10:18:11 +0000
@@ -46,6 +46,8 @@
   bool is_null() const;
   std::string which();
 
+  unity::scopes::Variant variant() const;
+
  private:
   std::shared_ptr<unity::scopes::Variant> variant_;
 };