Use Enum values (#30)

* use values

* bump version

Author: steveberardi

src/starplot/__init__.py

@@ -1,6 +1,6 @@
 """Star charts and maps"""
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 
 from .base import StarPlot  # noqa: F401
 from .zenith import ZenithPlot  # noqa: F401

src/starplot/styles/base.py

@@ -36,6 +36,11 @@ def merge_dict(dict_1: dict, dict_2: dict) -> None:
             dict_1[k] = dict_2[k]
 
 
+class BaseStyle(BaseModel):
+    class Config:
+        use_enum_values = True
+
+
 class FillStyleEnum(str, Enum):
     """Constants that represent the possible fill styles for markers."""
 
@@ -99,7 +104,7 @@ class DashCapStyleEnum(str, Enum):
     ROUND = "round"
 
 
-class MarkerStyle(BaseModel):
+class MarkerStyle(BaseStyle):
     """
     Styling properties for markers.
 
@@ -154,7 +159,7 @@ def matplot_kwargs(self, size_multiplier: float = 1.0) -> dict:
         )
 
 
-class LineStyle(BaseModel):
+class LineStyle(BaseStyle):
     """
     Styling properties for lines.
 
@@ -204,7 +209,7 @@ def matplot_kwargs(self, size_multiplier: float = 1.0) -> dict:
         return result
 
 
-class PolygonStyle(BaseModel):
+class PolygonStyle(BaseStyle):
     """
     Styling properties for polygons.
 
@@ -244,7 +249,7 @@ def matplot_kwargs(self, size_multiplier: float = 1.0) -> dict:
         )
 
 
-class LabelStyle(BaseModel):
+class LabelStyle(BaseStyle):
     """
     Styling properties for a label.
 
@@ -295,7 +300,7 @@ def matplot_kwargs(self, size_multiplier: float = 1.0) -> dict:
         )
 
 
-class ObjectStyle(BaseModel):
+class ObjectStyle(BaseStyle):
     """Defines the style for a SkyObject"""
 
     marker: MarkerStyle = MarkerStyle()
@@ -305,7 +310,7 @@ class ObjectStyle(BaseModel):
     """Style for the object's label (see [LabelStyle][starplot.styles.LabelStyle])"""
 
 
-class PathStyle(BaseModel):
+class PathStyle(BaseStyle):
     """Defines the style for a path (e.g. constellation lines)"""
 
     line: LineStyle = LineStyle()
@@ -315,7 +320,7 @@ class PathStyle(BaseModel):
     """Style for the path's label (see [LabelStyle][starplot.styles.LabelStyle])"""
 
 
-class PlotStyle(BaseModel):
+class PlotStyle(BaseStyle):
     """
     Defines the styling for a plot
     """

tests/test_styles.py

@@ -3,7 +3,7 @@
 from pydantic import ValidationError
 from pydantic.color import Color
 
-from starplot.styles import PlotStyle, FontWeightEnum
+from starplot.styles import PlotStyle, FontWeightEnum, LineStyle, LineStyleEnum
 
 
 @pytest.mark.parametrize(
@@ -38,3 +38,8 @@ def test_plot_style_valid(kwargs):
 def test_plot_style_invalid(kwargs):
     with pytest.raises(ValidationError):
         PlotStyle(**kwargs)
+
+
+def test_style_enums_use_strings():
+    line_style = LineStyle(style=LineStyleEnum.DASHED)
+    assert line_style.style == "dashed"