diff --git a/oilpriceapi/visualization.py b/oilpriceapi/visualization.py index be6a7e1..f19dd25 100644 --- a/oilpriceapi/visualization.py +++ b/oilpriceapi/visualization.py @@ -452,21 +452,19 @@ def create_small_multiples( fig, axes = plt.subplots( rows, cols, figsize=(12, 3 * rows), - dpi=100 + dpi=100, + # Always a 2-D grid, so axes[row][col] works for one row or one + # column too (#158). + squeeze=False ) - if rows == 1: - axes = [axes] - if cols == 1: - axes = [[ax] for ax in axes] - end_date = datetime.now() start_date = end_date - timedelta(days=days) for idx, commodity in enumerate(commodities): row = idx // cols col = idx % cols - ax = axes[row][col] if rows > 1 else axes[col] + ax = axes[row][col] # Fetch data history = self.client.historical.get( @@ -508,7 +506,7 @@ def create_small_multiples( for idx in range(n, rows * cols): row = idx // cols col = idx % cols - ax = axes[row][col] if rows > 1 else axes[col] + ax = axes[row][col] ax.axis('off') # Add overall title and source diff --git a/tests/unit/test_small_multiples.py b/tests/unit/test_small_multiples.py new file mode 100644 index 0000000..edbc206 --- /dev/null +++ b/tests/unit/test_small_multiples.py @@ -0,0 +1,39 @@ +"""#158: create_small_multiples crashed whenever every commodity fit in one row.""" +from datetime import datetime, timedelta +from types import SimpleNamespace +from unittest.mock import MagicMock + +import pytest + +pytest.importorskip("matplotlib") +import matplotlib # noqa: E402 + +matplotlib.use("Agg") +import matplotlib.pyplot as plt # noqa: E402 + +from oilpriceapi.visualization import PriceVisualizer # noqa: E402 + + +def _client(): + start = datetime(2026, 9, 1) + points = [ + SimpleNamespace(date=start + timedelta(days=i), value=70.0 + i * 0.1) + for i in range(60) + ] + client = MagicMock() + client.historical.get.return_value = SimpleNamespace(data=points) + return client + + +@pytest.mark.parametrize( + "n,cols", + [(1, 3), (2, 3), (3, 3), (4, 3), (6, 3), (2, 1), (1, 1), (5, 2)], +) +def test_small_multiples_any_shape(n, cols): + codes = [f"C{i}" for i in range(n)] + fig = PriceVisualizer(_client()).create_small_multiples(codes, cols=cols) + try: + titled = [ax.get_title() for ax in fig.axes if ax.get_title()] + assert titled == codes + finally: + plt.close(fig)