Added autocommit to Meta class. Failing tests are more explicit.

Christopher Rabotin · Christopher Rabotin · commit 57b8d0681a8f · 2015-01-14T16:59:25.000Z
diff --git a/influxdb/__init__.py b/influxdb/__init__.py
@@ -11,4 +11,4 @@
 ]
 
 
-__version__ = '0.1.14'
+__version__ = '0.1.13'
diff --git a/influxdb/helper.py b/influxdb/helper.py
@@ -25,6 +25,8 @@ class Meta:
             # Defines all the fields in this time series.
             bulk_size = 5
             # Defines the number of data points to store prior to writing on the wire.
+            autocommit = True
+            # Sets autocommit: must be set to True for bulk_size to have any affect.
     
     # The following will create *five* (immutable) data points.
     # Since bulk_size is set to 5, upon the fifth construction call, *all* data
@@ -35,6 +37,7 @@ class Meta:
     MySeriesHelper(server_name='us.east-1', time=156)
     MySeriesHelper(server_name='us.east-1', time=155)
     
+    # If autocommit unset (or set to False), one must call commit to write datapoints.
     # To manually submit data points which are not yet written, call commit:
     MySeriesHelper.commit()
     
@@ -61,6 +64,7 @@ def __new__(cls, *args, **kwargs):
                 except AttributeError:
                     raise AttributeError('Missing {} in {} Meta class.'.format(attr, cls.__name__))
     
+            cls._autocommit = getattr(_meta, 'autocommit', False)
             cls._bulk_size = getattr(_meta, 'bulk_size', 1)
 
             cls._datapoints = defaultdict(list)
@@ -81,7 +85,7 @@ def __init__(self, **kw):
 
         cls._datapoints[cls._series_name.format(**kw)].append(cls._type(**kw))
 
-        if len(cls._datapoints) >= cls._bulk_size:
+        if cls._autocommit and len(cls._datapoints) >= cls._bulk_size:
             cls.commit()
 
     @classmethod
diff --git a/tests/influxdb/helper_test.py b/tests/influxdb/helper_test.py
@@ -18,6 +18,7 @@ class Meta:
                 series_name = 'events.stats.{server_name}'
                 fields = ['time', 'server_name']
                 bulk_size = 5
+                autocommit = False
 
         TestSeriesHelper.MySeriesHelper = MySeriesHelper
 
@@ -35,7 +36,8 @@ def testSingleSeriesName(self):
                                    [156, 'us.east-1']],
                         'name': 'events.stats.us.east-1',
                         'columns': ['time', 'server_name']}]
-        self.assertListEqual(TestSeriesHelper.MySeriesHelper._json_body_(), expectation, 'Invalid JSON body of time series returned from _json_body_ for one series name.')
+        rcvd = TestSeriesHelper.MySeriesHelper._json_body_()
+        self.assertListEqual(rcvd, expectation, 'Invalid JSON body of time series returned from _json_body_ for one series name: {}.'.format(rcvd))
         TestSeriesHelper.MySeriesHelper._reset_()
         self.assertEqual(TestSeriesHelper.MySeriesHelper._json_body_(), [], 'Resetting helper did not empty datapoints.')
 
@@ -59,6 +61,7 @@ def testSeveralSeriesNames(self):
                        {'points': [[159, 'us.east-1']],
                         'name': 'events.stats.us.east-1',
                         'columns': ['time', 'server_name']}]
-        self.assertListEqual(TestSeriesHelper.MySeriesHelper._json_body_(), expectation, 'Invalid JSON body of time series returned from _json_body_ for several series names.')
+        rcvd = TestSeriesHelper.MySeriesHelper._json_body_()
+        self.assertListEqual(rcvd, expectation, 'Invalid JSON body of time series returned from _json_body_ for several series names: {}.'.format(rcvd))
         TestSeriesHelper.MySeriesHelper._reset_()
         self.assertEqual(TestSeriesHelper.MySeriesHelper._json_body_(), [], 'Resetting helper did not empty datapoints.')

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@`
`11`	`11`	`]`
`12`	`12`
`13`	`13`
`14`		`-__version__ = '0.1.14'`
	`14`	`+__version__ = '0.1.13'`