fix array in print_recursive function (in both templates !)

closes: voxpupuli#88
cirrax · Nov 24, 2021 · f7962db · f7962db
1 parent 6d8b676
commit f7962db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/spec/defines/virtualhost_spec.rb b/spec/defines/virtualhost_spec.rb
@@ -116,7 +116,7 @@
           is_expected.to contain_file(path_avail). \
             with_content(%r{^Component "comp1" "muc"$}). \
             with_content(%r{^  bo = true;$}). \
-            with_content(%r{^  arr = { "one"; "two" };$}).\
+            with_content(%r{^  arr = { "one", "two" };$}).\
             with_content(%r{^  str = "string";$})
         }
       end

diff --git a/templates/prosody.cfg.erb b/templates/prosody.cfg.erb
@@ -166,7 +166,7 @@ s2s_secure_domains = {
 def print_recursive(object, indentation = 0)
   case object
   when Array
-    '{ "' + object.join('"; "') + '" }'
+    '{ ' + object.map {|v| print_recursive(v, 0)}.join(', ') + ' }'
   when Hash
     "{\n" + ' ' * (indentation + 2) + object.map {|k,v| "#{k} = " + print_recursive(v, indentation + 2)}.join(";\n" + ' ' * (indentation + 2)) + ";\n" + (' ' * indentation) + '}'
   when TrueClass, FalseClass

diff --git a/templates/virtualhost.cfg.erb b/templates/virtualhost.cfg.erb
@@ -21,7 +21,7 @@ VirtualHost "<%= @name %>"
 def print_recursive(object, indentation = 0)
   case object
   when Array
-    '{ "' + object.join('"; "') + '" }'
+    '{ ' + object.map {|v| print_recursive(v, 0)}.join(', ') + ' }'
   when Hash
     "{\n" + ' ' * (indentation + 2) + object.map {|k,v| "#{k} = " + print_recursive(v, indentation + 2)}.join(";\n" + ' ' * (indentation + 2)) + ";\n" + (' ' * indentation) + '}'
   when TrueClass, FalseClass