Fixed TestResultSet + Added TestPoint

aviau · aviau · commit 863a5d4e8047 · 2015-04-08T16:28:14.000-04:00
diff --git a/influxdb/point.py b/influxdb/point.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+
+# could it be a namedtuple .. ??
+class NamedValues(object):
+
+    def __init__(self, point):
+        self._point = point
+
+    def __getattr__(self, item):
+        try:
+            index = self._point.columns.index(item)
+        except ValueError:
+            raise AttributeError('Point have no such attribute (%r)' % item)
+        return self._point._point_values[index]
+
+    def __repr__(self):
+        return 'Values(%s)' % ', '.join(
+            '%s=%r' % (k, self._point._point_values[k])
+            for k in self._point.columns)
+
+
+class Point(object):
+
+    def __init__(self, serie, columns, values, tags=None):
+        """
+
+        :param serie:    The name of the serie in which this point resides.
+                         If None then it's a "system" point/result.
+        :param columns:  The ordered list of the columns.
+        :param values:   The actualy list of values of this point. Same order than columns.
+        :param tags:     The eventual tags (dict) associated with the point.
+        :return:
+        """
+        assert len(columns) == len(values)
+        self.columns = columns
+        self._point_values = values
+        if tags is None:
+            tags = {}
+        self.serie = serie
+        self.tags = tags
+        self.values = NamedValues(self)
+
+    def __getitem__(self, tag_name):
+        """Indexing a Point return the tag value associated with
+        the given tag name, if it exists"""
+        return self._tags[tag_name]
+
+    def __iter__(self):
+        """Iterating over a Point will return its eventual tag names one per one"""
+        return iter(self._tags)
+
+    def __len__(self):
+        """The len of a Point is its number of columns/values"""
+        return len(self.columns)
+
+    def __repr__(self):
+        return 'Point(values=(%s), tags=%s)' % (
+            ', '.join('%s=%r' % (
+                k, getattr(self.values, k)) for k in self.columns),
+            self.tags)
+
+    def __eq__(self, other):
+        return (isinstance(other, self.__class__)
+                and self.tags == other.tags
+                and self._point_values == other._point_values
+                and self.serie == other.serie
+                and self.columns == other.columns)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
diff --git a/influxdb/resultset.py b/influxdb/resultset.py
@@ -1,81 +1,18 @@
 # -*- coding: utf-8 -*-
 
-import collections
-from collections import namedtuple
-
+from influxdb.point import Point
 
 _sentinel = object()
 
 
-# could it be a namedtuple .. ??
-class NamedValues(object):
-
-    def __init__(self, point):
-        self._point = point
-
-    def __getattr__(self, item):
-        try:
-            index = self._point.columns.index(item)
-        except ValueError:
-            raise AttributeError('Point have no such attribute (%r)' % item)
-        return self._point._point_values[index]
-
-    def __repr__(self):
-        return 'Values(%s)' % ', '.join(
-            '%s=%r' % (k, self._point._point_values[k])
-            for k in self._point.columns)
-
-
-class Point(object):
-
-    def __init__(self, serie, columns, values, tags=None):
-        '''
-
-        :param serie:    The name of the serie in which this point resides.
-                         If None then it's a "system" point/result.
-        :param columns:  The ordered list of the columns.
-        :param values:   The actualy list of values of this point. Same order than columns.
-        :param tags:     The eventual tags (dict) associated with the point.
-        :return:
-        '''
-        assert len(columns) == len(values)
-        self.columns = columns
-        self._point_values = values
-        if tags is None:
-            tags = {}
-        self.serie = serie
-        self.tags = tags
-        self.values = NamedValues(self)
-
-    def __getitem__(self, tag_name):
-        """Indexing a Point return the tag value associated with
-        the given tag name, if it exists"""
-        return self._tags[tag_name]
-
-    def __iter__(self):
-        """Iterating over a Point will return its eventual tag names one per one"""
-        return iter(self._tags)
-
-    def __len__(self):
-        """The len of a Point is its number of columns/values"""
-        return len(self.columns)
-
-    def __repr__(self):
-        return 'Point(values=(%s), tags=%s)' % (
-            ', '.join('%s=%r' % (
-                k, getattr(self.values, k)) for k in self.columns),
-            self.tags)
-
-
-
 class ResultSet(object):
     """A wrapper around series results """
 
     def __init__(self, series):
         self.raw = series
 
     def __getitem__(self, key):
-        '''
+        """
         :param key: Either a serie name or a 2-tuple(serie_name, tags_dict)
                     If the given serie name is None then any serie (matching
                     the eventual given tags) will be given its points one
@@ -84,7 +21,7 @@ def __getitem__(self, key):
         NB:
         The order in which the points are yielded is actually undefined but
         it might change..
-        '''
+        """
         if isinstance(key, tuple):
             if 2 != len(key):
                 raise TypeError('only 2-tuples allowed')
@@ -137,8 +74,8 @@ def __repr__(self):
         return str(self.raw)
 
     def __iter__(self):
-        ''' Iterating a ResultSet will yield one dict instance per serie result.
-        '''
+        """ Iterating a ResultSet will yield one dict instance per serie result.
+        """
         for results in self.raw['results']:
             for serie in results['series']:
                 yield serie
diff --git a/tests/influxdb/point_test.py b/tests/influxdb/point_test.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+
+from influxdb.point import Point
+
+
+class TestPoint(unittest.TestCase):
+
+    def test_point(self):
+        point = Point(
+            "serie_name",
+            ['col1', 'col2'],
+            [1, '2'],
+            tags={
+                "SWAG": True,
+                "ALLO": "BYE"
+            }
+        )
+
+        self.assertEqual(point.columns, ['col1', 'col2'])
+        self.assertEqual(point.tags, {"SWAG": True, "ALLO": "BYE"})
+        self.assertEqual(point.values.col1, 1)
+        self.assertEqual(point.values.col2, '2')
+        self.assertEqual(
+            str(point),
+            "Point(values=(col1=1, col2='2'),"
+            " tags={'ALLO': 'BYE', 'SWAG': True})"
+        )
+
+    def test_point_eq(self):
+        point1 = Point("serie_name", ['col1', 'col2'], [1, '2'],
+                       tags={"SWAG": True, "ALLO": "BYE"})
+
+        point2 = Point("serie_name", ['col1', 'col2'], [1, '2'],
+                       tags={"SWAG": True, "ALLO": "BYE"})
+
+        self.assertEqual(point1, point2)
diff --git a/tests/influxdb/resultset_test.py b/tests/influxdb/resultset_test.py
@@ -3,6 +3,7 @@
 import unittest
 
 from influxdb.resultset import ResultSet
+from influxdb.point import Point
 
 
 class TestResultSet(unittest.TestCase):
@@ -36,57 +37,38 @@ def setUp(self):
         self.rs = ResultSet(self.query_response)
 
     def test_filter_by_name(self):
-        self.assertItemsEqual(
-            self.rs['cpu_load_short'],
+        self.assertEqual(
+            list(self.rs['cpu_load_short']),
             [
-                {
-                    "tags": {"host": "server01", "region": "us-west"},
-                    "points": [
-                        {"time": "2015-01-29T21:51:28.968422294Z",
-                         "value": 0.64}
-                    ]
-                },
-                {
-                    "tags": {"host": "server02", "region": "us-west"},
-                    "points": [
-                        {"time": "2015-01-29T21:51:28.968422294Z",
-                         "value": 0.64}
-                    ]
-                }
+                Point("cpu_load_short", ["time", "value"],
+                      ["2015-01-29T21:51:28.968422294Z", 0.64],
+                      tags={"host": "server01", "region": "us-west"}),
+                Point("cpu_load_short", ["time", "value"],
+                      ["2015-01-29T21:51:28.968422294Z", 0.64],
+                      tags={"host": "server02", "region": "us-west"})
             ]
         )
 
     def test_filter_by_tags(self):
-        self.assertItemsEqual(
-            self.rs[('cpu_load_short', {"host": "server01"})],
+        self.assertEqual(
+            list(self.rs[('cpu_load_short', {"host": "server01"})]),
             [
-                {
-                    "tags": {"host": "server01", "region": "us-west"},
-                    "points": [
-                        {"time": "2015-01-29T21:51:28.968422294Z",
-                         "value": 0.64}
-                    ]
-                }
+                Point(
+                    "cpu_load_short", ["time", "value"],
+                    ["2015-01-29T21:51:28.968422294Z", 0.64],
+                    tags={"host": "server01", "region": "us-west"}
+                )
             ]
         )
 
-        self.assertItemsEqual(
-            self.rs[('cpu_load_short', {"region": "us-west"})],
+        self.assertEqual(
+            list(self.rs[('cpu_load_short', {"region": "us-west"})]),
             [
-                {
-                    "tags": {"host": "server01", "region": "us-west"},
-                    "points": [
-                        {"time": "2015-01-29T21:51:28.968422294Z",
-                         "value": 0.64}
-                    ]
-                },
-                {
-                    "tags": {"host": "server02", "region": "us-west"},
-                    "points": [
-                        {"time": "2015-01-29T21:51:28.968422294Z",
-                         "value": 0.64}
-                    ]
-                }
+                Point("cpu_load_short", ["time", "value"],
+                      ["2015-01-29T21:51:28.968422294Z", 0.64],
+                      tags={"host": "server01", "region": "us-west"}),
+                Point("cpu_load_short", ["time", "value"],
+                      ["2015-01-29T21:51:28.968422294Z", 0.64],
+                      tags={"host": "server02", "region": "us-west"}),
             ]
         )
-
