[issue-456] add helper method in casing_tools and move the module as …

…it is used in the parser and writer layer Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
spdx · meretp · Feb 22, 2023 · Feb 1, 2023 · Feb 1, 2023 · Feb 9, 2023
commit 198f2a61b13bc02c2d8b6127593a3d4e0828cb3b
diff --git a/src/spdx/writer/casing_tools.py → src/spdx/casing_tools.py b/src/spdx/writer/casing_tools.py → src/spdx/casing_tools.py
@@ -14,3 +14,8 @@
 def snake_case_to_camel_case(snake_case_string: str) -> str:
     each_word_capitalized = sub(r"[_\-]+", " ", snake_case_string).title().replace(" ", "")
     return each_word_capitalized[0].lower() + each_word_capitalized[1:]
+
+
+def camel_case_to_snake_case(camel_case_string: str) -> str:
+    snake_case_string = sub("(?!^)([A-Z]+)", r"_\1", camel_case_string).lower()
+    return snake_case_string
diff --git a/src/spdx/jsonschema/converter.py b/src/spdx/jsonschema/converter.py
@@ -13,7 +13,7 @@
 
 from spdx.jsonschema.json_property import JsonProperty
 from spdx.model.document import Document
-from spdx.writer.casing_tools import snake_case_to_camel_case
+from spdx.casing_tools import snake_case_to_camel_case
 
 MISSING_IMPLEMENTATION_MESSAGE = "Must be implemented"
 

diff --git a/src/spdx/writer/rdf/annotation_writer.py b/src/spdx/writer/rdf/annotation_writer.py
@@ -14,7 +14,7 @@
 
 from spdx.datetime_conversions import datetime_to_iso_string
 from spdx.model.annotation import Annotation
-from spdx.writer.casing_tools import snake_case_to_camel_case
+from spdx.casing_tools import snake_case_to_camel_case
 from spdx.writer.rdf.writer_utils import add_namespace_to_spdx_id
 from spdx.rdfschema.namespace import SPDX_NAMESPACE
 

diff --git a/src/spdx/writer/rdf/file_writer.py b/src/spdx/writer/rdf/file_writer.py
@@ -13,7 +13,7 @@
 from rdflib import Graph, URIRef, Literal, RDF, RDFS
 
 from spdx.model.file import File
-from spdx.writer.casing_tools import snake_case_to_camel_case
+from spdx.casing_tools import snake_case_to_camel_case
 from spdx.writer.rdf.checksum_writer import add_checksum_to_graph
 from spdx.writer.rdf.license_expression_writer import add_license_expression_or_none_or_no_assertion
 from spdx.writer.rdf.writer_utils import add_optional_literal, add_namespace_to_spdx_id

diff --git a/src/spdx/writer/rdf/package_writer.py b/src/spdx/writer/rdf/package_writer.py
@@ -13,7 +13,7 @@
 from rdflib import Graph, URIRef, RDF, Literal, XSD, BNode, DOAP, RDFS
 from spdx.writer.rdf.license_expression_writer import add_license_expression_or_none_or_no_assertion
 
-from spdx.writer.casing_tools import snake_case_to_camel_case
+from spdx.casing_tools import snake_case_to_camel_case
 from spdx.writer.rdf.checksum_writer import add_checksum_to_graph
 
 from spdx.model.package import Package, PackageVerificationCode, ExternalPackageRef, \

diff --git a/src/spdx/writer/rdf/relationship_writer.py b/src/spdx/writer/rdf/relationship_writer.py
@@ -15,7 +15,7 @@
 from spdx.model.relationship import Relationship
 from spdx.model.spdx_no_assertion import SpdxNoAssertion
 from spdx.model.spdx_none import SpdxNone
-from spdx.writer.casing_tools import snake_case_to_camel_case
+from spdx.casing_tools import snake_case_to_camel_case
 from spdx.writer.rdf.writer_utils import add_namespace_to_spdx_id
 from spdx.rdfschema.namespace import SPDX_NAMESPACE
 

diff --git a/tests/spdx/test_casing_tools.py b/tests/spdx/test_casing_tools.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2023 spdx contributors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import pytest
+
+from spdx.casing_tools import snake_case_to_camel_case, camel_case_to_snake_case
+
+
+@pytest.mark.parametrize("snake_case_str,camel_case_str", [("snake_case", "snakeCase")])
+def test_snake_case_to_camel_case(snake_case_str, camel_case_str):
+    camel_case = snake_case_to_camel_case(snake_case_str)
+
+    assert camel_case == camel_case_str
+
+
+@pytest.mark.parametrize("camel_case_str,snake_case_str",
+                         [("camelCase", "camel_case"), ("camelCaseMore", "camel_case_more"),
+                          ("CamelCase", "camel_case")])
+def test_camel_case_to_snake_case(camel_case_str, snake_case_str):
+    snake_case = camel_case_to_snake_case(camel_case_str)
+
+    assert snake_case == snake_case_str