diff --git a/geoservercloud/geoservercloud.py b/geoservercloud/geoservercloud.py index 0ddca8b..7c1fea6 100644 --- a/geoservercloud/geoservercloud.py +++ b/geoservercloud/geoservercloud.py @@ -492,7 +492,13 @@ def create_style_from_file( ) -> tuple[str, int]: """Create a style (SLD) from a file, or update it if it already exists. Supported file extensions are .sld and .zip.""" + file_base_name = Path(file).name file_ext = Path(file).suffix + content, code = self.create_style_definition( + style_name, f"{file_base_name}.sld", workspace_name + ) + if code >= 400: + return content, code if file_ext == ".sld": file_format = "sld" elif file_ext == ".zip": diff --git a/tests/test_style.py b/tests/test_style.py index 9e9c06a..fb31c9b 100644 --- a/tests/test_style.py +++ b/tests/test_style.py @@ -154,6 +154,14 @@ def test_create_style_definition(mocker, geoserver: GeoServerCloud) -> None: def test_create_style_from_file(geoserver: GeoServerCloud) -> None: file_path = (Path(__file__).parent / "resources/style.sld").resolve() with responses.RequestsMock() as rsps: + rsps.get( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) + rsps.put( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) rsps.put( url=f"{geoserver.url}/rest/styles/{STYLE}.sld", status=201, @@ -178,6 +186,14 @@ def test_create_style_from_file(geoserver: GeoServerCloud) -> None: def test_update_style_from_file(geoserver: GeoServerCloud) -> None: file_path = (Path(__file__).parent / "resources/style.sld").resolve() with responses.RequestsMock() as rsps: + rsps.get( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) + rsps.put( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) rsps.put( url=f"{geoserver.url}/rest/styles/{STYLE}.sld", status=200, @@ -202,6 +218,14 @@ def test_update_style_from_file(geoserver: GeoServerCloud) -> None: def test_create_style_from_file_zip(geoserver: GeoServerCloud) -> None: file_path = (Path(__file__).parent / "resources/style.zip").resolve() with responses.RequestsMock() as rsps: + rsps.get( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) + rsps.put( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) rsps.put( url=f"{geoserver.url}/rest/styles/{STYLE}", status=201, @@ -222,7 +246,15 @@ def test_create_style_from_file_zip(geoserver: GeoServerCloud) -> None: def test_create_style_from_file_unsupported_format(geoserver: GeoServerCloud) -> None: - with responses.RequestsMock(): + with responses.RequestsMock() as rsps: + rsps.get( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) + rsps.put( + url=f"{geoserver.url}/rest/styles/{STYLE}", + status=200, + ) with pytest.raises(ValueError) as excinfo: geoserver.create_style_from_file( style_name=STYLE,