Merge pull request #121 from VBA-tools/split-bug

Update credentials module to fix Split bug

Author: timhall

specs/Credentials.bas

@@ -1,7 +1,22 @@
 Attribute VB_Name = "Credentials"
-Private Const CredentialsPath As String = "..\credentials.txt"
 Private pCredentials As Dictionary
 
+Public Property Get CredentialsPath() As String
+    ' Go up one folder from workbook path
+    Dim Parts() As String
+    Dim i As Long
+    Parts = VBA.Split(ThisWorkbook.Path, Application.PathSeparator)
+    For i = LBound(Parts) To UBound(Parts) - 1
+        If CredentialsPath = "" Then
+            CredentialsPath = CredentialsPath & Parts(i)
+        Else
+            CredentialsPath = CredentialsPath & Application.PathSeparator & Parts(i)
+        End If
+    Next i
+    
+    CredentialsPath = CredentialsPath & Application.PathSeparator & "credentials.txt"
+End Property
+
 Public Property Get Values() As Dictionary
     If pCredentials Is Nothing Then
         Set pCredentials = Load
@@ -12,7 +27,6 @@ End Property
 Public Property Get Loaded() As Boolean
     Loaded = Not Values Is Nothing
 End Property
-    
 
 Function Load() As Dictionary
     Dim Line As String
@@ -22,28 +36,29 @@ Function Load() As Dictionary
     Dim Value As String
 
     Set pCredentials = New Dictionary
-    Open FullPath(CredentialsPath) For Input As #1
+    Open CredentialsPath For Input As #1
 
     On Error GoTo ErrorHandling
-    Do While Not EOF(1)
+    Do While Not VBA.EOF(1)
         Line Input #1, Line
+        Line = VBA.Replace(Line, vbNewLine, "")
 
         ' Skip blank lines and comment lines
-        If Line <> "" And Left(Line, 1) <> "#" Then
-            If Left(Line, 1) = "-" Then
-                Line = Right(Line, Len(Line) - 1)
-                Parts = Split(Line, ":")
+        If Line <> "" And VBA.Left$(Line, 1) <> "#" Then
+            If VBA.Left$(Line, 1) = "-" Then
+                Line = VBA.Right$(Line, VBA.Len(Line) - 1)
+                Parts = VBA.Split(Line, ":", 2)
 
                 If UBound(Parts) >= 1 And Header <> "" And pCredentials.Exists(Header) Then
-                    Key = Trim(Parts(0))
-                    Value = Trim(Split(Parts(1), "#")(0))
+                    Key = VBA.Trim(Parts(0))
+                    Value = VBA.Trim(Split(Parts(1), "#")(0))
 
                     If Key <> "" And Value <> "" Then
                         pCredentials(Header).Add Key, Value
                     End If
                 End If
             Else
-                Header = Trim(Split(Line, "#")(0))
+                Header = VBA.Trim(VBA.Split(Line, "#")(0))
 
                 If Header <> "" Then
                     pCredentials.Add Header, New Dictionary
@@ -57,7 +72,3 @@ Function Load() As Dictionary
 ErrorHandling:
     Close #1
 End Function
-
-Private Function FullPath(RelativePath As String) As String
-    FullPath = ThisWorkbook.Path & "\" & RelativePath
-End Function