Skip to content

Commit bc409c7

Browse files
authored
Merge pull request #534 from OP-TED/feature/TED4-153
2 parents ea25402 + 1e581c0 commit bc409c7

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

ted_sws/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,6 @@ class GitHubArtefacts:
145145
def GITHUB_TED_SWS_ARTEFACTS_URL(self, config_value: str) -> str:
146146
return config_value
147147

148-
@env_property(config_resolver_class=AirflowAndEnvConfigResolver, default_value="ted-rdf-mapping")
149-
def GITHUB_TED_SWS_ARTEFACTS_REPOSITORY_NAME(self, config_value: str) -> str:
150-
return config_value
151148

152149

153150
class API:

ted_sws/mapping_suite_processor/adapters/github_package_downloader.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
MAPPINGS_DIR_NAME = "mappings"
99

1010

11+
def get_repo_name_from_repo_url(repository_url: str) -> str:
12+
"""
13+
This method will extract the name of the repository from a repository URL
14+
"""
15+
url_path = pathlib.PurePosixPath(repository_url)
16+
return url_path.stem
17+
18+
1119
class MappingSuitePackageDownloaderABC(abc.ABC):
1220
"""
1321
This class is intended to download mapping_suite_package from external resources.
@@ -35,7 +43,7 @@ def __init__(self, github_repository_url: str, branch_or_tag_name: str):
3543
"""
3644
self.github_repository_url = github_repository_url
3745
self.branch_or_tag_name = branch_or_tag_name
38-
self.repository_name = config.GITHUB_TED_SWS_ARTEFACTS_REPOSITORY_NAME
46+
self.repository_name = get_repo_name_from_repo_url(repository_url=github_repository_url)
3947

4048
def download(self, output_mapping_suite_package_path: pathlib.Path) -> str:
4149
"""

tests/e2e/mapping_suite_processor/test_github_mapping_suite_package_downloader.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import pathlib
22
from ted_sws import config
3-
from ted_sws.mapping_suite_processor.adapters.github_package_downloader import GitHubMappingSuitePackageDownloader
3+
from ted_sws.mapping_suite_processor.adapters.github_package_downloader import GitHubMappingSuitePackageDownloader, \
4+
get_repo_name_from_repo_url
45
from tests.e2e.mapping_suite_processor import MAPPING_SUITE_PACKAGE_NAME
56

67

@@ -11,3 +12,10 @@ def test_github_mapping_suite_package_downloader(tmpdir):
1112
mapping_suite_package_downloader.download(output_mapping_suite_package_path=tmp_dir_path)
1213
mapping_suite_package_path = tmp_dir_path / MAPPING_SUITE_PACKAGE_NAME
1314
assert mapping_suite_package_path.is_dir()
15+
16+
17+
def test_get_repo_name_from_repo_url():
18+
repo_url = "https://github.com/OP-TED/ted-rdf-mapping.git"
19+
repo_name = get_repo_name_from_repo_url(repository_url=repo_url)
20+
assert repo_name == "ted-rdf-mapping"
21+
assert isinstance(repo_name, str)

0 commit comments

Comments
 (0)