Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.2.1] - 2025-05-19

### Fixed

- Allow for "." character to be used in [mime-types](https://github.com/telday/data_url/issues/8).

## [1.2.0] - 2024-11-20

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.2.1
2 changes: 1 addition & 1 deletion data_url/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import base64

DATA_URL_RE = re.compile(
r"data:(?P<MIME>([\w-]+\/[\w+-]+(;[\w-]+\=[\w-]+)?)?)(?P<encoded>;base64)?,(?P<data>[\w\d.~%\=\/\+-]+)"
r"data:(?P<MIME>([\w-]+\/[\w+\.-]+(;[\w-]+\=[\w-]+)?)?)(?P<encoded>;base64)?,(?P<data>[\w\d.~%\=\/\+-]+)"
)

def construct_data_url(mime_type, base64_encoded, data):
Expand Down
49 changes: 48 additions & 1 deletion test/test_url.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ def test_construct_data_url_without_mime_type(self):
self.assertEqual(data, deconstructed_url.data)
self.assertEqual(url, f"data:,{data}")

def test_construct_data_url_with_dot_mime_type(self):
mime_type = "image/some.png"
base64_encoded = False
data = str(uuid.uuid4()).strip()
url = construct_data_url(mime_type, base64_encoded, data)

deconstructed_url = DataURL.from_url(url)

self.assertEqual(mime_type, deconstructed_url.mime_type)
self.assertEqual(base64_encoded, deconstructed_url.is_base64_encoded)
self.assertEqual(data, deconstructed_url.data)
self.assertEqual(url, f"data:image/some.png,{data}")

def test_construct_data_url(self):
mime_type = "text/plain"
base64_encoded = False
Expand Down Expand Up @@ -82,8 +95,42 @@ def test_string_with_empty_mimetype(self):
self.base64_encoded = False
self.data = str(uuid.uuid4())
self.raw_data = self.data
self.expected_url = f"data:,{self.data}"
self.expected_url = f"data:{self.mime_type},{self.data}"
self.url = DataURL.from_data(self.mime_type, self.base64_encoded, self.data)

self.assertEqual(type(self.url.data), str)
self.run_assertions()

def test_string_with_dot_mimetype(self):
self.mime_type = "image/some.png"
self.base64_encoded = False
self.data = str(uuid.uuid4())
self.raw_data = self.data
self.expected_url = f"data:{self.mime_type},{self.data}"
self.url = DataURL.from_data(self.mime_type, self.base64_encoded, self.data)

self.assertEqual(type(self.url.data), str)
self.run_assertions()

def test_string_with_plus_and_dot_mimetype(self):
self.mime_type = "image/some.png+other"
self.base64_encoded = True
self.raw_data = bytes(str(uuid.uuid4()), "UTF-8")
self.data = base64.b64encode(self.raw_data).decode("UTF-8")
self.expected_url = f"data:{self.mime_type};base64,{self.data}"
self.url = DataURL.from_data(self.mime_type, self.base64_encoded, self.data)

self.assertEqual(type(self.url.data), bytes)
self.run_assertions()

def test_string_with_plus_mimetype(self):
self.mime_type = "image/some+other"
self.base64_encoded = False
self.data = str(uuid.uuid4())
self.raw_data = self.data
self.expected_url = f"data:{self.mime_type},{self.data}"
self.url = DataURL.from_data(self.mime_type, self.base64_encoded, self.data)

self.assertEqual(type(self.url.data), str)
self.run_assertions()

Expand Down