improve test case

Author: ANKUR DWIVEDI

imagekitio/url.py

@@ -3,7 +3,7 @@
 import sys
 from datetime import datetime as dt
 from typing import Any, Dict, List
-from urllib.parse import ParseResult, urlparse, urlunparse, parse_qsl, urlencode, quote
+from urllib.parse import ParseResult, urlparse, urlunparse, parse_qsl, urlencode, quote, unquote
 
 from .constants.defaults import Default
 from .constants.supported_transform import SUPPORTED_TRANS
@@ -130,13 +130,7 @@ def get_signature_timestamp(expiry_seconds: int = None) -> int:
 
     @staticmethod
     def get_signature(private_key, url, url_endpoint, expiry_timestamp: int) -> str:
-        last_slash_pos = url.rfind('/')
-        question_mark_pos = url.find('?', last_slash_pos)
-        path = url[last_slash_pos + 1:question_mark_pos] if question_mark_pos != -1 else url[last_slash_pos + 1:]
-        encoded_path = Url.encode_string_if_required(path)
-        encoded_url = url[:last_slash_pos + 1] + encoded_path + url[question_mark_pos:] if question_mark_pos != -1 else url[:last_slash_pos + 1] + encoded_path
-        url = encoded_url
-        print(url)
+        url = Url.encode_string_if_required(url)
         """ "
         create signature(hashed hex key) from
         private_key, url, url_endpoint and expiry_timestamp
@@ -219,10 +213,19 @@ def transformation_to_str(transformation):
 
         return Default.CHAIN_TRANSFORM_DELIMITER.value.join(parsed_transforms)
 
+    @staticmethod
+    def custom_encodeURIComponent(url_str):
+        parsed_url = urlparse(url_str)
+        encoded_url = f"{parsed_url.scheme}://{parsed_url.netloc}"
+        encoded_url +=quote(parsed_url.path, safe='~@#$&()*!+=:;,?/\'')
+        if(parsed_url.query):
+            encoded_url = encoded_url+"?"+quote(unquote(parsed_url.query), safe='~@#$&()*!+=:;?/\'')
+        return encoded_url
+
     @staticmethod
     def has_more_than_ascii(s):
         return any(ord(char) > 127 for char in s)
 
     @staticmethod
     def encode_string_if_required(s):
-        return quote(s) if Url.has_more_than_ascii(s) else s
+        return Url.custom_encodeURIComponent(s) if Url.has_more_than_ascii(s) else s

tests/test_generate_url.py

@@ -2,7 +2,7 @@
 
 from imagekitio.client import ImageKit
 from imagekitio.constants.defaults import Default
-
+from imagekitio.url import Url
 
 class TestGenerateURL(unittest.TestCase):
     def setUp(self) -> None:
@@ -325,21 +325,90 @@ def test_url_signed_with_expire_in_seconds(self):
         }
         url = self.client.url(options)
         self.assertIn("ik-t", url)
-    
-    def test_url_signed_with_expire_in_seconds_with_diacritic(self):
+
+    def test_url_signed_with_diacritic_in_filename(self):
+        encodedUrl = Url.encode_string_if_required("https://test-domain.com/test-endpoint/test_é_path_alt.jpg")
+        self.assertEqual(
+            encodedUrl,
+            "https://test-domain.com/test-endpoint/test_%C3%A9_path_alt.jpg",
+        )
+        signature = Url.get_signature("private_key_test", encodedUrl,"https://test-domain.com/test-endpoint", 9999999999)
         options = {
-            "path": "/four-penguins-with-é.webp",
+            "path": "/test_é_path_alt.jpg",
+            "signed": True,
+        }
+        url = self.client.url(options)
+        self.assertEqual(
+            url,
+            "https://test-domain.com/test-endpoint/test_é_path_alt.jpg?ik-s=cae8a516223d21e245424dc0b97163aa3a03c789",
+        )
+        self.assertIn("ik-s="+signature, url)
+
+    def test_url_signed_with_diacritic_in_filename_and_path(self):
+        encodedUrl = Url.encode_string_if_required("https://test-domain.com/test-endpoint/aéb/test_é_path_alt.jpg")
+        self.assertEqual(
+            encodedUrl,
+            "https://test-domain.com/test-endpoint/a%C3%A9b/test_%C3%A9_path_alt.jpg",
+        )
+        signature = Url.get_signature("private_key_test", encodedUrl,"https://test-domain.com/test-endpoint", 9999999999)
+        options = {
+            "path": "/aéb/test_é_path_alt.jpg",
+            "signed": True,
+        }
+        url = self.client.url(options)
+        self.assertEqual(
+            url,
+            "https://test-domain.com/test-endpoint/aéb/test_é_path_alt.jpg?ik-s=40a821ef1b7a2e9253599dac36a47be3d49787ab",
+        )
+        self.assertIn("ik-s="+signature, url)
+
+    def test_url_signed_with_diacritic_in_filename_path_transforamtion_in_path(self):
+        encodedUrl = Url.encode_string_if_required("https://test-domain.com/test-endpoint/tr:l-text,i-Imagekité,fs-50,l-end/aéb/test_é_path_alt.jpg")
+        self.assertEqual(
+            encodedUrl,
+            "https://test-domain.com/test-endpoint/tr:l-text,i-Imagekit%C3%A9,fs-50,l-end/a%C3%A9b/test_%C3%A9_path_alt.jpg",
+        )
+        signature = Url.get_signature("private_key_test", encodedUrl,"https://test-domain.com/test-endpoint", 9999999999)
+        options = {
+            "path": "/aéb/test_é_path_alt.jpg",
             "transformation": [
                 {
-                    "width": "400",
+                    "raw": "l-text,i-Imagekité,fs-50,l-end"
                 },
             ],
             "signed": True,
-            "expire_seconds": 100,
+             "transformation_position": "path"
         }
         url = self.client.url(options)
-        self.assertIn("ik-s", url)
-        self.assertIn("ik-t", url)
+        self.assertEqual(
+            url,
+            "https://test-domain.com/test-endpoint/tr:l-text,i-Imagekité,fs-50,l-end/aéb/test_é_path_alt.jpg?ik-s=3a65902916664517bcac38e9ddaa69d4a81a0106",
+        )
+        self.assertIn("ik-s="+signature, url)
+
+    def test_url_signed_with_diacritic_in_filename_path_transforamtion_in_query(self):
+        encodedUrl = Url.encode_string_if_required("https://test-domain.com/test-endpoint/aéb/test_é_path_alt.jpg?tr=l-text%2Ci-Imagekité%2Cfs-50%2Cl-end")
+        self.assertEqual(
+            encodedUrl,
+            "https://test-domain.com/test-endpoint/a%C3%A9b/test_%C3%A9_path_alt.jpg?tr=l-text%2Ci-Imagekit%C3%A9%2Cfs-50%2Cl-end",
+        )
+        signature = Url.get_signature("private_key_test", encodedUrl,"https://test-domain.com/test-endpoint", 9999999999)
+        options = {
+            "path": "/aéb/test_é_path_alt.jpg",
+            "transformation": [
+                {
+                    "raw": "l-text,i-Imagekité,fs-50,l-end"
+                },
+            ],
+            "signed": True,
+             "transformation_position": "query"
+        }
+        url = self.client.url(options)
+        self.assertEqual(
+            url,
+            "https://test-domain.com/test-endpoint/aéb/test_é_path_alt.jpg?tr=l-text%2Ci-Imagekit%C3%A9%2Cfs-50%2Cl-end&ik-s=ce55719add9ac43908c9de6c0eceece70f4d6c6e",
+        )
+        self.assertIn("ik-s="+signature, url)
 
     def test_generate_url_with_path_and_src_uses_path(self):
         """