Merge pull request #111 from mvidner/doubly-nested-variant

Fix marshalling Data::Variant, don't nest it too much.

Author: mvidner

NEWS.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+Bug fixes:
+ * Properties containing Variants would return them doubly wrapped.
+
 ## Ruby D-Bus 0.18.0.beta4 - 2022-04-21
 
 Bug fixes:

lib/dbus/marshall.rb

@@ -282,8 +282,11 @@ def append(type, val)
 
     def append_variant(val)
       vartype = nil
-      if val.is_a?(DBus::Data::Base)
-        vartype = val.type # FIXME: box or unbox another variant?
+      if val.is_a?(DBus::Data::Variant)
+        vartype = val.member_type
+        vardata = val.value
+      elsif val.is_a?(DBus::Data::Base)
+        vartype = val.type
         vardata = val.value
       elsif val.is_a?(Array) && val.size == 2
         case val[0]

spec/property_spec.rb

@@ -163,7 +163,7 @@
     end
   end
 
-  context "an dict-typed property" do
+  context "a dict-typed property" do
     it "gets read as a hash" do
       val = @iface["MyDict"]
       expect(val).to eq({
@@ -172,6 +172,23 @@
                           "three" => [3, 3, 3]
                         })
     end
+
+    it "Get returns the correctly typed value (check with dbus-send)" do
+      cmd = "dbus-send --print-reply " \
+            "--dest=org.ruby.service " \
+            "/org/ruby/MyInstance " \
+            "org.freedesktop.DBus.Properties.Get " \
+            "string:org.ruby.SampleInterface " \
+            "string:MyDict"
+      reply = `#{cmd}`
+      # a bug about variant nesting lead to a "variant variant int32 1" value
+      match_rx = /variant \s+ array \s \[ \s+
+         dict \s entry\( \s+
+            string \s "one" \s+
+            variant \s+ int32 \s 1 \s+
+         \)/x
+      expect(reply).to match(match_rx)
+    end
   end
 
   context "a variant-typed property" do