Fixed DumbbellSeries.data incorrect type. Closes #176.

Author: hcpchris

highcharts_core/options/series/data/range.py

@@ -8,7 +8,7 @@
 from highcharts_core import constants, errors
 from highcharts_core.decorators import class_sensitive
 from highcharts_core.options.series.data.base import DataBase
-from highcharts_core.options.series.data.cartesian import CartesianData, CartesianDataCollection
+from highcharts_core.options.series.data.collections import DataPointCollection
 from highcharts_core.options.plot_options.drag_drop import DragDropOptions
 from highcharts_core.utility_classes.data_labels import DataLabel
 from highcharts_core.utility_classes.markers import Marker
@@ -362,7 +362,7 @@ def _to_untrimmed_dict(self, in_cls = None) -> dict:
         return untrimmed
 
 
-class RangeDataCollection(CartesianDataCollection):
+class RangeDataCollection(DataPointCollection):
     """A collection of :class:`RangeData` objects.
 
     .. note::
@@ -384,8 +384,8 @@ def _get_data_point_class(cls):
         return RangeData
 
 
-class ConnectedRangeData(CartesianData):
-    """Variant of :class:`CartesianData` which extends the class with connector
+class ConnectedRangeData(RangeData):
+    """Variant of :class:`RangeData` which extends the class with connector
     attributes."""
 
     def __init__(self, **kwargs):
@@ -481,9 +481,10 @@ class from a Highcharts Javascript-compatible :class:`dict <python:dict>` object
             'data_labels': as_dict.get('dataLabels', None),
             'drag_drop': as_dict.get('dragDrop', None),
             'drilldown': as_dict.get('drilldown', None),
+            'high': as_dict.get('high', None),
+            'low': as_dict.get('low', None),
             'marker': as_dict.get('marker', None),
             'x': as_dict.get('x', None),
-            'y': as_dict.get('y', None),
 
             'connector_color': as_dict.get('connectorColor', None),
             'connector_width': as_dict.get('connectorWidth', None),
@@ -506,7 +507,7 @@ def _to_untrimmed_dict(self, in_cls = None) -> dict:
         return untrimmed
 
 
-class ConnectedRangeDataCollection(CartesianDataCollection):
+class ConnectedRangeDataCollection(RangeDataCollection):
     """A collection of :class:`ConnectedRangeData` objects.
 
     .. note::

tests/input_files/series/data/range/04.js

@@ -85,6 +85,7 @@
       liveRedraw: true
   },
   drilldown: 'some-id-goes-here',
+  low: 123,
   marker: {
     enabled: true,
     fillColor: '#cccccc',
@@ -100,7 +101,6 @@
     width: 48
   },
   x: 'some category',
-  y: 123,
 
   accessibility: {
       description: 'Some description goes here',

tests/input_files/series/dumbbell/01.js

@@ -87,6 +87,7 @@
           liveRedraw: true
       },
       drilldown: 'some-id-goes-here',
+      low: 123,
       marker: {
         enabled: true,
         fillColor: '#cccccc',
@@ -101,7 +102,6 @@
         symbol: 'circle',
         width: 48
       },
-      y: 123,
 
       accessibility: {
           description: 'Some description goes here',

tests/options/series/data/test_range.py

@@ -432,7 +432,7 @@ def test_RangeData_to_array(input_array, set_props, expected_type, expected):
         'symbol': 'circle',
         'width': 48
       },
-      'y': 123,
+      'low': 123,
       'name': 'some category'
     }, None),
     # + DataBase Options
@@ -538,7 +538,7 @@ def test_RangeData_to_array(input_array, set_props, expected_type, expected):
         'width': 48
       },
       'x': 'some category',
-      'y': 123,
+      'low': 123,
 
       'accessibility': {
           'description': 'Some description goes here',

tests/options/series/test_dumbbell.py

@@ -116,7 +116,7 @@
               'symbol': 'circle',
               'width': 48
             },
-            'y': 123,
+            'high': 123,
             'name': 'some category'
           }
       ]
@@ -225,7 +225,7 @@
               'symbol': 'circle',
               'width': 48
             },
-            'y': 123,
+            'high': 123,
             'name': 'some category'
           }
       ],
@@ -431,7 +431,7 @@
               'symbol': 'circle',
               'width': 48
             },
-            'y': 123,
+            'low': 123,
             'name': 'some category'
           }
       ],