fix to RegexReplaceOrValue for encoding regex value only (#80)

Author: steveshortt

Synapse.Common/Properties/AssemblyInfo.cs

@@ -38,4 +38,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.18023.0" )]
+[assembly: AssemblyFileVersion( "0.1.18026.0" )]

Synapse.Core/Classes/DynamicValue.cs

@@ -20,7 +20,7 @@ public override string ToString()
                 Source = "URI parameter name",
                 Target = "Element:IndexedElement[0]:Element",
                 Parse = true,
-                Encode = "None | Base64",
+                Encode = EncodingType.Base64,
                 Replace = "Regex Expression"
             };
             dv.Options.Add( Option.CreateSample() );

Synapse.Core/Classes/Enums/EncodingType.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Synapse.Core
+{
+    public enum EncodingType
+    {
+        None,
+        Base64
+    }
+}

Synapse.Core/Classes/ForEach.cs

@@ -38,8 +38,15 @@ public class ForEachItem : IReplacementValueOptions
         public bool HasParameterSource { get { return ParameterSource != null; } }
 
         public string Target { get; set; }
+
         public string Replace { get; set; }
-        public string Encode { get; set; }
+        [YamlIgnore]
+        public bool HasReplace { get { return !string.IsNullOrWhiteSpace( Replace ); } }
+
+        public EncodingType Encode { get; set; }
+        [YamlIgnore]
+        public bool IsBase64Encode { get { return Encode == EncodingType.Base64; } }
+
         public List<object> Values { get; set; } = new List<object>();
 
         [YamlIgnore]
@@ -61,7 +68,7 @@ public static ForEachItem CreateSample()
             {
                 ParameterSource = ParameterSourceInfo.CreateSample(),
                 Target = "Element:IndexedElement[0]:Element",
-                Encode = "None | Base64",
+                Encode = EncodingType.Base64,
                 Replace = "Regex Expression"
             };
             fe.Values.AddRange( new string[] { "value0", "value1" } );

Synapse.Core/Classes/Interfaces/IReplacementValue.cs

@@ -5,6 +5,8 @@ namespace Synapse.Core
     public interface IReplacementValueOptions
     {
         string Replace { get; set; }
-        string Encode { get; set; }
+        bool HasReplace { get; }
+        EncodingType Encode { get; set; }
+        bool IsBase64Encode { get; }
     }
 }

Synapse.Core/Classes/SourceTarget.cs

@@ -8,8 +8,15 @@ public class SourceTarget : IReplacementValueOptions
         public string Source { get; set; }
         public string Target { get; set; }
         public bool Parse { get; set; }
+
         public string Replace { get; set; }
-        public string Encode { get; set; }
+        [YamlIgnore]
+        public bool HasReplace { get { return !string.IsNullOrWhiteSpace( Replace ); } }
+
+        public EncodingType Encode { get; set; }
+        [YamlIgnore]
+        public bool IsBase64Encode { get { return Encode == EncodingType.Base64; } }
+
 
         public override string ToString()
         {
@@ -23,7 +30,7 @@ public static SourceTarget CreateSample()
                 Source = "Element:IndexedElement[0]:Element",
                 Target = "Element:IndexedElement[0]:Element",
                 Parse = true,
-                Encode = "None | Base64",
+                Encode = EncodingType.Base64,
                 Replace = "Regex Expression"
             };
         }

Synapse.Core/Properties/AssemblyInfo.cs

@@ -37,4 +37,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.18023.0" )]
+[assembly: AssemblyFileVersion( "0.1.18026.0" )]

Synapse.Core/Synapse.Core.csproj

@@ -61,6 +61,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Classes\Enums\EncodingType.cs" />
     <Compile Include="Classes\Interfaces\IReplacementValue.cs" />
     <Compile Include="Classes\SaveExitDataInfo.cs" />
     <Compile Include="Classes\SourceTarget.cs" />

Synapse.Core/Utilities/XmlHelpers.cs

@@ -359,10 +359,13 @@ internal static string RegexReplaceOrValue(string input, string replacement, IRe
 
             if( rv != null )
             {
-                if( !string.IsNullOrWhiteSpace( rv.Replace ) )
+                if( rv.HasReplace )
+                {
+                    if( rv.IsBase64Encode )
+                        replacement = CryptoHelpers.Encode( replacement );
                     value = Regex.Replace( input, rv.Replace, replacement, RegexOptions.IgnoreCase );
-
-                if( !string.IsNullOrWhiteSpace( rv.Encode ) && rv.Encode.ToLower() == "base64" )
+                }
+                else if( rv.IsBase64Encode )
                     value = CryptoHelpers.Encode( value );
             }
 

Synapse.Core/Utilities/YamlHelpers.cs

@@ -364,16 +364,19 @@ internal static void ApplyPatchValues(List<object> source, List<object> patch, I
             }
         }
 
-        internal static object RegexReplaceOrValue(object input, object replacement, IReplacementValueOptions dv)
+        internal static object RegexReplaceOrValue(object input, object replacement, IReplacementValueOptions rv)
         {
             object value = replacement;
 
-            if( dv != null )
+            if( rv != null )
             {
-                if( !string.IsNullOrWhiteSpace( dv.Replace ) )
-                    value = Regex.Replace( input.ToString(), dv.Replace, replacement.ToString(), RegexOptions.IgnoreCase );
-
-                if( !string.IsNullOrWhiteSpace( dv.Encode ) && dv.Encode.ToLower() == "base64" )
+                if( rv.HasReplace )
+                {
+                    if( rv.IsBase64Encode )
+                        replacement = CryptoHelpers.Encode( replacement.ToString() );
+                    value = Regex.Replace( input.ToString(), rv.Replace, replacement.ToString(), RegexOptions.IgnoreCase );
+                }
+                else if( rv.IsBase64Encode )
                     value = CryptoHelpers.Encode( value.ToString() );
             }