Added the commented tests

FIXME: remaining

1. comment the Type ctor as allowing incomplete types for backward comp,
recommend DBus.type or DBus.types

2: mark Parser as @api private,
after merging with data-unmarshall, remove Parser usage

3. see if we can use this as DBus Signature? Is this a good enough dual
string-parsed representation?

Author: mvidner

lib/dbus/type.rb

@@ -171,6 +171,11 @@ class Parser
       # @param signature [Signature]
       def initialize(signature)
         @signature = signature
+        if signature.size > 255
+          msg = "Potential signature is longer than 255 characters (#{@signature.size}): #{@signature}"
+          raise SignatureException, msg
+        end
+
         @idx = 0
       end
 
@@ -227,6 +232,7 @@ def parse_one(char, for_array: false)
       end
 
       # Parse the entire signature, return a DBus::Type object.
+      # @return [Array<Type>]
       def parse
         @idx = 0
         ret = []
@@ -239,19 +245,35 @@ def parse
       # Parse one {SingleCompleteType}
       # @return [Type]
       def parse1
-        parse_one(nextchar)
+        c = nextchar
+        raise SignatureException, "Empty signature, expecting a Single Complete Type" if c.nil?
+
+        t = parse_one(c)
+        raise SignatureException, "Has more than a Single Complete Type: #{@signature}" unless nextchar.nil?
+
+        t
       end
     end
   end
 
   # shortcuts
 
-  # Parse a String to a DBus::Type::Type
+  # Parse a String to a DBus::Type
+  # @param string_type [SingleCompleteType]
+  # @return [DBus::Type]
   def type(string_type)
-    Type::Parser.new(string_type).parse[0]
+    Type::Parser.new(string_type).parse1
   end
   module_function :type
 
+  # Parse a String to a DBus::Type
+  # @param string_type [Signature]
+  # @return [Array<DBus::Type>]
+  def types(string_type)
+    Type::Parser.new(string_type).parse
+  end
+  module_function :types
+
   # Make an explicit [Type, value] pair
   def variant(string_type, value)
     [type(string_type), value]

spec/type_spec.rb

@@ -5,8 +5,6 @@
 require "dbus"
 
 describe DBus do
-  # FIXME: what about ""?
-
   describe ".type" do
     good = [
       "i",
@@ -15,7 +13,7 @@
       "aai"
     ]
 
-    context "valid signatures" do
+    context "valid single types" do
       good.each do |s|
         it "#{s.inspect} is parsed" do
           expect(DBus.type(s).to_s).to eq(s)
@@ -26,8 +24,6 @@
     bad = [
       ["\x00", "Unknown type code"],
       ["!", "Unknown type code"],
-      ["hmrp", "Unknown type code"],
-      # TODO: too long single complete type, too long sig
 
       # ARRAY related
       ["a", "Empty ARRAY"],
@@ -37,7 +33,7 @@
       ["r", "Abstract STRUCT"],
       ["()", "Empty STRUCT"],
       ["(ii", "STRUCT not closed"],
-      ["ii)", "STRUCT unexpectedly closed"],
+      ["a{i)", "STRUCT unexpectedly closed"],
 
       # TODO: deep nesting arrays, structs, combined
 
@@ -50,9 +46,16 @@
       ["{sv}", "DICT_ENTRY not an immediate child of an ARRAY"],
       ["a({sv})", "DICT_ENTRY not an immediate child of an ARRAY"],
       ["a{sv", "DICT_ENTRY not closed"],
-      ["}", "DICT_ENTRY unexpectedly closed"]
+      ["}", "DICT_ENTRY unexpectedly closed"],
+
+      # Too long
+      ["(#{"y" * 254})", "longer than 255"],
+
+      # not Single Complete Types
+      ["", "expecting a Single Complete Type"],
+      ["ii", "more than a Single Complete Type"]
     ]
-    context "invalid signatures" do
+    context "invalid single types" do
       bad.each.each do |s, msg|
         it "#{s.inspect} raises an exception mentioning: #{msg}" do
           rx = Regexp.new(Regexp.quote(msg))
@@ -61,4 +64,19 @@
       end
     end
   end
+
+  describe ".types" do
+    good = [
+      "",
+      "ii"
+    ]
+
+    context "valid signatures" do
+      good.each do |s|
+        it "#{s.inspect} is parsed" do
+          expect(DBus.types(s).map(&:to_s).join).to eq(s)
+        end
+      end
+    end
+  end
 end