Support start offset and end offset in variable materialization

Author: YomesInc

cloudinary-core/src/main/java/com/cloudinary/Transformation.java

@@ -785,7 +785,7 @@ public String generate(Map options) {
         }
         if (!components.isEmpty()) {
             final String joined = StringUtils.join(components, ",");
-            transformations.add(Expression.normalize(joined));
+            transformations.add(joined);
         }
 
         if (isResponsive) {
@@ -894,7 +894,7 @@ private static String normRangeValue(Object objectValue) {
         Matcher matcher = RANGE_VALUE_RE.matcher(value);
 
         if (!matcher.matches()) {
-            return null;
+            return Expression.normalize(value);
         }
 
         String modifier = "";

cloudinary-core/src/test/java/com/cloudinary/TransformationTest.java

@@ -4,9 +4,14 @@
 import com.cloudinary.transformation.TextLayer;
 import com.cloudinary.utils.ObjectUtils;
 import org.cloudinary.json.JSONArray;
+import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
 
 import java.util.*;
 
@@ -18,6 +23,7 @@
  *
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnitParamsRunner.class)
 public class TransformationTest {
 
     @Before
@@ -300,4 +306,67 @@ public void testContextMetadataToUserVariables() {
 
         assertEquals("$xpos_ctx:!x_pos!_to_f,$ypos_ctx:!y_pos!_to_f,c_crop,x_$xpos_mul_w,y_$ypos_mul_h", t.generate());
     }
+    
+    @Parameters({ "angle",
+            "aspect_ratio",
+            "dpr",
+            "effect",
+            "height",
+            "opacity",
+            "quality",
+            "width",
+            "x",
+            "y",
+            "end_offset",
+            "start_offset",
+            "zoom" })
+    @Test
+    public void testVerifyNormalizationShouldNormalize(String input) throws Exception {
+        String t = new Transformation().param(input, "width * 2").generate();
+        assertThat(t, CoreMatchers.containsString("w_mul_2"));
+    }
+
+    @Parameters({
+             "audio_codec",
+             "audio_frequency",
+             "border",
+             "bit_rate",
+             "color_space",
+             "default_image",
+             "delay",
+             "density",
+             "fetch_format",
+             "custom_function",
+             "fps",
+             "gravity",
+             "overlay",
+             "prefix",
+             "page",
+             "underlay",
+             "video_sampling",
+             "streaming_profile",
+             "keyframe_interval"})
+    @Test
+    public void test1VerifyNormalizationShouldNotNormalize(String input) throws Exception {
+        String t = new Transformation().param(input, "width * 2").generate();
+        assertThat(t, CoreMatchers.not(CoreMatchers.containsString("w_mul_2")));
+    }
+
+    @Test
+    public void testSupportStartOffset() throws Exception {
+        String t = new Transformation().width(100).startOffset("idu - 5").generate();
+        assertThat(t, CoreMatchers.containsString("so_idu_sub_5"));
+
+        t = new Transformation().width(100).startOffset("$logotime").generate();
+        assertThat(t, CoreMatchers.containsString("so_$logotime"));
+    }
+
+    @Test
+    public void testSupportEndOffset() throws Exception {
+        String t = new Transformation().width(100).endOffset("idu - 5").generate();
+        assertThat(t, CoreMatchers.containsString("eo_idu_sub_5"));
+
+        t = new Transformation().width(100).endOffset("$logotime").generate();
+        assertThat(t, CoreMatchers.containsString("eo_$logotime"));
+    }
 }