Merge #314 from remote-tracking branch 'origin/273-addUriEncodeFunction'

metafacture · Jun 16, 2023 · 2294a74 · 2294a74
2 parents 4dd061b + b3420ec
commit 2294a74
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -716,6 +716,14 @@ Upcases all characters in a field value.
 upcase("<sourceField>")
 ```
 
+##### `uri_encode`
+
+Encodes a field value as URI. Aka percent-encoding.
+
+```perl
+uri_encode("<sourceField>")
+```
+
 ### Selectors
 
 #### `reject`

diff --git a/metafix/src/main/java/org/metafacture/metafix/FixMethod.java b/metafix/src/main/java/org/metafacture/metafix/FixMethod.java
@@ -21,6 +21,7 @@
 import org.metafacture.metamorph.api.Maps;
 import org.metafacture.metamorph.functions.ISBN;
 import org.metafacture.metamorph.functions.Timestamp;
+import org.metafacture.metamorph.functions.URLEncode;
 import org.metafacture.metamorph.maps.FileMap;
 
 import java.io.File;
@@ -662,6 +663,15 @@ public void apply(final Metafix metafix, final Record record, final List<String>
         public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
             record.transform(params.get(0), s -> s.toUpperCase());
         }
+    },
+    uri_encode {
+        @Override
+        public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
+            final URLEncode urlEncoder = new URLEncode();
+            urlEncoder.setPlusForSpace(false);
+
+            record.transform(params.get(0), urlEncoder::process);
+        }
     };
 
     private static final Pattern NAMED_GROUP_PATTERN = Pattern.compile("\\(\\?<(.+?)>");

diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
@@ -3972,4 +3972,40 @@ public void shouldApplyCustomJavaFunction() {
         );
     }
 
+    @Test
+    public void shouldUriEncodeString() {
+        MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
+                "uri_encode('title')"
+            ),
+            i -> {
+                i.startRecord("1");
+                i.literal("title", "café");
+                i.endRecord();
+            },
+            o -> {
+                o.get().startRecord("1");
+                o.get().literal("title", "caf%C3%A9");
+                o.get().endRecord();
+            }
+        );
+    }
+
+    @Test
+    public void shouldUriEncodePathSegment() {
+        MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
+                "uri_encode('id')"
+            ),
+            i -> {
+                i.startRecord("1");
+                i.literal("id", "slash/990223521400206441:DE-A96:61 TYD 16(3)#!");
+                i.endRecord();
+            },
+            o -> {
+                o.get().startRecord("1");
+                o.get().literal("id", "slash%2F990223521400206441%3ADE%2DA96%3A61%20TYD%2016%283%29%23%21");
+                o.get().endRecord();
+            }
+        );
+    }
+
 }