From 8749551067ac35ec2e6e00c4b5485086cac3c163 Mon Sep 17 00:00:00 2001
From: Thomas Lapinski <thomas.lapinski@tomtom.com>
Date: Mon, 20 Jul 2015 14:56:40 +0200
Subject: [PATCH] Simplify the decorator for hashes. This allows nested hashes
 to be output correctly.

---
 spec/classes/init_spec.rb | 35 +++++++++++++++++++++++++++++++++++
 templates/gitlab.rb.erb   |  3 +--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 67a7797c..28ff67e4 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -106,5 +106,40 @@
         }
       end
     end
+    describe 'gitlab_rails with hash value' do
+      let(:params) { {:gitlab_rails => {
+        'ldap_enabled' => true,
+        'ldap_servers' => {
+          'main' => {
+            'label' => 'LDAP',
+            'host' => '_your_ldap_server',
+            'port' => 389,
+            'uid' => 'sAMAccountName',
+            'method' => 'plain',
+            'bind_dn' => '_the_full_dn_of_the_user_you_will_bind_with',
+            'password' => '_the_password_of_the_bind_user',
+            'active_directory' => true,
+            'allow_username_or_email_login' => false,
+            'block_auto_created_users' => false,
+            'base' => '',
+            'user_filter' => '',
+          }
+        },
+        'omniauth_providers' => [
+          {
+            'name' => 'google_oauth2',
+            'app_id' => 'YOUR APP ID',
+            'app_secret' => 'YOUR APP SECRET',
+            'args' => { 'access_type' => 'offline', 'approval_prompt' => '' }
+          }
+        ]
+      }}}
+
+      it { is_expected.to contain_file('/etc/gitlab/gitlab.rb') \
+        .with_content(/^\s*gitlab_rails\['ldap_enabled'\] = true$/)
+        .with_content(/^\s*gitlab_rails\['ldap_servers'\] = {"main"=>{"label"=>"LDAP", "host"=>"_your_ldap_server", "port"=>"389", "uid"=>"sAMAccountName", "method"=>"plain", "bind_dn"=>"_the_full_dn_of_the_user_you_will_bind_with", "password"=>"_the_password_of_the_bind_user", "active_directory"=>true, "allow_username_or_email_login"=>false, "block_auto_created_users"=>false, "base"=>"", "user_filter"=>""}}$/)
+        .with_content(/^\s*gitlab_rails\['omniauth_providers'\] = \["{"name"=>"google_oauth2", "app_id"=>"YOUR APP ID", "app_secret"=>"YOUR APP SECRET", "args"=>{"access_type"=>"offline", "approval_prompt"=>""}}"\]$/)
+      }
+    end
   end
 end
diff --git a/templates/gitlab.rb.erb b/templates/gitlab.rb.erb
index 2e91814d..fd472dd7 100644
--- a/templates/gitlab.rb.erb
+++ b/templates/gitlab.rb.erb
@@ -10,8 +10,7 @@
     vedit = v.map { |s| "\"#{s}\"" }
     return "[#{vedit.join(',')}]"
   elsif v.is_a?(Hash)
-    vedit = v.map { |k,s| "\"#{k}\" => \"#{s}\"" }
-    return "{#{vedit.join(',')}}"
+    return v.inspect
   else
     return v
   end